hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

madwifi: fix uninitialized variable 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15711 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2009-05-08 18:49:05 +00:00
parent 9a61184c76
commit 07b7495fbb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/madwifi/patches/389-autochannel.patch
View File

@ -208,7 +208,7 @@
if (ss->ss_last > 0) { if (ss->ss_last > 0) {
--- a/net80211/ieee80211_scan.c --- a/net80211/ieee80211_scan.c
+++ b/net80211/ieee80211_scan.c +++ b/net80211/ieee80211_scan.c
@@ -1002,20 +1002,33 @@ ieee80211_scan_add_channels(struct ieee8 @@ -1002,20 +1002,34 @@ ieee80211_scan_add_channels(struct ieee8
{ {
struct ieee80211_channel *c, *cg; struct ieee80211_channel *c, *cg;
u_int modeflags; u_int modeflags;
@ -218,6 +218,7 @@
KASSERT(mode < ARRAY_SIZE(chanflags), ("Unexpected mode %u", mode)); KASSERT(mode < ARRAY_SIZE(chanflags), ("Unexpected mode %u", mode));
modeflags = chanflags[mode]; modeflags = chanflags[mode];
for (i = 0; i < ic->ic_nchans; i++) { for (i = 0; i < ic->ic_nchans; i++) {
c = &ic->ic_channels[i];
+ if (c->ic_flags & (IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)) + if (c->ic_flags & (IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO))
+ continue; + continue;
+ +
@ -225,7 +226,7 @@
+ break; + break;
+ } + }
+ for (i = 0; i < ic->ic_nchans; i++) { + for (i = 0; i < ic->ic_nchans; i++) {
c = &ic->ic_channels[i]; + c = &ic->ic_channels[i];
if (c == NULL || isclr(ic->ic_chan_active, c->ic_ieee)) if (c == NULL || isclr(ic->ic_chan_active, c->ic_ieee))
continue; continue;
if (c->ic_scanflags & IEEE80211_NOSCAN_SET) if (c->ic_scanflags & IEEE80211_NOSCAN_SET)

4
package/madwifi/patches/411-autochannel_multi.patch
View File

@ -124,7 +124,7 @@
void void
ieee80211_scan_attach(struct ieee80211com *ic) ieee80211_scan_attach(struct ieee80211com *ic)
{ {
@@ -1168,7 +1285,7 @@ ieee80211_scan_dfs_action(struct ieee802 @@ -1169,7 +1286,7 @@ ieee80211_scan_dfs_action(struct ieee802
IEEE80211_RADAR_CHANCHANGE_TBTT_COUNT; IEEE80211_RADAR_CHANCHANGE_TBTT_COUNT;
ic->ic_flags |= IEEE80211_F_CHANSWITCH; ic->ic_flags |= IEEE80211_F_CHANSWITCH;
} else { } else {
@ -133,7 +133,7 @@
IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
"%s: directly switching to channel " "%s: directly switching to channel "
"%3d (%4d MHz)\n", __func__, "%3d (%4d MHz)\n", __func__,
@@ -1179,6 +1296,9 @@ ieee80211_scan_dfs_action(struct ieee802 @@ -1180,6 +1297,9 @@ ieee80211_scan_dfs_action(struct ieee802
* change the channel here. */ * change the channel here. */
change_channel(ic, new_channel); change_channel(ic, new_channel);
ic->ic_bsschan = new_channel; ic->ic_bsschan = new_channel;