refresh madwifi patches using upstream style
[oweals/openwrt.git] / package / madwifi / patches / 349-reset.patch
1 --- a/ath/if_ath.c
2 +++ b/ath/if_ath.c
3 @@ -2479,7 +2479,7 @@
4          */
5         sc->sc_curchan.channel = ic->ic_curchan->ic_freq;
6         sc->sc_curchan.channelFlags = ath_chan2flags(ic->ic_curchan);
7 -       if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) {
8 +       if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_TRUE, &status)) {
9                 EPRINTF(sc, "unable to reset hardware: '%s' (HAL status %u) "
10                         "(freq %u flags 0x%x)\n", 
11                         ath_get_hal_status_desc(status), status,
12 @@ -8853,8 +8853,7 @@
13                  * needed to do the reset with chanchange = AH_FALSE in order
14                  * to receive traffic when peforming high velocity channel
15                  * changes. */
16 -               if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)   ||
17 -                   !ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_FALSE, &status)) {
18 +               if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)) {
19                         EPRINTF(sc, "Unable to reset channel %u (%u MHz) "
20                                 "flags 0x%x '%s' (HAL status %u)\n",
21                                 ieee80211_chan2ieee(ic, chan), chan->ic_freq,