Skip to contentSkip to conversation

mac80211: remove always true condition

PATCH In review Dan Carpenter 2 participants 2 messages Jul 27, 2015 – Aug 13, 2015

Subsystems (2)
Kernel janitors mac80211
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 mac80211: remove always true condition

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 <[email protected]>
net/mac80211/status.c +1 -4
index 45628f3..8ba5832 100644
@@ -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();
maintainer
#1 lore raw
Quoted 6 lines · Dan Carpenter

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