UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <dan.carpenter@oracle.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Dan Carpenter 2015-07-27 11:11:11 +03:00 committed by Johannes Berg
parent 4b58c37bb9
commit 75dbf00b44
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/mac80211/status.c
View File

@ -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,
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();