From 74be49a5d28cb33bab28a6dae1d2b92fdc30bb29 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 27 Mar 2012 14:18:36 +0200
Subject: [PATCH] --- yaml --- r: 300671 b: refs/heads/master c:
 98aed9fd0104ef2d8e6b5154c9713e0e27e5f9c8 h: refs/heads/master i:   300669:
 232f6594cfd097d7a10e06cb2c4494e78b6f5720   300667:
 febf26811deaa45ab7a854ce8a859de83896d760   300663:
 75a891e673039cd5eb77d7522b2dfa4d12d24ceb   300655:
 f00a3c587750a53ede18c4f92ef7914271046bb3   300639:
 9fe37c075e9fce3d72a3a77524efc91668910d72   300607:
 2c87feaac298588debdbaf2e7a89e8d256cb4cfd   300543:
 2e7f62b682397611694dc1fc0d112507aec8be2f v: v3

---
 [refs]                  |  2 +-
 trunk/net/mac80211/tx.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 740d847102ff..a8086138aa04 100644
--- 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
index da2447a7bade..82389adbe582 100644
--- 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);