Changeset 11863


Ignore:
Timestamp:
2008-07-18T20:57:01+02:00 (10 years ago)
Author:
nbd
Message:

fix some unused variables

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/patches-r3776/300-napi_polling.patch

    r11851 r11863  
    11Index: madwifi-trunk-r3776/ath/if_ath.c 
    22=================================================================== 
    3 --- madwifi-trunk-r3776.orig/ath/if_ath.c       2008-07-17 01:20:11.000000000 +0200 
    4 +++ madwifi-trunk-r3776/ath/if_ath.c    2008-07-17 01:46:37.000000000 +0200 
     3--- madwifi-trunk-r3776.orig/ath/if_ath.c       2008-07-18 20:35:03.000000000 +0200 
     4+++ madwifi-trunk-r3776/ath/if_ath.c    2008-07-18 20:37:47.000000000 +0200 
    55@@ -182,7 +182,11 @@ 
    66        struct sk_buff *, int, int, u_int64_t); 
     
    131131                dev->flags &= ~IFF_RUNNING;     /* NB: avoid recursion */ 
    132132                ieee80211_stop_running(ic);     /* stop all VAPs */ 
    133 @@ -4109,6 +4148,39 @@ 
     133@@ -4109,6 +4148,43 @@ 
    134134        return ath_keyset(sc, k, mac, vap->iv_bss); 
    135135 } 
     
    137137+static void ath_poll_disable(struct net_device *dev) 
    138138+{ 
     139+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
    139140+       struct ath_softc *sc = dev->priv; 
     141+#endif 
    140142+ 
    141143+       /* 
     
    155157+static void ath_poll_enable(struct net_device *dev) 
    156158+{ 
     159+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 
    157160+       struct ath_softc *sc = dev->priv; 
     161+#endif 
    158162+ 
    159163+       /* NB: see above */ 
     
    171175  * Block/unblock tx+rx processing while a key change is done. 
    172176  * We assume the caller serializes key management operations 
    173 @@ -4119,33 +4191,26 @@ 
     177@@ -4119,33 +4195,26 @@ 
    174178 ath_key_update_begin(struct ieee80211vap *vap) 
    175179 { 
     
    210214  
    211215 /* 
    212 @@ -6405,15 +6470,25 @@ 
     216@@ -6405,15 +6474,25 @@ 
    213217        sc->sc_numrxotherant = 0; 
    214218 } 
     
    240244        struct ath_hal *ah = sc ? sc->sc_ah : NULL; 
    241245        struct ath_desc *ds; 
    242 @@ -6421,6 +6496,7 @@ 
     246@@ -6421,6 +6500,7 @@ 
    243247        struct ieee80211_node *ni; 
    244248        struct sk_buff *skb = NULL; 
     
    248252        int init_ret = 0; 
    249253        int bf_processed = 0; 
    250 @@ -6428,6 +6504,7 @@ 
     254@@ -6428,6 +6508,7 @@ 
    251255        int errors       = 0; 
    252256  
     
    256260                /* Get next RX buffer pending processing by RX tasklet... 
    257261                 *   
    258 @@ -6457,6 +6534,10 @@ 
     262@@ -6457,6 +6538,10 @@ 
    259263                        break; 
    260264  
     
    267271  
    268272 #ifdef AR_DEBUG 
    269 @@ -6491,6 +6572,7 @@ 
     273@@ -6491,6 +6576,7 @@ 
    270274                                sc->sc_stats.ast_rx_phyerr++; 
    271275                                phyerr = rs->rs_phyerr & 0x1f; 
     
    275279                        if (rs->rs_status & HAL_RXERR_DECRYPT) { 
    276280                                /* Decrypt error.  If the error occurred 
    277 @@ -6689,6 +6771,33 @@ 
     281@@ -6689,6 +6775,33 @@ 
    278282                STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); 
    279283                ATH_RXBUF_UNLOCK_IRQ(sc); 
     
    309313        if (sc->sc_useintmit)  
    310314                ath_hal_rxmonitor(ah, &sc->sc_halstats, &sc->sc_curchan); 
    311 @@ -6701,6 +6810,12 @@ 
     315@@ -6701,6 +6814,12 @@ 
    312316                " %d rx buf processed. %d were errors. %d skb accepted.\n", 
    313317                __func__, bf_processed, errors, skb_accepted); 
     
    322326  
    323327 #ifdef ATH_SUPERG_XR 
    324 @@ -8306,12 +8421,24 @@ 
     328@@ -8306,12 +8425,24 @@ 
    325329 { 
    326330        struct net_device *dev = (struct net_device *)data; 
     
    347351  
    348352        if (sc->sc_softled) 
    349 @@ -8327,7 +8454,9 @@ 
     353@@ -8327,7 +8458,9 @@ 
    350354 { 
    351355        struct net_device *dev = (struct net_device *)data; 
     
    357361         * Process each active queue. 
    358362         */ 
    359 @@ -8357,6 +8486,16 @@ 
     363@@ -8357,6 +8490,16 @@ 
    360364        if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum)) 
    361365                ath_tx_processq(sc, sc->sc_uapsdq); 
     
    374378  
    375379        if (sc->sc_softled) 
    376 @@ -10322,9 +10461,9 @@ 
     380@@ -10322,9 +10465,9 @@ 
    377381        dev->mtu = mtu; 
    378382        if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) { 
     
    388392Index: madwifi-trunk-r3776/ath/if_athvar.h 
    389393=================================================================== 
    390 --- madwifi-trunk-r3776.orig/ath/if_athvar.h    2008-07-17 00:52:28.000000000 +0200 
    391 +++ madwifi-trunk-r3776/ath/if_athvar.h 2008-07-17 01:27:21.000000000 +0200 
     394--- madwifi-trunk-r3776.orig/ath/if_athvar.h    2008-07-18 20:35:03.000000000 +0200 
     395+++ madwifi-trunk-r3776/ath/if_athvar.h 2008-07-18 20:37:09.000000000 +0200 
    392396@@ -56,6 +56,10 @@ 
    393397 # include      <asm/bitops.h> 
     
    438442Index: madwifi-trunk-r3776/net80211/ieee80211_skb.c 
    439443=================================================================== 
    440 --- madwifi-trunk-r3776.orig/net80211/ieee80211_skb.c   2008-07-17 00:21:29.000000000 +0200 
    441 +++ madwifi-trunk-r3776/net80211/ieee80211_skb.c        2008-07-17 01:42:17.000000000 +0200 
     444--- madwifi-trunk-r3776.orig/net80211/ieee80211_skb.c   2008-07-18 20:32:42.000000000 +0200 
     445+++ madwifi-trunk-r3776/net80211/ieee80211_skb.c        2008-07-18 20:35:03.000000000 +0200 
    442446@@ -73,7 +73,7 @@ 
    443447 #undef dev_queue_xmit 
     
    471475Index: madwifi-trunk-r3776/net80211/ieee80211_skb.h 
    472476=================================================================== 
    473 --- madwifi-trunk-r3776.orig/net80211/ieee80211_skb.h   2008-07-17 00:21:29.000000000 +0200 
    474 +++ madwifi-trunk-r3776/net80211/ieee80211_skb.h        2008-07-17 01:42:43.000000000 +0200 
     477--- madwifi-trunk-r3776.orig/net80211/ieee80211_skb.h   2008-07-18 20:32:42.000000000 +0200 
     478+++ madwifi-trunk-r3776/net80211/ieee80211_skb.h        2008-07-18 20:35:03.000000000 +0200 
    475479@@ -115,7 +115,7 @@ 
    476480  
     
    504508Index: madwifi-trunk-r3776/net80211/ieee80211_input.c 
    505509=================================================================== 
    506 --- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c 2008-07-17 00:21:29.000000000 +0200 
    507 +++ madwifi-trunk-r3776/net80211/ieee80211_input.c      2008-07-17 01:41:16.000000000 +0200 
     510--- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c 2008-07-18 20:32:42.000000000 +0200 
     511+++ madwifi-trunk-r3776/net80211/ieee80211_input.c      2008-07-18 20:37:09.000000000 +0200 
    508512@@ -1185,7 +1185,7 @@ 
    509513                        ret = vlan_hwaccel_rx(skb, 
     
    526530Index: madwifi-trunk-r3776/net80211/ieee80211_monitor.c 
    527531=================================================================== 
    528 --- madwifi-trunk-r3776.orig/net80211/ieee80211_monitor.c       2008-07-17 00:21:29.000000000 +0200 
    529 +++ madwifi-trunk-r3776/net80211/ieee80211_monitor.c    2008-07-17 01:41:51.000000000 +0200 
     532--- madwifi-trunk-r3776.orig/net80211/ieee80211_monitor.c       2008-07-18 20:32:42.000000000 +0200 
     533+++ madwifi-trunk-r3776/net80211/ieee80211_monitor.c    2008-07-18 20:35:03.000000000 +0200 
    530534@@ -580,7 +580,7 @@ 
    531535  
Note: See TracChangeset for help on using the changeset viewer.