---

yaml --- r: 66365 b: refs/heads/master c: 3c3b00c h: refs/heads/master i: 66363: 6309656 v: v3
git-mirror · Oct 10, 2007 · e87cfeb · e87cfeb
1 parent 9c2b4f7
commit e87cfeb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b63bde7bb75f74acf974f43dc2be8798be115007
+refs/heads/master: 3c3b00caf98e5fdaa0184026a68f0008a5bf393e
diff --git a/trunk/net/mac80211/ieee80211_ioctl.c b/trunk/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/trunk/net/mac80211/ieee80211_sta.c b/trunk/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/trunk/net/mac80211/wme.c b/trunk/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/trunk/net/mac80211/wpa.c b/trunk/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)
-Original file 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 @@