mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 14:31:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Formatting and style for r3189

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3194 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mentor 2008-01-17 02:45:41 +00:00
parent 09ffca4d23
commit 86891cd55e
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ath/if_ath.c
View File

@ -552,8 +552,8 @@ ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, devid); DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, devid);
/* Allocate space for dynamically determined maximum VAP count */ /* Allocate space for dynamically determined maximum VAP count */
sc->sc_bslot = kmalloc(ath_maxvaps * sizeof(struct ieee80211vap), GFP_KERNEL); sc->sc_bslot =
memset(sc->sc_bslot, 0, ath_maxvaps * sizeof(struct ieee80211vap)); kzalloc(ath_maxvaps * sizeof(struct ieee80211vap), GFP_KERNEL);
/* /*
* Cache line size is used to size and align various * Cache line size is used to size and align various
@ -645,7 +645,7 @@ ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
ath_maxvaps = maxvaps; ath_maxvaps = maxvaps;
if (ath_maxvaps < ATH_MAXVAPS_MIN) if (ath_maxvaps < ATH_MAXVAPS_MIN)
ath_maxvaps = ATH_MAXVAPS_MIN; ath_maxvaps = ATH_MAXVAPS_MIN;
if (ath_maxvaps > ATH_MAXVAPS_MAX) else if (ath_maxvaps > ATH_MAXVAPS_MAX)
ath_maxvaps = ATH_MAXVAPS_MAX; ath_maxvaps = ATH_MAXVAPS_MAX;
} }
if (outdoor != -1) if (outdoor != -1)
@ -1380,11 +1380,12 @@ ath_vap_create(struct ieee80211com *ic, const char *name,
*/ */
/* XXX check for beacon interval too small */ /* XXX check for beacon interval too small */
if (ath_maxvaps > 4) { if (ath_maxvaps > 4) {
DPRINTF(sc, ATH_DEBUG_BEACON, "Staggered beacons are not possible " DPRINTF(sc, ATH_DEBUG_BEACON,
"with maxvaps set to %d.\n", ath_maxvaps); "Staggered beacons are not "
"possible with maxvaps set "
"to %d.\n", ath_maxvaps);
sc->sc_stagbeacons = 0; sc->sc_stagbeacons = 0;
} } else {
else {
sc->sc_stagbeacons = 1; sc->sc_stagbeacons = 1;
} }
} }
@ -3042,7 +3043,6 @@ ath_hardstart(struct sk_buff *skb, struct net_device *dev)
ath_bufhead bf_head; ath_bufhead bf_head;
struct ath_buf *tbf, *tempbf; struct ath_buf *tbf, *tempbf;
struct sk_buff *tskb; struct sk_buff *tskb;
struct ieee80211vap *vap;
int framecnt; int framecnt;
int requeue = 0; int requeue = 0;
#ifdef ATH_SUPERG_FF #ifdef ATH_SUPERG_FF
@ -3083,11 +3083,7 @@ ath_hardstart(struct sk_buff *skb, struct net_device *dev)
goto hardstart_fail; goto hardstart_fail;
} }
vap = ni->ni_vap;
#ifdef ATH_SUPERG_FF #ifdef ATH_SUPERG_FF
if (M_FLAG_GET(skb, M_UAPSD)) { if (M_FLAG_GET(skb, M_UAPSD)) {
/* bypass FF handling */ /* bypass FF handling */
bf = ath_take_txbuf(sc); bf = ath_take_txbuf(sc);
@ -3141,7 +3137,7 @@ ath_hardstart(struct sk_buff *skb, struct net_device *dev)
* in athff_can_aggregate() call too. */ * in athff_can_aggregate() call too. */
ATH_TXQ_LOCK_IRQ(txq); ATH_TXQ_LOCK_IRQ(txq);
if (athff_can_aggregate(sc, eh, an, skb, if (athff_can_aggregate(sc, eh, an, skb,
vap->iv_fragthreshold, &ff_flush)) { ni->ni_vap->iv_fragthreshold, &ff_flush)) {
if (an->an_tx_ffbuf[skb->priority]) { /* i.e., frame on the staging queue */ if (an->an_tx_ffbuf[skb->priority]) { /* i.e., frame on the staging queue */
bf = an->an_tx_ffbuf[skb->priority]; bf = an->an_tx_ffbuf[skb->priority];