linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 1/5] mac80211: fix mesh TX coding style
Date: Tue, 27 Mar 2012 14:18:36 +0200	[thread overview]
Message-ID: <20120327121921.180639599@sipsolutions.net> (raw)
In-Reply-To: 20120327121835.299635879@sipsolutions.net

From: Johannes Berg <johannes.berg@intel.com>

Fix bad indentation & pointless if nesting.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 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);



  reply	other threads:[~2012-03-27 12:20 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-27 12:18 [PATCH 0/5] some trivial mac80211 cleanups Johannes Berg
2012-03-27 12:18 ` Johannes Berg [this message]
2012-03-27 12:18 ` [PATCH 2/5] mac80211: clean up uAPSD TX code Johannes Berg
2012-03-27 12:18 ` [PATCH 3/5] mac80211: make ieee80211_downgrade_queue static Johannes Berg
2012-03-27 12:18 ` [PATCH 4/5] mac80211: inline ieee80211_add_pending_skbs Johannes Berg
2012-03-27 12:18 ` [PATCH 5/5] mac80211: use AC constants Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120327121921.180639599@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).