Changeset 7440


Ignore:
Timestamp:
2007-06-02T04:22:01+02:00 (9 years ago)
Author:
nbd
Message:

madwifi update: include upstream fixes for ff handling, disable ff by default (not reliable enough), wpa in ap mode should be working now

Location:
trunk/package/madwifi
Files:
1 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/Makefile

    r7425 r7440  
    1111 
    1212PKG_NAME:=madwifi 
    13 PKG_VERSION:=r2414-20070601 
     13PKG_VERSION:=r2420-20070602 
    1414PKG_BRANCH:=madwifi-ng 
    1515PKG_RELEASE:=1 
     
    1818PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH) 
    1919PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION) 
    20 PKG_MD5SUM:=a6d1c884520cccf8ef407b4d0a00de72 
     20PKG_MD5SUM:=1ba88326b8dc8c231562329fc2e39578 
    2121 
    2222include $(INCLUDE_DIR)/package.mk 
  • trunk/package/madwifi/files/lib/wifi/madwifi.sh

    r7409 r7440  
    110110                } 
    111111         
    112                 config_get_bool hidden "$vif" hidden 
     112                config_get_bool hidden "$vif" hidden 0 
    113113                iwpriv "$ifname" hide_ssid "$hidden" 
     114 
     115                config_get_bool ff "$vif" ff 0 
     116                iwpriv "$ifname" ff "$ff" 
    114117 
    115118                config_get wds "$vif" wds 
  • trunk/package/madwifi/patches/121-ibss_hostap.patch

    r7425 r7440  
    113113                sc->sc_nostabeacons = 0; 
    114114        } else if (vap->iv_opmode == IEEE80211_M_MONITOR) 
    115 @@ -3356,7 +3347,8 @@ 
    116                  HAL_RX_FILTER_MCAST; 
    117         if (ic->ic_opmode != IEEE80211_M_STA) 
    118                 rfilt |= HAL_RX_FILTER_PROBEREQ; 
    119 -       if (ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC)) 
    120 +       if ((ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC)) || 
    121 +               ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0))) 
    122                 rfilt |= HAL_RX_FILTER_PROM; 
    123         if (ic->ic_opmode == IEEE80211_M_STA || 
    124             sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */ 
     115@@ -3368,7 +3367,7 @@ 
     116                ((ic->ic_opmode == IEEE80211_M_HOSTAP) && 
     117                 (ic->ic_protmode != IEEE80211_PROT_NONE))) 
     118                rfilt |= HAL_RX_FILTER_BEACON; 
     119-       if (sc->sc_nmonvaps > 0) 
     120+       if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0))) 
     121                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | 
     122                          HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM); 
     123        return rfilt; 
    125124@@ -5809,12 +5801,19 @@ 
    126125                        type = ieee80211_input(ni, skb, rs->rs_rssi, rs->rs_tstamp); 
  • trunk/package/madwifi/patches/309-micfail_detect.patch

    r7425 r7440  
    247247 /* 
    248248  * Debugging support. 
    249 diff -ur madwifi.old/net80211/ieee80211_linux.c madwifi.dev/net80211/ieee80211_linux.c 
    250 --- madwifi.old/net80211/ieee80211_linux.c      2007-05-30 03:41:18.000000000 +0200 
    251 +++ madwifi.dev/net80211/ieee80211_linux.c      2007-06-01 11:45:05.003258624 +0200 
    252 @@ -311,8 +311,8 @@ 
    253   
    254         /* TODO: needed parameters: count, keyid, key type, src address, TSC */ 
    255         snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag, 
    256 -               keyix, IEEE80211_IS_MULTICAST(wh->i_addr1) ?  "broad" : "uni", 
    257 -               ether_sprintf(wh->i_addr1)); 
    258 +               keyix, IEEE80211_IS_MULTICAST(wh->i_addr2) ?  "broad" : "uni", 
    259 +               ether_sprintf(wh->i_addr2)); 
    260         memset(&wrqu, 0, sizeof(wrqu)); 
    261         wrqu.data.length = strlen(buf); 
    262         wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); 
    263249diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h 
    264250--- madwifi.old/net80211/ieee80211_proto.h      2007-06-01 11:26:04.172691000 +0200 
     
    272258 /* 
    273259  * Return the size of the 802.11 header for a management or data frame. 
     260--- madwifi.old/net80211/ieee80211_linux.c      2007-06-02 04:05:42.902538336 +0200 
     261+++ madwifi.dev/net80211/ieee80211_linux.c      2007-06-02 04:05:55.302653232 +0200 
     262@@ -291,8 +291,8 @@ 
     263        /* TODO: needed parameters: count, keyid, key type, src address, TSC */ 
     264        snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag, 
     265                k->wk_keyix, 
     266-               IEEE80211_IS_MULTICAST(wh->i_addr1) ?  "broad" : "uni", 
     267-               ether_sprintf(wh->i_addr1)); 
     268+               IEEE80211_IS_MULTICAST(wh->i_addr2) ?  "broad" : "uni", 
     269+               ether_sprintf(wh->i_addr2)); 
     270        memset(&wrqu, 0, sizeof(wrqu)); 
     271        wrqu.data.length = strlen(buf); 
     272        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); 
Note: See TracChangeset for help on using the changeset viewer.