diff mbox

mac80211: remove redundant flag check

Message ID 52b8191b.6ade440a.6499.ffff91da@mx.google.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

fred.chou.nd@gmail.com Dec. 23, 2013, 11:07 a.m. UTC 
From: Fred Chou <fred.chou.nd@gmail.com>

It's not necessary to check a flag setting and then
set it anyway. The outer condition check is redundant
in the code below. Remove the outer if.

Signed-off-by: Fred Chou  <fred.chou.nd@gmail.com>
---
 net/mac80211/tx.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Comments

Johannes Berg Jan. 6, 2014, 3:19 p.m. UTC | #1 
On Mon, 2013-12-23 at 19:07 +0800, fred.chou.nd@gmail.com wrote:
> From: Fred Chou <fred.chou.nd@gmail.com>
> 
> It's not necessary to check a flag setting and then
> set it anyway. The outer condition check is redundant
> in the code below. Remove the outer if.

It may be redundant in theory, but I think it makes the code easier to
read, and it avoids all the other checks and the flags write. I don't
think I want to apply this.

johannes

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 2f0e176..52bb276 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1157,13 +1157,11 @@  ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
 		info->flags |= IEEE80211_TX_CTL_NO_ACK;
 	} else
 		tx->flags |= IEEE80211_TX_UNICAST;
-
-	if (!(info->flags & IEEE80211_TX_CTL_DONTFRAG)) {
-		if (!(tx->flags & IEEE80211_TX_UNICAST) ||
-		    skb->len + FCS_LEN <= local->hw.wiphy->frag_threshold ||
-		    info->flags & IEEE80211_TX_CTL_AMPDU)
-			info->flags |= IEEE80211_TX_CTL_DONTFRAG;
-	}
+
+	if (!(tx->flags & IEEE80211_TX_UNICAST) ||
+	    skb->len + FCS_LEN <= local->hw.wiphy->frag_threshold ||
+	    info->flags & IEEE80211_TX_CTL_AMPDU)
+		info->flags |= IEEE80211_TX_CTL_DONTFRAG;
 
 	if (!tx->sta)
 		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;