[svn-upgrade] new version madwifi (0.9.4+r4139.20110504)

diff --git a/SNAPSHOT b/SNAPSHOT
index 89bacb56df5f2cb20ca76b6b562c53b14cfd4629..d1516e9e3e0a2f79ce172eff85a0d57ad7daa0e8 100644 (file)
--- a/SNAPSHOT
+++ b/SNAPSHOT
@@ -2,7 +2,7 @@ Path: madwifi/branches/madwifi-0.9.4
 URL: http://svn.madwifi-project.org/madwifi/branches/madwifi-0.9.4
 Repository Root: http://svn.madwifi-project.org
 Repository UUID: 0192ed92-7a03-0410-a25b-9323aeb14dbd
-Revision: 4136
+Revision: 4139
 Last Changed Author: proski
-Last Changed Rev: 4136
-Last Changed Date: 2011-02-02 22:22:31 +0100 (Wed, 02 Feb 2011)
+Last Changed Rev: 4139
+Last Changed Date: 2011-05-04 00:07:34 +0200 (Wed, 04 May 2011)

diff --git a/ath/if_ath.c b/ath/if_ath.c
index b26e1f56cf9b015aa79aa3e157907805302cb6ae..e571ed3bc18402f72680e78fcc460a65c7fce665 100644 (file)
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: if_ath.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: if_ath.c 4139 2011-05-03 22:07:34Z proski $
  */
 
 /*
@@ -2494,7 +2494,6 @@ ath_ffstageq_flush(struct ath_softc *sc, struct ath_txq *txq,
 {
        struct ath_buf *bf_ff = NULL;
        struct ieee80211_node *ni = NULL;
-       int pktlen;
        int framecnt;
 
        for (;;) {
@@ -2523,7 +2522,6 @@ ath_ffstageq_flush(struct ath_softc *sc, struct ath_txq *txq,
                        sc->sc_stats.ast_tx_encap++;
                        goto bad;
                }
-               pktlen = bf_ff->bf_skb->len;    /* NB: don't reference skb below */
                if (ath_tx_start(sc->sc_dev, ni, bf_ff, bf_ff->bf_skb, 0) == 0)
                        continue;
        bad:
@@ -2585,7 +2583,6 @@ ath_hardstart(struct sk_buff *skb, struct net_device *dev)
        int framecnt;
        int requeue = 0;
 #ifdef ATH_SUPERG_FF
-       int pktlen;
        struct ieee80211com *ic = &sc->sc_ic;
        struct ath_node *an;
        struct ath_txq *txq = NULL;
@@ -2720,7 +2717,6 @@ ath_hardstart(struct sk_buff *skb, struct net_device *dev)
                                sc->sc_stats.ast_tx_encap++;
                                goto ff_flushbad;
                        }
-                       pktlen = bf_ff->bf_skb->len;    /* NB: don't reference skb below */
                        /* NB: ath_tx_start() will use ATH_TXBUF_LOCK_BH(). The _BH
                         *     portion is not needed here since we're running at
                         *     interrupt time, but should be harmless.
@@ -3758,7 +3754,6 @@ ath_check_beacon_done(struct ath_softc *sc)
        struct ieee80211vap *vap=NULL;
        struct ath_vap *avp;
        struct ath_buf *bf;
-       struct sk_buff *skb;
        struct ath_desc *ds;
        struct ath_hal *ah = sc->sc_ah;
        int slot;
@@ -3776,7 +3771,6 @@ ath_check_beacon_done(struct ath_softc *sc)
                 return 0;
        avp = ATH_VAP(vap);
        bf = avp->av_bcbuf;
-       skb = bf->bf_skb;
        ds = bf->bf_desc;
 
        return (ath_hal_txprocdesc(ah, ds) != HAL_EINPROGRESS);

diff --git a/contrib/madwifi.spec b/contrib/madwifi.spec
index 49c2cc651432fb228695441345b8670fae21b5d6..79f4c0d98cb9abd56ad17327dea410013d25252d 100644 (file)
--- a/contrib/madwifi.spec
+++ b/contrib/madwifi.spec
@@ -10,8 +10,8 @@
 %define       mykrelver         %(echo %{mykversion} | tr -s '-' '_')
 # Define based on the tar ball extract.
 # Those two variable will be instanced during the tarball generation
-%define       revision       4136
-%define       snapshot       20110203
+%define       revision       4139
+%define       snapshot       20110504
 # branch is not used yet.
 %define       branch         trunk
 Summary: A linux device driver for Atheros chipsets (ar5210, ar5211, ar5212).

diff --git a/net80211/ieee80211_beacon.c b/net80211/ieee80211_beacon.c
index a248e80d64aad67754c6917107d2854ab2d5458e..b327cb8f65721f01eb9dadc9563b038a2fe905b6 100644 (file)
--- a/net80211/ieee80211_beacon.c
+++ b/net80211/ieee80211_beacon.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_beacon.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: ieee80211_beacon.c 4139 2011-05-03 22:07:34Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -201,7 +201,6 @@ ieee80211_beacon_alloc(struct ieee80211_node *ni,
        struct sk_buff *skb;
        int pktlen;
        u_int8_t *frm;
-       struct ieee80211_rateset *rs;
 
        /*
         * beacon frame format
@@ -224,7 +223,6 @@ ieee80211_beacon_alloc(struct ieee80211_node *ni,
         * XXX Vendor-specific OIDs (e.g. Atheros)
         * NB: we allocate the max space required for the TIM bitmap.
         */
