Changeset 17219


Ignore:
Timestamp:
2009-08-11T04:14:15+02:00 (8 years ago)
Author:
nbd
Message:

madwifi: fix compile error on kernels without net_device api compatibility

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

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/patches/432-netdev_ops.patch

    r16889 r17219  
    4646 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
    4747        netif_napi_add(dev, &sc->sc_napi, ath_rx_poll, 64); 
    48 @@ -12729,8 +12747,13 @@ ath_rcv_dev_event(struct notifier_block  
     48@@ -1257,7 +1275,6 @@ ath_detach(struct net_device *dev) 
     49        ath_dynamic_sysctl_unregister(sc); 
     50        ATH_LOCK_DESTROY(sc); 
     51        ATH_HAL_LOCK_DESTROY(sc); 
     52-       dev->stop = NULL; /* prevent calling ath_stop again */ 
     53        unregister_netdev(dev); 
     54        return 0; 
     55 } 
     56@@ -12729,8 +12746,13 @@ ath_rcv_dev_event(struct notifier_block  
    4957        struct net_device *dev = (struct net_device *)ptr; 
    5058        struct ath_softc *sc = (struct ath_softc *)netdev_priv(dev); 
  • trunk/package/madwifi/patches/436-injection_checks.patch

    r16224 r17219  
    11--- a/ath/if_ath.c 
    22+++ b/ath/if_ath.c 
    3 @@ -3200,7 +3200,13 @@ ath_tx_startraw(struct net_device *dev,  
     3@@ -3199,7 +3199,13 @@ ath_tx_startraw(struct net_device *dev,  
    44        struct ieee80211_frame *wh; 
    55  
     
    1515        txrate = dot11_to_ratecode(sc, rt, ph->rate0); 
    1616        power = ph->power > 63 ? 63 : ph->power; 
    17 @@ -3225,7 +3231,8 @@ ath_tx_startraw(struct net_device *dev,  
     17@@ -3224,7 +3230,8 @@ ath_tx_startraw(struct net_device *dev,  
    1818        rt = sc->sc_currates; 
    1919        KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); 
  • trunk/package/madwifi/patches/437-sysctl_cleanup.patch

    r16224 r17219  
    11--- a/ath/if_ath.c 
    22+++ b/ath/if_ath.c 
    3 @@ -11019,38 +11019,38 @@ enum { 
     3@@ -11018,38 +11018,38 @@ enum { 
    44  * mirrored in /proc/sys. 
    55  */ 
  • trunk/package/madwifi/patches/438-poweroffset_sysctl.patch

    r16234 r17219  
    11--- a/ath/if_ath.c 
    22+++ b/ath/if_ath.c 
    3 @@ -10474,11 +10474,11 @@ set_node_txpower(void *arg, struct ieee8 
     3@@ -10473,11 +10473,11 @@ set_node_txpower(void *arg, struct ieee8 
    44  * XXX: this function needs some locking to avoid being called  
    55  * twice/interrupted. Returns the value actually stored. */ 
     
    1717 } 
    1818  
    19 @@ -11029,6 +11029,7 @@ enum { 
     19@@ -11028,6 +11028,7 @@ enum { 
    2020        ATH_DEBUG, 
    2121        ATH_TXANTENNA, 
     
    2525        ATH_TXINTRPERIOD, 
    2626        ATH_FFTXQMIN, 
    27 @@ -11309,6 +11310,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl 
     27@@ -11308,6 +11309,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl 
    2828                                ath_debug_global = (val &  ATH_DEBUG_GLOBAL); 
    2929 #endif 
     
    3535                                /* 
    3636                                 * antenna can be: 
    37 @@ -11476,6 +11480,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl 
     37@@ -11475,6 +11479,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl 
    3838                case ATH_DEBUG: 
    3939                        val = sc->sc_debug | ath_debug_global; 
     
    4545                        val = sc->sc_txantenna; 
    4646                        break; 
    47 @@ -11617,6 +11624,12 @@ static const ctl_table ath_sysctl_templa 
     47@@ -11616,6 +11623,12 @@ static const ctl_table ath_sysctl_templa 
    4848        }, 
    4949 #endif 
  • trunk/package/madwifi/patches/441-fix_ibss_node_handling.patch

    r16889 r17219  
    11--- a/ath/if_ath.c 
    22+++ b/ath/if_ath.c 
    3 @@ -6642,10 +6642,8 @@ static void 
     3@@ -6641,10 +6641,8 @@ static void 
    44 ath_recv_mgmt(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null, 
    55        struct sk_buff *skb, int subtype, int rssi, u_int64_t rtsf) 
     
    1313        u_int64_t hw_tsf, beacon_tsf; 
    1414        u_int32_t hw_tu, beacon_tu, intval; 
    15 @@ -6687,7 +6685,7 @@ ath_recv_mgmt(struct ieee80211vap * vap, 
     15@@ -6686,7 +6684,7 @@ ath_recv_mgmt(struct ieee80211vap * vap, 
    1616                } 
    1717                if ((vap->iv_opmode == IEEE80211_M_IBSS) && 
Note: See TracChangeset for help on using the changeset viewer.