Commit 75dbf00b authored by Dan Carpenter's avatar Dan Carpenter Committed by Johannes Berg

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4b58c37b
...@@ -515,7 +515,7 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local, ...@@ -515,7 +515,7 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
if (!sdata) { if (!sdata) {
skb->dev = NULL; skb->dev = NULL;
} else if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) { } else {
unsigned int hdr_size = unsigned int hdr_size =
ieee80211_hdrlen(hdr->frame_control); ieee80211_hdrlen(hdr->frame_control);
...@@ -529,9 +529,6 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local, ...@@ -529,9 +529,6 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
ieee80211_mgd_conn_tx_status(sdata, ieee80211_mgd_conn_tx_status(sdata,
hdr->frame_control, hdr->frame_control,
acked); acked);
} else {
/* we assign ack frame ID for the others */
WARN_ON(1);
} }
rcu_read_unlock(); rcu_read_unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment