[PATCH] ieee80211: Added handle_deauth() callback, enhanced tkip/ccmp support of varying hw/sw offload

tree de81b55e78e85997642c651ea677078d0554a14f
parent c8030da8c159f8b82712172a6748a42523aea83a
author James Ketrenos <jketreno@linux.intel.com> 1127104380 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127315225 -0500

Added handle_deauth() callback.
Enhanced crypt_{tkip,ccmp} to support varying splits of HW/SW offload.
Changed channel freq to u32 from u16.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

2 files changed, 6 insertions, 1 deletions

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 4a1340b8341c..220a9e3c91fa 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -808,7 +808,7 @@ enum {
 };
 
 struct ieee80211_channel {
-        u16 freq;
+        u32 freq;
         u8 channel;
         u8 flags;
         u8 max_power;
@@ -862,6 +862,7 @@ struct ieee80211_device {
         int host_mc_decrypt;
 
         int host_open_frag;
+        int host_build_iv;
         int ieee802_1x;         /* is IEEE 802.1X used */
 
         /* WPA data */
@@ -914,6 +915,8 @@ struct ieee80211_device {
         /* Typical STA methods */
         int (*handle_auth) (struct net_device * dev,
                             struct ieee80211_auth * auth);
+        int (*handle_deauth) (struct net_device * dev,
+                              struct ieee80211_auth * auth);
         int (*handle_disassoc) (struct net_device * dev,
                                 struct ieee80211_disassoc * assoc);
         int (*handle_beacon) (struct net_device * dev,
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
index 24e4912a263a..daf3b2c6b038 100644
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -36,6 +36,8 @@ struct ieee80211_crypto_ops {
         /* deinitialize crypto context and free allocated private data */
         void (*deinit) (void *priv);
 
+        int (*build_iv) (struct sk_buff * skb, int hdr_len, void *priv);
+
         /* encrypt/decrypt return < 0 on error or >= 0 on success. The return
          * value from decrypt_mpdu is passed as the keyidx value for
          * decrypt_msdu. skb must have enough head and tail room for the