From 39cbaf8ccdd3563600c5cd3529d617ebbbf80b67 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 19 Aug 2009 14:48:21 +0000 Subject: [PATCH] madwifi: refresh patches SVN-Revision: 17311 --- package/madwifi/patches/309-micfail_detect.patch | 2 +- package/madwifi/patches/388-apsta_fix.patch | 6 +++--- package/madwifi/patches/411-autochannel_multi.patch | 4 ++-- package/madwifi/patches/421-channel_handling.patch | 2 +- package/madwifi/patches/430-use_netdev_priv.patch | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch index 19bea79bea..d74a390d59 100644 --- a/package/madwifi/patches/309-micfail_detect.patch +++ b/package/madwifi/patches/309-micfail_detect.patch @@ -92,7 +92,7 @@ static const struct ieee80211_cipher ccmp = { .ic_name = "AES-CCM", -@@ -308,7 +308,7 @@ ccmp_decap(struct ieee80211_key *k, stru +@@ -314,7 +314,7 @@ ccmp_decap(struct ieee80211_key *k, stru * Verify and strip MIC from the frame. */ static int diff --git a/package/madwifi/patches/388-apsta_fix.patch b/package/madwifi/patches/388-apsta_fix.patch index 31107af09b..b0cb8e9dff 100644 --- a/package/madwifi/patches/388-apsta_fix.patch +++ b/package/madwifi/patches/388-apsta_fix.patch @@ -1,6 +1,6 @@ --- a/net80211/ieee80211_proto.c +++ b/net80211/ieee80211_proto.c -@@ -1409,7 +1409,8 @@ __ieee80211_newstate(struct ieee80211vap +@@ -1415,7 +1415,8 @@ __ieee80211_newstate(struct ieee80211vap vap->iv_state = nstate; /* state transition */ del_timer(&vap->iv_mgtsend); if ((vap->iv_opmode != IEEE80211_M_HOSTAP) && @@ -10,7 +10,7 @@ ieee80211_cancel_scan(vap); /* background scan */ ni = vap->iv_bss; /* NB: no reference held */ switch (nstate) { -@@ -1451,7 +1452,8 @@ __ieee80211_newstate(struct ieee80211vap +@@ -1457,7 +1458,8 @@ __ieee80211_newstate(struct ieee80211vap } goto reset; case IEEE80211_S_SCAN: @@ -20,7 +20,7 @@ goto reset; reset: ieee80211_reset_bss(vap); -@@ -1989,7 +1991,9 @@ ieee80211_newstate(struct ieee80211vap * +@@ -1995,7 +1997,9 @@ ieee80211_newstate(struct ieee80211vap * } } } diff --git a/package/madwifi/patches/411-autochannel_multi.patch b/package/madwifi/patches/411-autochannel_multi.patch index 1140a1e2a6..94ffd9fa65 100644 --- a/package/madwifi/patches/411-autochannel_multi.patch +++ b/package/madwifi/patches/411-autochannel_multi.patch @@ -241,7 +241,7 @@ * the auto-select case; this should be redundant if the --- a/net80211/ieee80211_proto.c +++ b/net80211/ieee80211_proto.c -@@ -1225,6 +1225,7 @@ ieee80211_dturbo_switch(struct ieee80211 +@@ -1231,6 +1231,7 @@ ieee80211_dturbo_switch(struct ieee80211 struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); #endif struct ieee80211_channel *chan; @@ -249,7 +249,7 @@ chan = ieee80211_find_channel(ic, ic->ic_bsschan->ic_freq, newflags); if (chan == NULL) { /* XXX should not happen */ -@@ -1243,6 +1244,9 @@ ieee80211_dturbo_switch(struct ieee80211 +@@ -1249,6 +1250,9 @@ ieee80211_dturbo_switch(struct ieee80211 ic->ic_bsschan = chan; ic->ic_curchan = chan; ic->ic_set_channel(ic); diff --git a/package/madwifi/patches/421-channel_handling.patch b/package/madwifi/patches/421-channel_handling.patch index 8ccecdfdd2..9164eeacd6 100644 --- a/package/madwifi/patches/421-channel_handling.patch +++ b/package/madwifi/patches/421-channel_handling.patch @@ -1108,7 +1108,7 @@ nrs = &ni->ni_rates; fixedrate = IEEE80211_FIXED_RATE_NONE; for (i = 0; i < nrs->rs_nrates;) { -@@ -1401,6 +1401,7 @@ ieee80211_new_state(struct ieee80211vap +@@ -1407,6 +1407,7 @@ ieee80211_new_state(struct ieee80211vap IEEE80211_VAPS_UNLOCK_IRQ(ic); return rc; } diff --git a/package/madwifi/patches/430-use_netdev_priv.patch b/package/madwifi/patches/430-use_netdev_priv.patch index 37a9b28146..d6301bc517 100644 --- a/package/madwifi/patches/430-use_netdev_priv.patch +++ b/package/madwifi/patches/430-use_netdev_priv.patch @@ -1136,7 +1136,7 @@ struct ieee80211com *ic = vap->iv_ic; struct net_device *parent = ic->ic_dev; -@@ -1081,7 +1081,7 @@ ieee80211_init(struct net_device *dev, i +@@ -1087,7 +1087,7 @@ ieee80211_init(struct net_device *dev, i int ieee80211_open(struct net_device *dev) { @@ -1145,7 +1145,7 @@ return ieee80211_init(dev, 0); } -@@ -1125,7 +1125,7 @@ EXPORT_SYMBOL(ieee80211_start_running); +@@ -1131,7 +1131,7 @@ EXPORT_SYMBOL(ieee80211_start_running); int ieee80211_stop(struct net_device *dev) { -- 2.30.2