2013-12-23 11:06:05

by Fred Chou

Subject: [PATCH] mac80211: remove redundant flag check

From: Fred Chou <[email protected]>

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 <[email protected]>
---
net/mac80211/tx.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

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;
--
1.7.9.5

2014-01-06 15:19:54

by Johannes Berg

Subject: Re: [PATCH] mac80211: remove redundant flag check

On Mon, 2013-12-23 at 19:07 +0800, [email protected] wrote:
> From: Fred Chou <[email protected]>
>
> 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