diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2010-06-15 06:50:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-15 11:48:58 -0700 |
| commit | f350a0a87374418635689471606454abc7beaa3a (patch) | |
| tree | c8210542a9848f6b5953b58d2ba1dbfb11715f14 /net/wireless | |
| parent | a35e2c1b6d90544b3c688783869817628e5f9607 (diff) | |
| download | linux-stable-f350a0a87374418635689471606454abc7beaa3a.tar.gz linux-stable-f350a0a87374418635689471606454abc7beaa3a.tar.bz2 linux-stable-f350a0a87374418635689471606454abc7beaa3a.zip | |
bridge: use rx_handler_data pointer to store net_bridge_port pointer
Register net_bridge_port pointer as rx_handler data pointer. As br_port is
removed from struct net_device, another netdev priv_flag is added to indicate
the device serves as a bridge port. Also rcuized pointers are now correctly
dereferenced in br_fdb.c and in netfilter parts.
Signed-off-by: Jiri Pirko <jpirko@redhat.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 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 90ab3c8519be..3a7b8a2f2d5a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1107,7 +1107,7 @@ static int nl80211_valid_4addr(struct cfg80211_registered_device *rdev, enum nl80211_iftype iftype) { if (!use_4addr) { - if (netdev && netdev->br_port) + if (netdev && (netdev->priv_flags & IFF_BRIDGE_PORT)) return -EBUSY; return 0; } diff --git a/net/wireless/util.c b/net/wireless/util.c index 3416373a9c0c..0c8a1e8b7690 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -770,8 +770,8 @@ 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->br_port && (ntype == NL80211_IFTYPE_ADHOC || - ntype == NL80211_IFTYPE_STATION)) + if ((dev->priv_flags & IFF_BRIDGE_PORT) && + (ntype == NL80211_IFTYPE_ADHOC || ntype == NL80211_IFTYPE_STATION)) return -EBUSY; if (ntype != otype) { |