Changeset 13520


Ignore:
Timestamp:
2008-12-04T20:54:16+01:00 (8 years ago)
Author:
nbd
Message:

madwifi: fix the autochannel patch

Location:
trunk/package/madwifi/patches
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/patches/389-autochannel.patch

    r13420 r13520  
    1717        sc->sc_curchan.channelFlags = ath_chan2flags(ic->ic_curchan); 
    1818        if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) { 
    19 @@ -2913,6 +2915,34 @@ ath_hw_check_atim(struct ath_softc *sc,  
     19@@ -2913,6 +2915,37 @@ ath_hw_check_atim(struct ath_softc *sc,  
    2020 } 
    2121  
     
    3232+ 
    3333+       if (sc->sc_ah->ah_macType < 5212) 
     34+               return; 
     35+ 
     36+       if (!ic->ic_curchan || (ic->ic_curchan == IEEE80211_CHAN_ANYC)) 
    3437+               return; 
    3538+ 
     
    5255  * Reset the hardware w/o losing operational state.  This is 
    5356  * basically a more efficient way of doing ath_stop, ath_init, 
    54 @@ -2939,6 +2969,7 @@ ath_reset(struct net_device *dev) 
     57@@ -2939,6 +2972,7 @@ ath_reset(struct net_device *dev) 
    5558         * Convert to a HAL channel description with the flags 
    5659         * constrained to reflect the current operating mode. 
     
    6063        sc->sc_curchan.channel = c->ic_freq; 
    6164        sc->sc_curchan.channelFlags = ath_chan2flags(c); 
    62 @@ -9019,6 +9050,7 @@ ath_chan_set(struct ath_softc *sc, struc 
     65@@ -9019,6 +9053,7 @@ ath_chan_set(struct ath_softc *sc, struc 
    6366        u_int8_t channel_change_required = 0; 
    6467        struct timeval tv; 
  • trunk/package/madwifi/patches/390-frame_type.patch

    r13468 r13520  
    11--- a/net80211/ieee80211_input.c 
    22+++ b/net80211/ieee80211_input.c 
    3 @@ -4421,7 +4421,9 @@ 
     3@@ -4440,7 +4440,9 @@ ath_eth_type_trans(struct sk_buff *skb,  
    44                if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN)) 
    55                        skb->pkt_type = PACKET_OTHERHOST; 
    6  
     6  
    77-       return eth->h_proto; 
    88+       if (ntohs(eth->h_proto) >= 1536) 
     
    1111 } 
    1212 #endif 
    13  
     13  
  • trunk/package/madwifi/patches/406-monitor_r3711.patch

    r13420 r13520  
    11--- a/ath/if_ath.c 
    22+++ b/ath/if_ath.c 
    3 @@ -6504,7 +6504,7 @@ ath_capture(struct net_device *dev, cons 
     3@@ -6507,7 +6507,7 @@ ath_capture(struct net_device *dev, cons 
    44  
    55        /* Never copy the SKB, as it is ours on the RX side, and this is the  
     
    1010                DPRINTF(sc, ATH_DEBUG_ANY, 
    1111                        "Dropping; ath_skb_removepad failed!\n"); 
    12 @@ -6512,6 +6512,8 @@ ath_capture(struct net_device *dev, cons 
     12@@ -6515,6 +6515,8 @@ ath_capture(struct net_device *dev, cons 
    1313        } 
    1414         
  • trunk/package/madwifi/patches/408-changeset_r3337.patch

    r13420 r13520  
    1111--- a/ath/if_ath.c 
    1212+++ b/ath/if_ath.c 
    13 @@ -3123,7 +3123,7 @@ ath_tx_startraw(struct net_device *dev,  
     13@@ -3126,7 +3126,7 @@ ath_tx_startraw(struct net_device *dev,  
    1414        struct ath_softc *sc = dev->priv; 
    1515        struct ath_hal *ah = sc->sc_ah; 
  • trunk/package/madwifi/patches/450-new_hal.patch

    r13420 r13520  
    109109         * Check if the MAC has multi-rate retry support. 
    110110         * We do this by trying to setup a fake extended 
    111 @@ -7518,7 +7526,7 @@ ath_txq_setup(struct ath_softc *sc, int  
     111@@ -7521,7 +7529,7 @@ ath_txq_setup(struct ath_softc *sc, int  
    112112        if (qtype == HAL_TX_QUEUE_UAPSD) 
    113113                qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE; 
Note: See TracChangeset for help on using the changeset viewer.