lib80211: absorb crypto bits from net/ieee80211

These bits are shared already between ipw2x00 and hostap, and could
probably be shared both more cleanly and with other drivers.  This
commit simply relocates the code to lib80211 and adjusts the drivers
appropriately.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index d996547f7a62..f78f57e8844a 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -152,7 +152,8 @@ static int ieee80211_copy_snap(u8 * data, __be16 h_proto)
 static int ieee80211_encrypt_fragment(struct ieee80211_device *ieee,
                                              struct sk_buff *frag, int hdr_len)
 {
-        struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx];
+        struct lib80211_crypt_data *crypt =
+                ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
         int res;
 
         if (crypt == NULL)
@@ -270,7 +271,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
                 .qos_ctl = 0
         };
         u8 dest[ETH_ALEN], src[ETH_ALEN];
-        struct ieee80211_crypt_data *crypt;
+        struct lib80211_crypt_data *crypt;
         int priority = skb->priority;
         int snapped = 0;
 
@@ -294,7 +295,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
 
         ether_type = ((struct ethhdr *)skb->data)->h_proto;
 
-        crypt = ieee->crypt[ieee->tx_keyidx];
+        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
 
         encrypt = !(ether_type == htons(ETH_P_PAE) && ieee->ieee802_1x) &&
             ieee->sec.encrypt;