diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-01-28 18:34:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-01-28 18:34:06 +0000 |
| commit | b3378a4f120657d96db891ce19ed6533f99d1f94 (patch) | |
| tree | 4c9c7d142b19e68c4c34cc70bc3ef7884e7254ea /package/madwifi/patches/323-dfs_optional.patch | |
| parent | 9337d3de3c936d0a77cf3e348e282f0754ab4dd0 (diff) | |
| download | master-187ad058-b3378a4f120657d96db891ce19ed6533f99d1f94.tar.gz master-187ad058-b3378a4f120657d96db891ce19ed6533f99d1f94.tar.bz2 master-187ad058-b3378a4f120657d96db891ce19ed6533f99d1f94.zip | |
update madwifi to latest trunk, include a few more fixes/improvements
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10294 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/323-dfs_optional.patch')
| -rw-r--r-- | package/madwifi/patches/323-dfs_optional.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/package/madwifi/patches/323-dfs_optional.patch b/package/madwifi/patches/323-dfs_optional.patch new file mode 100644 index 0000000000..4e3f0f6f8a --- /dev/null +++ b/package/madwifi/patches/323-dfs_optional.patch @@ -0,0 +1,42 @@ +Index: madwifi-trunk-r3280/ath/if_ath.c +=================================================================== +--- madwifi-trunk-r3280.orig/ath/if_ath.c 2008-01-28 18:17:03.786862678 +0100 ++++ madwifi-trunk-r3280/ath/if_ath.c 2008-01-28 18:21:43.162783406 +0100 +@@ -1754,17 +1754,14 @@ + * may have occurred in the intervening timeframe. */ + bf->bf_channoise = ic->ic_channoise; + +- if (rs->rs_status) { +- if ((HAL_RXERR_PHY == rs->rs_status) && +- (HAL_PHYERR_RADAR == +- (rs->rs_phyerr & 0x1f)) && +- (0 == (bf->bf_status & +- ATH_BUFSTATUS_RADAR_DONE))) { +- check_for_radar = 1; +- } +- /* Skip past the error now */ ++ if ((HAL_RXERR_PHY == rs->rs_status) && ++ (HAL_PHYERR_RADAR == (rs->rs_phyerr & 0x1f)) && ++ (0 == (bf->bf_status & ATH_BUFSTATUS_RADAR_DONE)) && ++ (ic->ic_flags & IEEE80211_F_DOTH)) ++ check_for_radar = 1; ++ ++ if (rs->rs_status) /* Skip past the error now */ + continue; +- } + + /* Prepare wireless header for examination */ + bus_dma_sync_single(sc->sc_bdev, bf->bf_skbaddr, +Index: madwifi-trunk-r3280/ath/if_ath_radar.c +=================================================================== +--- madwifi-trunk-r3280.orig/ath/if_ath_radar.c 2008-01-28 18:20:47.859631857 +0100 ++++ madwifi-trunk-r3280/ath/if_ath_radar.c 2008-01-28 18:20:50.915806019 +0100 +@@ -265,7 +265,7 @@ + unsigned int new_rxfilt = old_rxfilt; + + ath_hal_intrset(ah, old_ier & ~HAL_INT_GLOBAL); +- if (required) { ++ if ((required) && (ic->ic_flags & IEEE80211_F_DOTH)) { + new_radar |= AR5K_PHY_RADAR_ENABLE; + new_filter |= AR5K_AR5212_PHY_ERR_FIL_RADAR; + new_rxfilt |= (HAL_RX_FILTER_PHYERR | |