diff options
author | Julian Wiedmann <jwi@linux.ibm.com> | 2020-02-20 09:00:07 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-02-20 10:10:32 -0800 |
commit | 2e92a2d0e450740ebe7e7a816162327ad1fde94b (patch) | |
tree | 82023383131c37dce355f55564a9cd54b812fd32 /net/wireless | |
parent | 458de8a97f107e1b6120d608b93ae9e3de019a2e (diff) | |
download | linux-2e92a2d0e450740ebe7e7a816162327ad1fde94b.tar.bz2 |
net: use netif_is_bridge_port() to check for IFF_BRIDGE_PORT
Trivial cleanup, so that all bridge port-specific code can be found in
one go.
CC: Johannes Berg <johannes@sipsolutions.net>
CC: Roopa Prabhu <roopa@cumulusnetworks.com>
CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 2 | ||||
-rw-r--r-- | net/wireless/util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index f0112dabe21e..8c2a246099ef 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3531,7 +3531,7 @@ static int nl80211_valid_4addr(struct cfg80211_registered_device *rdev, enum nl80211_iftype iftype) { if (!use_4addr) { - if (netdev && (netdev->priv_flags & IFF_BRIDGE_PORT)) + if (netdev && netif_is_bridge_port(netdev)) return -EBUSY; return 0; } diff --git a/net/wireless/util.c b/net/wireless/util.c index 8481e9ac33da..80fb47c43bdd 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -934,7 +934,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, return -EOPNOTSUPP; /* if it's part of a bridge, reject changing type to station/ibss */ - if ((dev->priv_flags & IFF_BRIDGE_PORT) && + if (netif_is_bridge_port(dev) && (ntype == NL80211_IFTYPE_ADHOC || ntype == NL80211_IFTYPE_STATION || ntype == NL80211_IFTYPE_P2P_CLIENT)) |