Browse Source

[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>
Johannes Berg 17 years ago
parent
commit
3c3b00caf9
4 changed files with 4 additions and 6 deletions
  1. 1 0
      net/mac80211/ieee80211_ioctl.c
  2. 0 1
      net/mac80211/ieee80211_sta.c
  3. 3 4
      net/mac80211/wme.c
  4. 0 1
      net/mac80211/wpa.c

+ 1 - 0
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 &
 			*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)

+ 0 - 1
net/mac80211/ieee80211_sta.c

@@ -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)

+ 3 - 4
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
 	/* 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,
-			* drop packet. */
+			/* No AC with lower priority has acm=0, drop packet. */
 			return -1;
 			return -1;
 		}
 		}
 	}
 	}

+ 0 - 1
net/mac80211/wpa.c

@@ -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)