diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-02-24 07:50:51 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-29 14:11:33 -0500 |
commit | 63c9c5e77c36f8793dddf0e905a4bc43a0972735 (patch) | |
tree | 88c7d307b7369806c75245ca9cff8129e334580a /net/wireless | |
parent | 4d94c157f87eebdcd84e9e5e27ad65978f776c2e (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 'net/wireless')
-rw-r--r-- | net/wireless/mlme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index d553d365e751..fb1e72179117 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c | |||
@@ -455,7 +455,7 @@ int __cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev, | |||
455 | return 0; | 455 | return 0; |
456 | } | 456 | } |
457 | 457 | ||
458 | return rdev->ops->deauth(&rdev->wiphy, dev, &req, wdev); | 458 | return rdev->ops->deauth(&rdev->wiphy, dev, &req); |
459 | } | 459 | } |
460 | 460 | ||
461 | int cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev, | 461 | int cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev, |
@@ -500,7 +500,7 @@ static int __cfg80211_mlme_disassoc(struct cfg80211_registered_device *rdev, | |||
500 | else | 500 | else |
501 | return -ENOTCONN; | 501 | return -ENOTCONN; |
502 | 502 | ||
503 | return rdev->ops->disassoc(&rdev->wiphy, dev, &req, wdev); | 503 | return rdev->ops->disassoc(&rdev->wiphy, dev, &req); |
504 | } | 504 | } |
505 | 505 | ||
506 | int cfg80211_mlme_disassoc(struct cfg80211_registered_device *rdev, | 506 | int cfg80211_mlme_disassoc(struct cfg80211_registered_device *rdev, |
@@ -541,7 +541,7 @@ void cfg80211_mlme_down(struct cfg80211_registered_device *rdev, | |||
541 | 541 | ||
542 | memcpy(bssid, wdev->current_bss->pub.bssid, ETH_ALEN); | 542 | memcpy(bssid, wdev->current_bss->pub.bssid, ETH_ALEN); |
543 | req.bssid = bssid; | 543 | req.bssid = bssid; |
544 | rdev->ops->deauth(&rdev->wiphy, dev, &req, wdev); | 544 | rdev->ops->deauth(&rdev->wiphy, dev, &req); |
545 | 545 | ||
546 | if (wdev->current_bss) { | 546 | if (wdev->current_bss) { |
547 | cfg80211_unhold_bss(wdev->current_bss); | 547 | cfg80211_unhold_bss(wdev->current_bss); |