* [patch] mac80211: remove always true condition
@ 2015-07-27 8:11 Dan Carpenter
2015-08-13 9:36 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2015-07-27 8:11 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, kernel-janitors
The outside if statement checks that IEEE80211_TX_INTFL_MLME_CONN_TX is
set so this condition is always true. Checking twice upsets the static
checkers.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 45628f3..8ba5832 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -515,7 +515,7 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
if (!sdata) {
skb->dev = NULL;
- } else if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) {
+ } else {
unsigned int hdr_size =
ieee80211_hdrlen(hdr->frame_control);
@@ -529,9 +529,6 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
ieee80211_mgd_conn_tx_status(sdata,
hdr->frame_control,
acked);
- } else {
- /* we assign ack frame ID for the others */
- WARN_ON(1);
}
rcu_read_unlock();
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] mac80211: remove always true condition
2015-07-27 8:11 [patch] mac80211: remove always true condition Dan Carpenter
@ 2015-08-13 9:36 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2015-08-13 9:36 UTC (permalink / raw)
To: Dan Carpenter; +Cc: linux-wireless, kernel-janitors
On Mon, 2015-07-27 at 11:11 +0300, Dan Carpenter wrote:
> The outside if statement checks that IEEE80211_TX_INTFL_MLME_CONN_TX
> is
> set so this condition is always true. Checking twice upsets the
> static
> checkers.
>
Yeah, this was left over in some refactoring - thanks, applied.
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-13 9:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-27 8:11 [patch] mac80211: remove always true condition Dan Carpenter
2015-08-13 9:36 ` Johannes Berg
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).