aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-01-21 05:40:47 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-01-22 16:08:55 -0500
commitb3fbdcf49f940d0703c356441e0daf045e64e076 (patch)
treef63416cc9b80a6757ec6fa57190f581b2b3a6d31 /include/net
parente4fca007b06165900d0e44e8d5e251376819bf5d (diff)
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.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index f03f97b627fe..f56d6f479532 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1614,8 +1614,10 @@ struct ieee80211_ops {
1614 struct ieee80211_vif *vif, struct ieee80211_sta *sta, 1614 struct ieee80211_vif *vif, struct ieee80211_sta *sta,
1615 struct ieee80211_key_conf *key); 1615 struct ieee80211_key_conf *key);
1616 void (*update_tkip_key)(struct ieee80211_hw *hw, 1616 void (*update_tkip_key)(struct ieee80211_hw *hw,
1617 struct ieee80211_key_conf *conf, const u8 *address, 1617 struct ieee80211_vif *vif,
1618 u32 iv32, u16 *phase1key); 1618 struct ieee80211_key_conf *conf,
1619 struct ieee80211_sta *sta,
1620 u32 iv32, u16 *phase1key);
1619 int (*hw_scan)(struct ieee80211_hw *hw, 1621 int (*hw_scan)(struct ieee80211_hw *hw,
1620 struct cfg80211_scan_request *req); 1622 struct cfg80211_scan_request *req);
1621 void (*sw_scan_start)(struct ieee80211_hw *hw); 1623 void (*sw_scan_start)(struct ieee80211_hw *hw);