bridge: use rx_handler_data pointer to store net_bridge_port pointer

[net-next-2.6.git] / net / wireless / util.c

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 3416373a9c0c80e91c21f687eb61ec7b91daa626..0c8a1e8b76903313ef0c413cc36261ec8af9399b 100644 (file)
--- 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) {