diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-05 10:12:53 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-05 10:12:53 +0000 |
| commit | 5c105d9f3fd086aff195d3849dcf847d6b0bd927 (patch) | |
| tree | 1229a11f725bfa58aa7c57a76898553bb5f6654a /package/madwifi/patches/323-dfs_optional.patch | |
| download | openwrt-5c105d9f3fd086aff195d3849dcf847d6b0bd927.tar.gz openwrt-5c105d9f3fd086aff195d3849dcf847d6b0bd927.zip | |
branch Attitude Adjustment
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33625 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 | 38 |
1 files changed, 38 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 000000000..2336d7484 --- /dev/null +++ b/package/madwifi/patches/323-dfs_optional.patch @@ -0,0 +1,38 @@ +--- a/ath/if_ath.c ++++ b/ath/if_ath.c +@@ -1778,17 +1778,14 @@ ath_uapsd_processtriggers(struct ath_sof + * 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, +--- a/ath/if_ath_radar.c ++++ b/ath/if_ath_radar.c +@@ -265,7 +265,7 @@ int ath_radar_update(struct ath_softc *s + 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 | |