summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-07-27 11:11:11 +0300
committerJohannes Berg <johannes.berg@intel.com>2015-08-13 11:36:01 +0200
commit75dbf00b443c1763138486e87f4978ff43506f9e (patch)
tree01007c217b68a66cf81968612076a66e96b88b47 /net/mac80211
parent4b58c37bb9d4282446f7a0194dbc44325787ac8c (diff)
downloadlinux-stable-75dbf00b443c1763138486e87f4978ff43506f9e.tar.gz
linux-stable-75dbf00b443c1763138486e87f4978ff43506f9e.tar.bz2
linux-stable-75dbf00b443c1763138486e87f4978ff43506f9e.zip
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/status.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 45628f37c083..8ba583243509 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();