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)
* 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 $
*/
/*
{
struct ath_buf *bf_ff = NULL;
struct ieee80211_node *ni = NULL;
- int pktlen;
int framecnt;
for (;;) {
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:
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;
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.
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;
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);
%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).
* (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
struct sk_buff *skb;
int pktlen;
u_int8_t *frm;
- struct ieee80211_rateset *rs;
/*
* beacon frame format
* 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 */
* (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
/* 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,
* (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_
} 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) { \
* (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
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;
* 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 $
*/
/*
ieee80211_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct ieee80211vap *vap = netdev_priv(dev);
- u_int unit;
switch (cmd) {
case SIOCG80211STATS:
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: