update wlcompat for new ioctl interface (fixes #1357)

[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 d9b3cd4..8370d35 100644 (file)
--- a/package/madwifi/patches/123-ccmp_checks.patch
+++ b/package/madwifi/patches/123-ccmp_checks.patch
@@ -1,8 +1,21 @@
-Only in madwifi.dev/ath: if_ath.c.orig
-diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c
---- madwifi.old/net80211/ieee80211_crypto_ccmp.c       2007-06-02 04:37:47.425966000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c       2007-06-02 18:38:27.675882768 +0200
-@@ -465,6 +465,9 @@
+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 @@
        uint8_t *mic, *pos;
        u_int space;
  
@@ -12,7 +25,7 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee8
        ctx->cc_vap->iv_stats.is_crypto_ccmp++;
  
        skb = skb0;
-@@ -579,6 +582,9 @@
+@@ -579,6 +588,9 @@
        uint8_t *pos, *mic;
        u_int space;