mac80211: fix mesh TX coding style

Fix bad indentation & pointless if nesting.

Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index da2447a7bade40a99b27ddd9c5cb9e736fb76d83..82389adbe5825f6ee99d9d3e32bd29e6325f87f9 100644 (file)
--- 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);