From: Johannes Berg <redacted>
Fix bad indentation & pointless if nesting.
Signed-off-by: Johannes Berg <redacted>
---
net/mac80211/tx.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/net/mac80211/tx.c 2012-03-23 16:51:10.000000000 +0100
+++ b/net/mac80211/tx.c 2012-03-23 17:03:05.000000000 +0100
@@ -1468,12 +1468,12 @@ void ieee80211_xmit(struct ieee80211_sub
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);