Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland...

[karo-tx-linux.git] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index fb08c28fc90ad9b1051912c8cd878cbaaa6d6187..43ad9c81efcff1164b08c532e29f7a73e84d5cbf 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -249,12 +249,11 @@ struct cfg80211_event {
                        u16 status;
                } cr;
                struct {
-                       struct ieee80211_channel *channel;
-                       u8 bssid[ETH_ALEN];
                        const u8 *req_ie;
                        const u8 *resp_ie;
                        size_t req_ie_len;
                        size_t resp_ie_len;
+                       struct cfg80211_bss *bss;
                } rm;
                struct {
                        const u8 *ie;
@@ -403,8 +402,7 @@ int cfg80211_disconnect(struct cfg80211_registered_device *rdev,
                        struct net_device *dev, u16 reason,
                        bool wextev);
 void __cfg80211_roamed(struct wireless_dev *wdev,
-                      struct ieee80211_channel *channel,
-                      const u8 *bssid,
+                      struct cfg80211_bss *bss,
                       const u8 *req_ie, size_t req_ie_len,
                       const u8 *resp_ie, size_t resp_ie_len);
 int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,