From 16a7158cf22a6f2bf88f1c8c6f0bb235ca0de0c7 Mon Sep 17 00:00:00 2001 From: benoit Date: Sun, 5 Jul 2009 07:16:27 +0000 Subject: [PATCH] Fix needed in order to compile without Fast Frame feature enabled. git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4071 0192ed92-7a03-0410-a25b-9323aeb14dbd --- ath/if_ath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ath/if_ath.c b/ath/if_ath.c index a3e04ca..0b2fa28 100644 --- a/ath/if_ath.c +++ b/ath/if_ath.c @@ -3325,7 +3325,6 @@ ath_hardstart(struct sk_buff *__skb, struct net_device *dev) struct ath_softc *sc = netdev_priv(dev); struct ieee80211_node *ni = NULL; struct ath_buf *bf = NULL; - struct ether_header *eh; ath_bufhead bf_head; struct ath_buf *tbf; struct sk_buff *tskb; @@ -3340,6 +3339,7 @@ ath_hardstart(struct sk_buff *__skb, struct net_device *dev) */ int requeue = 0; #ifdef ATH_SUPERG_FF + struct ether_header *eh; unsigned int pktlen; struct ieee80211com *ic = &sc->sc_ic; struct ath_txq *txq = NULL; @@ -3382,7 +3382,6 @@ ath_hardstart(struct sk_buff *__skb, struct net_device *dev) } STAILQ_INIT(&bf_head); - eh = (struct ether_header *)skb->data; if (SKB_CB(skb)->flags & M_RAW) { bf = ath_take_txbuf(sc); @@ -3431,6 +3430,7 @@ ath_hardstart(struct sk_buff *__skb, struct net_device *dev) /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq) * in athff_can_aggregate() call too. */ ATH_TXQ_LOCK_IRQ(txq); + eh = (struct ether_header *)skb->data; if (athff_can_aggregate(sc, eh, an, skb, ni->ni_vap->iv_fragthreshold, &ff_flush)) { if (an->an_tx_ffbuf[skb->priority]) { /* i.e., frame on the staging queue */