From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 27 Mar 2012 12:18:36 +0000 (+0200)
Subject: mac80211: fix mesh TX coding style
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=98aed9fd0104ef2d8e6b5154c9713e0e27e5f9c8;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

mac80211: fix mesh TX coding style

Fix bad indentation & pointless if nesting.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index da2447a7bade..82389adbe582 100644
--- a/net/mac80211/tx.c
+++ b/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);