---

yaml --- r: 300671 b: refs/heads/master c: 98aed9f h: refs/heads/master i: 300669: 232f659 300667: febf268 300663: 75a891e 300655: f00a3c5 300639: 9fe37c0 300607: 2c87fea 300543: 2e7f62b v: v3
git-mirror · Apr 10, 2012 · 74be49a · 74be49a
1 parent c14d564
commit 74be49a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99fec5dee8f717daf2b1789e8ac5913863c6dee8
+refs/heads/master: 98aed9fd0104ef2d8e6b5154c9713e0e27e5f9c8
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
@@ -1467,12 +1467,12 @@ void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
 
 	if (ieee80211_vif_is_mesh(&sdata->vif) &&
 	    ieee80211_is_data(hdr->frame_control) &&
-		!is_multicast_ether_addr(hdr->addr1))
-			if (mesh_nexthop_resolve(skb, sdata)) {
-				/* skb queued: don't free */
-				rcu_read_unlock();
-				return;
-			}
+	    !is_multicast_ether_addr(hdr->addr1) &&
+	    mesh_nexthop_resolve(skb, sdata)) {
+		/* skb queued: don't free */
+		rcu_read_unlock();
+		return;
+	}
 
 	ieee80211_set_qos_hdr(sdata, skb);
 	ieee80211_tx(sdata, skb, false);