From 600d26764649967c3e4e0e71e5ee41cd5cef5b8b Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 29 Aug 2006 16:20:00 +0000 Subject: update madwifi to 0.9.2 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4701 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../madwifi/patches/105-no_forced_aes_dep.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/madwifi/patches/105-no_forced_aes_dep.patch (limited to 'package/madwifi/patches/105-no_forced_aes_dep.patch') diff --git a/package/madwifi/patches/105-no_forced_aes_dep.patch b/package/madwifi/patches/105-no_forced_aes_dep.patch deleted file mode 100644 index fa439c6e9..000000000 --- a/package/madwifi/patches/105-no_forced_aes_dep.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c ---- madwifi.old/net80211/ieee80211_crypto_ccmp.c 2006-02-06 21:20:57.000000000 +0100 -+++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c 2006-06-12 22:29:23.000000000 +0200 -@@ -105,12 +105,6 @@ - - ctx->cc_vap = vap; - ctx->cc_ic = vap->iv_ic; -- ctx->cc_tfm = crypto_alloc_tfm("aes", 0); -- if (ctx->cc_tfm == NULL) { -- FREE(ctx, M_DEVBUF); -- _MOD_DEC_USE(THIS_MODULE); -- return NULL; -- } - return ctx; - } - -@@ -137,8 +131,21 @@ - __func__, k->wk_keylen, 128 / NBBY); - return 0; - } -- if (k->wk_flags & IEEE80211_KEY_SWCRYPT) -+ -+ if (k->wk_flags & IEEE80211_KEY_SWCRYPT) { -+ if (ctx->cc_tfm == NULL) -+ ctx->cc_tfm = crypto_alloc_tfm("aes", 0); -+ -+ if (ctx->cc_tfm == NULL) { -+ IEEE80211_DPRINTF(ctx->cc_vap, IEEE80211_MSG_CRYPTO, -+ "%s: Tried to add a software crypto key, but no software crypto available\n", -+ __func__); -+ -+ return 0; -+ } -+ - crypto_cipher_setkey(ctx->cc_tfm, k->wk_key, k->wk_keylen); -+ } - return 1; - } - -- cgit v1.2.3