[PATCH] ieee80211: in-tree driver updates to sync with latest ieee80211 series

Changed crypto method from requiring a struct ieee80211_device reference
to the init handler.  Instead we now have a get/set flags method for
each crypto component.

Setting of TKIP countermeasures can now be done via
set_flags(IEEE80211_CRYPTO_TKIP_COUNTERMEASURES)

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

8 files changed, 38 insertions, 19 deletions

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 4a381a074fdd..4851756202c5 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -876,7 +876,6 @@ struct ieee80211_device {
         /* WPA data */
         int wpa_enabled;
         int drop_unencrypted;
-        int tkip_countermeasures;
         int privacy_invoked;
         size_t wpa_ie_len;
         u8 *wpa_ie;
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
index daf3b2c6b038..0c9d859d912e 100644
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -25,13 +25,17 @@
 
 #include <linux/skbuff.h>
 
+enum {
+        IEEE80211_CRYPTO_TKIP_COUNTERMEASURES = (1<<0),
+};
+
 struct ieee80211_crypto_ops {
         const char *name;
 
         /* init new crypto context (e.g., allocate private data space,
          * select IV, etc.); returns NULL on failure or pointer to allocated
          * private data on success */
-        void *(*init) (struct ieee80211_device * ieee, int keyidx);
+        void *(*init) (int keyidx);
 
         /* deinitialize crypto context and free allocated private data */
         void (*deinit) (void *priv);
@@ -60,6 +64,10 @@ struct ieee80211_crypto_ops {
          * statistics */
         char *(*print_stats) (char *p, void *priv);
 
+        /* Crypto specific flag get/set for configuration settings */
+        unsigned long (*get_flags)(void *priv);
+        unsigned long (*set_flags)(unsigned long flags, void *priv);
+
         /* maximum number of bytes added by encryption; encrypt buf is
          * allocated with extra_prefix_len bytes, copy of in_buf, and
          * extra_postfix_len; encrypt need not use all this space, but
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
index e26bcc918032..f3b6aa3be638 100644
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -202,8 +202,7 @@ struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
                 return NULL;
 }
 
-static void *ieee80211_crypt_null_init(struct ieee80211_device *ieee,
-                                       int keyidx)
+static void *ieee80211_crypt_null_init(int keyidx)
 {
         return (void *)1;
 }
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 081d8575dbb1..05a853c13012 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -74,7 +74,7 @@ static void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm,
         crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN);
 }
 
-static void *ieee80211_ccmp_init(struct ieee80211_device *ieee, int key_idx)
+static void *ieee80211_ccmp_init(int key_idx)
 {
         struct ieee80211_ccmp_data *priv;
 
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index e0733050ae71..2e34f29b7956 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -60,10 +60,24 @@ struct ieee80211_tkip_data {
         /* scratch buffers for virt_to_page() (crypto API) */
         u8 rx_hdr[16], tx_hdr[16];
 
-        struct ieee80211_device *ieee;
+        unsigned long flags;
 };
 
-static void *ieee80211_tkip_init(struct ieee80211_device *ieee, int key_idx)
+static unsigned long ieee80211_tkip_set_flags(unsigned long flags, void *priv)
+{
+        struct ieee80211_tkip_data *_priv = priv;
+        unsigned long old_flags = _priv->flags;
+        _priv->flags = flags;
+        return old_flags;
+}
+
+static unsigned long ieee80211_tkip_get_flags(void *priv)
+{
+        struct ieee80211_tkip_data *_priv = priv;
+        return _priv->flags;
+}
+
+static void *ieee80211_tkip_init(int key_idx)
 {
         struct ieee80211_tkip_data *priv;
 
@@ -72,8 +86,6 @@ static void *ieee80211_tkip_init(struct ieee80211_device *ieee, int key_idx)
                 goto fail;
         memset(priv, 0, sizeof(*priv));
 
-        priv->ieee = ieee;
-
         priv->key_idx = key_idx;
 
         priv->tfm_arc4 = crypto_alloc_tfm("arc4", 0);
@@ -315,13 +327,13 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
         u8 *pos;
         struct scatterlist sg;
 
-        if (tkey->ieee->tkip_countermeasures) {
+        if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
                 if (net_ratelimit()) {
                         struct ieee80211_hdr_4addr *hdr =
                             (struct ieee80211_hdr_4addr *)skb->data;
-                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+                        printk(KERN_DEBUG "TKIP countermeasures: dropped "
                                "TX packet to " MAC_FMT "\n",
-                               tkey->ieee->dev->name, MAC_ARG(hdr->addr1));
+                               MAC_ARG(hdr->addr1));
                 }
                 return -1;
         }
@@ -366,11 +378,11 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         hdr = (struct ieee80211_hdr_4addr *)skb->data;
 
-        if (tkey->ieee->tkip_countermeasures) {
+        if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+                        printk(KERN_DEBUG "TKIP countermeasures: dropped "
                                "received packet from " MAC_FMT "\n",
-                               tkey->ieee->dev->name, MAC_ARG(hdr->addr2));
+                               MAC_ARG(hdr->addr2));
                 }
                 return -1;
         }
@@ -694,6 +706,8 @@ static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
         .extra_mpdu_prefix_len = 4 + 4, /* IV + ExtIV */
         .extra_mpdu_postfix_len = 4,    /* ICV */
         .extra_msdu_postfix_len = 8,    /* MIC */
+        .get_flags = ieee80211_tkip_get_flags,
+        .set_flags = ieee80211_tkip_set_flags,
         .owner = THIS_MODULE,
 };
 
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
index 2aaeac1e02d7..7c08ed2f2628 100644
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@