aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/cfg80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-02-24 07:50:51 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-29 14:11:33 -0500
commit63c9c5e77c36f8793dddf0e905a4bc43a0972735 (patch)
tree88c7d307b7369806c75245ca9cff8129e334580a /include/net/cfg80211.h
parent4d94c157f87eebdcd84e9e5e27ad65978f776c2e (diff)
cfg80211: remove cookies from callbacks
In "cfg80211: no cookies in cfg80211_send_XXX()" Holger Schurig removed the cookies in the calls from mac80211 to cfg80211, but the ones in the other direction were left in. Remove them now. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/cfg80211.h')
-rw-r--r--include/net/cfg80211.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 755a7707a7c5..0178c7489373 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1587,11 +1587,9 @@ struct cfg80211_ops {
1587 int (*assoc)(struct wiphy *wiphy, struct net_device *dev, 1587 int (*assoc)(struct wiphy *wiphy, struct net_device *dev,
1588 struct cfg80211_assoc_request *req); 1588 struct cfg80211_assoc_request *req);
1589 int (*deauth)(struct wiphy *wiphy, struct net_device *dev, 1589 int (*deauth)(struct wiphy *wiphy, struct net_device *dev,
1590 struct cfg80211_deauth_request *req, 1590 struct cfg80211_deauth_request *req);
1591 void *cookie);
1592 int (*disassoc)(struct wiphy *wiphy, struct net_device *dev, 1591 int (*disassoc)(struct wiphy *wiphy, struct net_device *dev,
1593 struct cfg80211_disassoc_request *req, 1592 struct cfg80211_disassoc_request *req);
1594 void *cookie);
1595 1593
1596 int (*connect)(struct wiphy *wiphy, struct net_device *dev, 1594 int (*connect)(struct wiphy *wiphy, struct net_device *dev,
1597 struct cfg80211_connect_params *sme); 1595 struct cfg80211_connect_params *sme);