summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2018-12-15 10:03:09 +0100
committerJohannes Berg <johannes.berg@intel.com>2018-12-18 13:17:50 +0100
commit233e98dc9c3009943aa34d58925d94ac9330e17b (patch)
tree69d2450e6803ba1a652f1d63ff220e36fe1765dd
parentmac80211: never pass NULL params to ieee80211_if_add() (diff)
downloadlinux-233e98dc9c3009943aa34d58925d94ac9330e17b.tar.xz
linux-233e98dc9c3009943aa34d58925d94ac9330e17b.zip
mac80211: remove superfluous NULL check
At the place where this code lives now, the skb can never be NULL, so we can remove the pointless NULL check. It seems to exist because this code was moved around a few times and originally came from a place where it could in fact be NULL. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 582b3d49f891..4919881c6a86 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3583,7 +3583,7 @@ begin:
skb_queue_splice_tail(&tx.skbs, &txqi->frags);
}
- if (skb && skb_has_frag_list(skb) &&
+ if (skb_has_frag_list(skb) &&
!ieee80211_hw_check(&local->hw, TX_FRAG_LIST)) {
if (skb_linearize(skb)) {
ieee80211_free_txskb(&local->hw, skb);