Skip to content

Commit

Permalink
[MAC80211]: clean up whitespace
Browse files Browse the repository at this point in the history
This cleans up some whitespace to make the mac80211
version in mainline diverge less from wireless-dev.

Signed-off-by: Johannes Berg <[email protected]>
Acked-by: Michael Wu <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
jmberg authored and David S. Miller committed Oct 10, 2007
1 parent b63bde7 commit 3c3b00c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
1 change: 1 addition & 0 deletions net/mac80211/ieee80211_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion net/mac80211/ieee80211_sta.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions net/mac80211/wme.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
1 change: 0 additions & 1 deletion net/mac80211/wpa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3c3b00c

Please sign in to comment.