diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2010-01-21 11:40:47 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-22 16:08:55 -0500 |
| commit | b3fbdcf49f940d0703c356441e0daf045e64e076 (patch) | |
| tree | f63416cc9b80a6757ec6fa57190f581b2b3a6d31 /include/net | |
| parent | e4fca007b06165900d0e44e8d5e251376819bf5d (diff) | |
| download | kernel_samsung_espresso10-b3fbdcf49f940d0703c356441e0daf045e64e076.zip kernel_samsung_espresso10-b3fbdcf49f940d0703c356441e0daf045e64e076.tar.gz kernel_samsung_espresso10-b3fbdcf49f940d0703c356441e0daf045e64e076.tar.bz2 | |
mac80211: pass vif and station to update_tkip_key
When a TKIP key is updated, we should pass the station
pointer instead of just the address, since drivers can
use that to store their own data. We also need to pass
the virtual interface pointer.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index f03f97b..f56d6f4 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1614,8 +1614,10 @@ struct ieee80211_ops { struct ieee80211_vif *vif, struct ieee80211_sta *sta, struct ieee80211_key_conf *key); void (*update_tkip_key)(struct ieee80211_hw *hw, - struct ieee80211_key_conf *conf, const u8 *address, - u32 iv32, u16 *phase1key); + struct ieee80211_vif *vif, + struct ieee80211_key_conf *conf, + struct ieee80211_sta *sta, + u32 iv32, u16 *phase1key); int (*hw_scan)(struct ieee80211_hw *hw, struct cfg80211_scan_request *req); void (*sw_scan_start)(struct ieee80211_hw *hw); |