-       rs = &ni->ni_rates;
        pktlen =   8                                    /* time stamp */
                 + sizeof(u_int16_t)                    /* beacon interval */
                 + sizeof(u_int16_t)                    /* capability information */

diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c
index 0359755f4532990362d6c394e3ef97442dbd0b28..07fc5fa8051c022529545a72dfcde5d8dad15382 100644 (file)
--- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_input.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: ieee80211_input.c 4139 2011-05-03 22:07:34Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -3678,7 +3678,7 @@ ieee80211_recv_pspoll(struct ieee80211_node *ni, struct sk_buff *skb0)
 
        /* Okay, take the first queued packet and put it out... */
        IEEE80211_NODE_SAVEQ_LOCK(ni);
-       IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen);
+       qlen = IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb);
        IEEE80211_NODE_SAVEQ_UNLOCK(ni);
        if (skb == NULL) {
                IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2,

diff --git a/net80211/ieee80211_linux.h b/net80211/ieee80211_linux.h
index 3213e712aab7f76c9c36a128f660ebaa38ff097e..89a4592afe02ff30f79080820a49222e2dbadfe1 100644 (file)
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_linux.h 4100 2009-09-28 23:07:12Z proski $
+ * $Id: ieee80211_linux.h 4139 2011-05-03 22:07:34Z proski $
  */
 #ifndef _NET80211_IEEE80211_LINUX_H_
 #define _NET80211_IEEE80211_LINUX_H_
@@ -259,10 +259,10 @@ typedef spinlock_t acl_lock_t;
 } while (0)
 
 /* caller MUST lock IEEE80211_NODE_SAVEQ */
-#define        IEEE80211_NODE_SAVEQ_DEQUEUE(_ni, _skb, _qlen) do {     \
+#define        IEEE80211_NODE_SAVEQ_DEQUEUE(_ni, _skb) ({              \
        _skb = __skb_dequeue(&(_ni)->ni_savedq);                \
-       (_qlen) = skb_queue_len(&(_ni)->ni_savedq);             \
-} while (0)
+       skb_queue_len(&(_ni)->ni_savedq);                       \
+})
 #define        _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _skb, _qlen, _age) do {      \
        struct sk_buff *tail = skb_peek_tail(&(_ni)->ni_savedq);        \
        if (tail != NULL) {                                             \

diff --git a/net80211/ieee80211_power.c b/net80211/ieee80211_power.c
index c8aa16e832052d7a90618b00d6f829bc0e3ffc8e..270af4b0cd2bf6d558a09bea5ea7f5a1dbd08bf8 100644 (file)
--- a/net80211/ieee80211_power.c
+++ b/net80211/ieee80211_power.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_power.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: ieee80211_power.c 4139 2011-05-03 22:07:34Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -293,10 +293,9 @@ ieee80211_node_pwrsave(struct ieee80211_node *ni, int enable)
                IEEE80211_NODE_SAVEQ_QLEN(ni));
        for (;;) {
                struct sk_buff *skb;
-               int qlen;
 
                IEEE80211_NODE_SAVEQ_LOCK(ni);
-               IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen);
+               IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb);
                IEEE80211_NODE_SAVEQ_UNLOCK(ni);
                if (skb == NULL)
                        break;

diff --git a/net80211/ieee80211_wireless.c b/net80211/ieee80211_wireless.c
index 7492ffd2d289b976a5aba9ac3f54886278a9de06..a2cfe6f36a9e1e1bece1a0833a3aee35315c5b33 100644 (file)
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: ieee80211_wireless.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: ieee80211_wireless.c 4139 2011-05-03 22:07:34Z proski $
  */
 
 /*
@@ -5322,7 +5322,6 @@ int
 ieee80211_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        struct ieee80211vap *vap = netdev_priv(dev);
-       u_int unit;
 
        switch (cmd) {
        case SIOCG80211STATS:
@@ -5332,7 +5331,6 @@ ieee80211_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
                ieee80211_stop(vap->iv_dev);    /* force state before cleanup */
-               unit = vap->iv_unit;
                vap->iv_ic->ic_vap_delete(vap);
                return 0;
        case IEEE80211_IOCTL_GETKEY: