diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-08-28 17:01:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:48:55 -0700 |
| commit | 3c3b00caf98e5fdaa0184026a68f0008a5bf393e (patch) | |
| tree | 45515fb3e3c46db8958fe7f97af30ed465dadfd1 /net | |
| parent | b63bde7bb75f74acf974f43dc2be8798be115007 (diff) | |
| download | linux-stable-3c3b00caf98e5fdaa0184026a68f0008a5bf393e.tar.gz linux-stable-3c3b00caf98e5fdaa0184026a68f0008a5bf393e.tar.bz2 linux-stable-3c3b00caf98e5fdaa0184026a68f0008a5bf393e.zip | |
[MAC80211]: clean up whitespace
This cleans up some whitespace to make the mac80211
version in mainline diverge less from wireless-dev.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ieee80211_ioctl.c | 1 | ||||
| -rw-r--r-- | net/mac80211/ieee80211_sta.c | 1 | ||||
| -rw-r--r-- | net/mac80211/wme.c | 7 | ||||
| -rw-r--r-- | net/mac80211/wpa.c | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c index d48f3aa30e30..383ad5f64c1f 100644 --- a/net/mac80211/ieee80211_ioctl.c +++ b/net/mac80211/ieee80211_ioctl.c @@ -968,6 +968,7 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev, *param = !!(sdata->u.sta.flags & IEEE80211_STA_MIXED_CELL); break; + case PRISM2_PARAM_WMM_ENABLED: if (sdata->type != IEEE80211_IF_TYPE_STA && sdata->type != IEEE80211_IF_TYPE_IBSS) diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index a2443271629a..f98b2e1cedf3 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c @@ -234,7 +234,6 @@ static int ecw2cw(int ecw) return cw - 1; } - static void ieee80211_sta_wmm_params(struct net_device *dev, struct ieee80211_if_sta *ifsta, u8 *wmm_param, size_t wmm_param_len) diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index d303229249e7..fcc8921722f4 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -125,14 +125,13 @@ static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd) } /* use the data classifier to determine what 802.1d tag the - * data frame has */ + * data frame has */ skb->priority = classify_1d(skb, qd); - /* incase we are a client verify acm is not set for this ac */ + /* in case we are a client verify acm is not set for this ac */ while (unlikely(local->wmm_acm & BIT(skb->priority))) { if (wme_downgrade_ac(skb)) { - /* No AC with lower priority has acm=0, - * drop packet. */ + /* No AC with lower priority has acm=0, drop packet. */ return -1; } } diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index b6cd66e0ee58..775f89e42a43 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -550,7 +550,6 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee80211_txrx_data *tx) if (tx->u.tx.extra_frag) { int i; - for (i = 0; i < tx->u.tx.num_extra_frag; i++) { if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test) < 0) |