aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorYoni Divinsky <yoni.divinsky@ti.com>2012-05-30 04:36:39 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-01-18 07:30:21 -0500
commitde5fad815703b5b24bc4726cd71422929537d259 (patch)
tree4b2c5ab023fc4577748c2a340f10ab6cd0ea515e /include/net/mac80211.h
parent5a32aff37a02ebc959837f08d09ac8ba65d4f1b0 (diff)
mac80211: add op to configure default key id
There are hardwares which support offload of data packets for example when auto ARP is enabled the hw will send the ARP response. In such cases if WEP encryption is configured the hw must know the default WEP key in order to encrypt the packets correctly. When hw_accel is enabled and encryption type is set to WEP, the driver should get the default key index from mac80211. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> [cleanups, fixes, documentation] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 3037f49e51c8..e0825a9dbfea 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1630,6 +1630,10 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
1630 * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is 1630 * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is
1631 * provided by update_tkip_key only. The trigger that makes mac80211 call this 1631 * provided by update_tkip_key only. The trigger that makes mac80211 call this
1632 * handler is software decryption with wrap around of iv16. 1632 * handler is software decryption with wrap around of iv16.
1633 *
1634 * The set_default_unicast_key() call updates the default WEP key index
1635 * configured to the hardware for WEP encryption type. This is required
1636 * for devices that support offload of data packets (e.g. ARP responses).
1633 */ 1637 */
1634 1638
1635/** 1639/**
@@ -2208,6 +2212,10 @@ enum ieee80211_rate_control_changed {
2208 * After rekeying was done it should (for example during resume) notify 2212 * After rekeying was done it should (for example during resume) notify
2209 * userspace of the new replay counter using ieee80211_gtk_rekey_notify(). 2213 * userspace of the new replay counter using ieee80211_gtk_rekey_notify().
2210 * 2214 *
2215 * @set_default_unicast_key: Set the default (unicast) key index, useful for
2216 * WEP when the device sends data packets autonomously, e.g. for ARP
2217 * offloading. The index can be 0-3, or -1 for unsetting it.
2218 *
2211 * @hw_scan: Ask the hardware to service the scan request, no need to start 2219 * @hw_scan: Ask the hardware to service the scan request, no need to start
2212 * the scan state machine in stack. The scan must honour the channel 2220 * the scan state machine in stack. The scan must honour the channel
2213 * configuration done by the regulatory agent in the wiphy's 2221 * configuration done by the regulatory agent in the wiphy's
@@ -2539,6 +2547,8 @@ struct ieee80211_ops {
2539 void (*set_rekey_data)(struct ieee80211_hw *hw, 2547 void (*set_rekey_data)(struct ieee80211_hw *hw,
2540 struct ieee80211_vif *vif, 2548 struct ieee80211_vif *vif,
2541 struct cfg80211_gtk_rekey_data *data); 2549 struct cfg80211_gtk_rekey_data *data);
2550 void (*set_default_unicast_key)(struct ieee80211_hw *hw,
2551 struct ieee80211_vif *vif, int idx);
2542 int (*hw_scan)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 2552 int (*hw_scan)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
2543 struct cfg80211_scan_request *req); 2553 struct cfg80211_scan_request *req);
2544 void (*cancel_hw_scan)(struct ieee80211_hw *hw, 2554 void (*cancel_hw_scan)(struct ieee80211_hw *hw,