From 61e57408ea15a0a10d2d5530a7e1702142c25f36 Mon Sep 17 00:00:00 2001 From: proski Date: Wed, 21 Nov 2007 17:18:09 +0000 Subject: [PATCH] Port some formatting fixes from DFS branch git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2898 0192ed92-7a03-0410-a25b-9323aeb14dbd --- ath/if_ath.c | 64 ++++++++++++++++++------------------- net80211/ieee80211_beacon.c | 4 +-- net80211/ieee80211_proto.c | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ath/if_ath.c b/ath/if_ath.c index c8015ee..e0beae3 100644 --- a/ath/if_ath.c +++ b/ath/if_ath.c @@ -2603,15 +2603,15 @@ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) /* XXX check return value? */ ath_hal_setuptxdesc(ah, ds, - pktlen, /* packet length */ - hdrlen, /* header length */ - atype, /* Atheros packet type */ - power, /* txpower */ - txrate, try0, /* series 0 rate/tries */ + pktlen, /* packet length */ + hdrlen, /* header length */ + atype, /* Atheros packet type */ + power, /* txpower */ + txrate, try0, /* series 0 rate/tries */ HAL_TXKEYIX_INVALID, /* key cache index */ - antenna, /* antenna mode */ - flags, /* flags */ - 0, /* rts/cts rate */ + antenna, /* antenna mode */ + flags, /* flags */ + 0, /* rts/cts rate */ 0, /* rts/cts duration */ 0, /* comp icv len */ 0, /* comp iv len */ @@ -2622,7 +2622,7 @@ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) ath_hal_setupxtxdesc(sc->sc_ah, ds, dot11_to_ratecode(sc, rt, ph->rate1), ph->try1, /* series 1 */ dot11_to_ratecode(sc, rt, ph->rate2), ph->try2, /* series 2 */ - dot11_to_ratecode(sc, rt, ph->rate3), ph->try3 /* series 3 */ + dot11_to_ratecode(sc, rt, ph->rate3), ph->try3 /* series 3 */ ); } bf->bf_flags = flags; /* record for post-processing */ @@ -2631,9 +2631,9 @@ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) ds->ds_data = bf->bf_skbaddr; ath_hal_filltxdesc(ah, ds, - skb->len, /* segment length */ - AH_TRUE, /* first segment */ - AH_TRUE, /* last segment */ + skb->len, /* segment length */ + AH_TRUE, /* first segment */ + AH_TRUE, /* last segment */ ds /* first descriptor */ ); @@ -2735,9 +2735,9 @@ ath_ffstageq_flush(struct ath_softc *sc, struct ath_txq *txq, DPRINTF(sc, ATH_DEBUG_XMIT, \ "%s: stop queue\n", __func__); \ sc->sc_stats.ast_tx_qstop++; \ - netif_stop_queue(dev); \ + netif_stop_queue(dev); \ sc->sc_devstopped = 1; \ - ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, NULL); \ + ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, NULL); \ } \ ATH_TXBUF_UNLOCK_IRQ(sc); \ if (bf == NULL) { /* NB: should not happen */ \ @@ -4047,7 +4047,7 @@ ath_beaconq_setup(struct ath_softc *sc) qnum = ath_hal_setuptxqueue(sc->sc_ah, HAL_TX_QUEUE_BEACON, &qi); txq = &sc->sc_txq[qnum]; memset(txq, 0, sizeof(struct ath_txq)); - txq->axq_qnum = qnum; + txq->axq_qnum = qnum; STAILQ_INIT(&txq->axq_q); ATH_TXQ_LOCK_INIT(txq); TAILQ_INIT(&txq->axq_stageq); @@ -4259,26 +4259,26 @@ ath_beacon_setup(struct ath_softc *sc, struct ath_buf *bf) } #endif ath_hal_setuptxdesc(ah, ds, - skb->len + IEEE80211_CRC_LEN, /* frame length */ + skb->len + IEEE80211_CRC_LEN, /* frame length */ sizeof(struct ieee80211_frame), /* header length */ - HAL_PKT_TYPE_BEACON, /* Atheros packet type */ - bf->bf_node->ni_txpower, /* txpower XXX */ - rate, 1, /* series 0 rate/tries */ - HAL_TXKEYIX_INVALID, /* no encryption */ - antenna, /* antenna mode */ - flags, /* no ack, veol for beacons */ - ctsrate, /* rts/cts rate */ - ctsduration, /* rts/cts duration */ - 0, /* comp icv len */ - 0, /* comp iv len */ + HAL_PKT_TYPE_BEACON, /* Atheros packet type */ + bf->bf_node->ni_txpower, /* txpower XXX */ + rate, 1, /* series 0 rate/tries */ + HAL_TXKEYIX_INVALID, /* no encryption */ + antenna, /* antenna mode */ + flags, /* no ack, veol for beacons */ + ctsrate, /* rts/cts rate */ + ctsduration, /* rts/cts duration */ + 0, /* comp icv len */ + 0, /* comp iv len */ ATH_COMP_PROC_NO_COMP_NO_CCS /* comp scheme */ ); /* NB: beacon's BufLen must be a multiple of 4 bytes */ ath_hal_filltxdesc(ah, ds, - roundup(skb->len, 4), /* buffer length */ - AH_TRUE, /* first segment */ - AH_TRUE, /* last segment */ + roundup(skb->len, 4), /* buffer length */ + AH_TRUE, /* first segment */ + AH_TRUE, /* last segment */ ds /* first descriptor */ ); @@ -5616,7 +5616,7 @@ ath_rxbuf_init(struct ath_softc *sc, struct ath_buf *bf) ds->ds_link = bf->bf_daddr; /* link to self */ ds->ds_data = bf->bf_skbaddr; ath_hal_setuprxdesc(ah, ds, - skb_tailroom(skb), /* buffer size */ + skb_tailroom(skb), /* buffer size */ 0); if (sc->sc_rxlink != NULL) *sc->sc_rxlink = bf->bf_daddr; @@ -9591,7 +9591,7 @@ enum { ATH_TXANTENNA = 9, ATH_RXANTENNA = 10, ATH_DIVERSITY = 11, - ATH_TXINTRPERIOD = 12, + ATH_TXINTRPERIOD = 12, ATH_FFTXQMIN = 18, ATH_XR_POLL_PERIOD = 21, ATH_XR_POLL_COUNT = 22, @@ -9780,7 +9780,7 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos) ret = -EINVAL; break; } - if(!ret) { + if (!ret) { ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos); } } diff --git a/net80211/ieee80211_beacon.c b/net80211/ieee80211_beacon.c index 57fa351..6d4c9e0 100644 --- a/net80211/ieee80211_beacon.c +++ b/net80211/ieee80211_beacon.c @@ -293,7 +293,7 @@ ieee80211_beacon_update(struct ieee80211_node *ni, IEEE80211_LOCK_IRQ(ic); if ((ic->ic_flags & IEEE80211_F_DOTH) && - (vap->iv_flags & IEEE80211_F_CHANSWITCH)) { + (vap->iv_flags & IEEE80211_F_CHANSWITCH)) { struct ieee80211_channel *c = ieee80211_doth_findchan(vap, ic->ic_chanchange_chan); @@ -549,7 +549,7 @@ ieee80211_beacon_update(struct ieee80211_node *ni, len_changed = 1; } - memcpy(bo->bo_appie_buf,vap->app_ie[IEEE80211_APPIE_FRAME_BEACON].ie, + memcpy(bo->bo_appie_buf, vap->app_ie[IEEE80211_APPIE_FRAME_BEACON].ie, vap->app_ie[IEEE80211_APPIE_FRAME_BEACON].length); vap->iv_flags_ext &= ~IEEE80211_FEXT_APPIE_UPDATE; diff --git a/net80211/ieee80211_proto.c b/net80211/ieee80211_proto.c index 9a3454c..74e7ad4 100644 --- a/net80211/ieee80211_proto.c +++ b/net80211/ieee80211_proto.c @@ -1573,7 +1573,7 @@ __ieee80211_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int !(vap->iv_flags & IEEE80211_F_XR)) { vap->iv_xrvapstart.function = ieee80211_start_xrvap; vap->iv_xrvapstart.data = (unsigned long) vap->iv_xrvap; - mod_timer(&vap->iv_xrvapstart,jiffies+HZ); /* start xr vap on next second */ + mod_timer(&vap->iv_xrvapstart, jiffies + HZ); /* start xr vap on next second */ /* * do not let the normal vap automatically bring up XR vap. * let the timer handler start the XR vap. if you let the