Commit 3c3b00ca authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

[MAC80211]: clean up whitespace

This cleans up some whitespace to make the mac80211
version in mainline diverge less from wireless-dev.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b63bde7b
...@@ -968,6 +968,7 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev, ...@@ -968,6 +968,7 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
*param = !!(sdata->u.sta.flags & *param = !!(sdata->u.sta.flags &
IEEE80211_STA_MIXED_CELL); IEEE80211_STA_MIXED_CELL);
break; break;
case PRISM2_PARAM_WMM_ENABLED: case PRISM2_PARAM_WMM_ENABLED:
if (sdata->type != IEEE80211_IF_TYPE_STA && if (sdata->type != IEEE80211_IF_TYPE_STA &&
sdata->type != IEEE80211_IF_TYPE_IBSS) sdata->type != IEEE80211_IF_TYPE_IBSS)
......
...@@ -234,7 +234,6 @@ static int ecw2cw(int ecw) ...@@ -234,7 +234,6 @@ static int ecw2cw(int ecw)
return cw - 1; return cw - 1;
} }
static void ieee80211_sta_wmm_params(struct net_device *dev, static void ieee80211_sta_wmm_params(struct net_device *dev,
struct ieee80211_if_sta *ifsta, struct ieee80211_if_sta *ifsta,
u8 *wmm_param, size_t wmm_param_len) u8 *wmm_param, size_t wmm_param_len)
......
...@@ -125,14 +125,13 @@ static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd) ...@@ -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 /* use the data classifier to determine what 802.1d tag the
* data frame has */ * data frame has */
skb->priority = classify_1d(skb, qd); 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))) { while (unlikely(local->wmm_acm & BIT(skb->priority))) {
if (wme_downgrade_ac(skb)) { if (wme_downgrade_ac(skb)) {
/* No AC with lower priority has acm=0, /* No AC with lower priority has acm=0, drop packet. */
* drop packet. */
return -1; return -1;
} }
} }
......
...@@ -550,7 +550,6 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee80211_txrx_data *tx) ...@@ -550,7 +550,6 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee80211_txrx_data *tx)
if (tx->u.tx.extra_frag) { if (tx->u.tx.extra_frag) {
int i; int i;
for (i = 0; i < tx->u.tx.num_extra_frag; i++) { for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test) if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
< 0) < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment