diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-05-26 18:12:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-30 18:13:41 -0400 |
| commit | f3d736c478adbe46234c35b2ef9b55a11dd01d7c (patch) | |
| tree | 6dba49b34eee4ea755c7ebe832031c92441523fb | |
| parent | 90592b9a35836bacd34d92a3aba7958756b6a7c0 (diff) | |
| download | linux-f3d736c478adbe46234c35b2ef9b55a11dd01d7c.tar.bz2 | |
net: dsa: remove dsa_port_is_bridged
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>
| -rw-r--r-- | net/dsa/slave.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 887e26695519..0442b6bf52fa 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -69,18 +69,13 @@ static int dsa_slave_get_iflink(const struct net_device *dev) 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) { struct dsa_slave_priv *p = netdev_priv(dev); - struct net_device *master = p->dp->ds->dst->master_netdev; - struct dsa_switch *ds = p->dp->ds; - u8 stp_state = dsa_port_is_bridged(p->dp) ? - BR_STATE_BLOCKING : BR_STATE_FORWARDING; + struct dsa_port *dp = p->dp; + struct dsa_switch *ds = dp->ds; + struct net_device *master = ds->dst->master_netdev; + u8 stp_state = dp->bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING; int err; if (!(master->flags & IFF_UP)) |