diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2012-03-27 14:18:36 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-04-10 14:54:05 -0400 |
| commit | 98aed9fd0104ef2d8e6b5154c9713e0e27e5f9c8 (patch) | |
| tree | 51c6cedb3037018fe12c384a191cfe1d75dfb7bc /net | |
| parent | mwifiex: don't use IEEE80211_MAX_QUEUES (diff) | |
| download | linux-dev-98aed9fd0104ef2d8e6b5154c9713e0e27e5f9c8.tar.xz linux-dev-98aed9fd0104ef2d8e6b5154c9713e0e27e5f9c8.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/tx.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); |