cryptomgr needs pcomp and hash loaded in 2.6.30

[openwrt.git] / package / madwifi / patches / 123-ccmp_checks.patch

diff --git a/package/madwifi/patches/123-ccmp_checks.patch b/package/madwifi/patches/123-ccmp_checks.patch
index 8370d35..71cede7 100644 (file)
--- a/package/madwifi/patches/123-ccmp_checks.patch
+++ b/package/madwifi/patches/123-ccmp_checks.patch
@@ -1,21 +1,6 @@
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_ccmp.c    2007-06-04 13:21:53.234883736 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c 2007-06-04 13:21:57.936169032 +0200
-@@ -118,6 +118,12 @@
-       ctx->cc_ic = vap->iv_ic;
-       ctx->cc_tfm = crypto_alloc_cipher("aes", 0,
-                                       CRYPTO_ALG_ASYNC);
-+      
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+      if (IS_ERR(ctx->cc_tfm))
-+              ctx->cc_tfm = NULL;
-+#endif
-+
-       if (ctx->cc_tfm == NULL) {
-               IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO,
-                               "%s: unable to load kernel AES crypto support\n",
-@@ -465,6 +471,9 @@
+--- a/net80211/ieee80211_crypto_ccmp.c
++++ b/net80211/ieee80211_crypto_ccmp.c
+@@ -475,6 +475,9 @@ ccmp_encrypt(struct ieee80211_key *key, 
        uint8_t *mic, *pos;
        u_int space;
  
@@ -25,7 +10,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
        ctx->cc_vap->iv_stats.is_crypto_ccmp++;
  
        skb = skb0;
-@@ -579,6 +588,9 @@
+@@ -589,6 +592,9 @@ ccmp_decrypt(struct ieee80211_key *key, 
        uint8_t *pos, *mic;
        u_int space;