redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

net: dsa: remove dsa_port_is_bridged

Browse source 
The helper is only used once and makes the code more complicated that it
should. Remove it and reorganize the variables so that it fits on 80
columns.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2017-05-26 18:12:42 -04:00 committed by David S. Miller
parent 90592b9a35
commit f3d736c478
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
net/dsa/slave.c
View file

@ -69,18 +69,13 @@ static int dsa_slave_get_iflink(const struct net_device *dev)
return p->dp->ds->dst->master_netdev->ifindex; return p->dp->ds->dst->master_netdev->ifindex;
} }
static inline bool dsa_port_is_bridged(struct dsa_port *dp)
{
return !!dp->bridge_dev;
}
static int dsa_slave_open(struct net_device *dev) static int dsa_slave_open(struct net_device *dev)
{ {
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
struct net_device *master = p->dp->ds->dst->master_netdev; struct dsa_port *dp = p->dp;
struct dsa_switch *ds = p->dp->ds; struct dsa_switch *ds = dp->ds;
u8 stp_state = dsa_port_is_bridged(p->dp) ? struct net_device *master = ds->dst->master_netdev;
BR_STATE_BLOCKING : BR_STATE_FORWARDING; u8 stp_state = dp->bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING;
int err; int err;
if (!(master->flags & IFF_UP)) if (!(master->flags & IFF_UP))