From: Luca Coelho <luca@coelho.fi>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH 08/24] mac80211: remove superfluous NULL check
Date: Sat, 15 Dec 2018 11:03:09 +0200 [thread overview]
Message-ID: <20181215090325.31604-9-luca@coelho.fi> (raw)
In-Reply-To: <20181215090325.31604-1-luca@coelho.fi>
From: Johannes Berg <johannes.berg@intel.com>
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>
---
net/mac80211/tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 565fe7291c7d..4f348b116549 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3586,7 +3586,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
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);
--
2.19.2
next prev parent reply other threads:[~2018-12-15 9:03 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-15 9:03 [PATCH 00/24] cfg80211/mac80211 patches from our internal tree 2018-12-15 Luca Coelho
2018-12-15 9:03 ` [PATCH 01/24] mac80211: suspicious RCU usage fix Luca Coelho
2018-12-15 9:03 ` [PATCH 02/24] ieee80211: add bits for TWT in Extended Capabilities IE Luca Coelho
2018-12-15 9:03 ` [PATCH 03/24] mac80211: propagate the support for TWT to the driver Luca Coelho
2018-12-15 9:03 ` [PATCH 04/24] mac80211: update HE operation fields to D3.0 Luca Coelho
2018-12-15 9:03 ` [PATCH 05/24] mac80211: free skb fraglist before freeing the skb Luca Coelho
2018-12-15 9:03 ` [PATCH 06/24] mac80211: don't build AMSDU from GSO packets Luca Coelho
2018-12-15 9:03 ` [PATCH 07/24] mac80211: document RCU requirements for ieee80211_tx_dequeue() Luca Coelho
2018-12-15 9:03 ` Luca Coelho [this message]
2018-12-15 9:03 ` [PATCH 09/24] mac80211: fix a kernel panic when TXing after TXQ teardown Luca Coelho
2018-12-15 9:03 ` [PATCH 10/24] mac80211: never pass NULL params to ieee80211_if_add() Luca Coelho
2018-12-15 9:03 ` [PATCH 11/24] mac80211: fix radiotap vendor presence bitmap handling Luca Coelho
2018-12-15 9:03 ` [PATCH 12/24] mac80211: ignore NullFunc frames in the duplicate detection Luca Coelho
2018-12-15 17:31 ` Emmanuel Grumbach
2018-12-18 0:55 ` Coelho, Luciano
2018-12-15 9:03 ` [PATCH 13/24] cfg80211: pmsr: fix MAC address setting Luca Coelho
2018-12-18 12:17 ` Johannes Berg
2019-02-06 5:47 ` Luca Coelho
2019-02-06 5:53 ` Luca Coelho
2019-02-06 5:59 ` [PATCH v2 1/2] " Luca Coelho
2019-02-06 5:59 ` [PATCH 2/2] " Luca Coelho
2019-02-06 6:01 ` Luca Coelho
2019-02-06 6:03 ` [PATCH] cfg80211: pmsr: fix abort locking Luca Coelho
2018-12-15 9:03 ` [PATCH 14/24] mac80211: update driver when MU EDCA params change Luca Coelho
2018-12-15 9:03 ` [PATCH 15/24] cfg80211: fix ieee80211_get_vht_max_nss() Luca Coelho
2018-12-15 9:03 ` [PATCH 16/24] mac80211: Properly handle SKB with radiotap only Luca Coelho
2018-12-15 9:03 ` [PATCH 17/24] cfg80211: Include the PMK and PMKID in NL80211_CMD_EXTERNAL_AUTH Luca Coelho
2019-01-25 12:41 ` Johannes Berg
2019-02-06 8:02 ` [PATCH v2] " Luca Coelho
2019-02-22 12:41 ` Johannes Berg
2019-03-08 11:26 ` Luciano Coelho
2018-12-15 9:03 ` [PATCH 18/24] mac80211: set STA flag DISABLE_HE if HE is not supported Luca Coelho
2018-12-15 9:03 ` [PATCH 19/24] mac80211: do not advertise HE cap IE if HE disabled Luca Coelho
2018-12-15 9:03 ` [PATCH 20/24] cfg80211: add some missing fall through annotations Luca Coelho
2018-12-15 9:03 ` [PATCH 21/24] nl80211: fix memory leak if validate_pae_over_nl80211() fails Luca Coelho
2018-12-15 9:03 ` [PATCH 22/24] cfg80211: clarify LCI/civic location documentation Luca Coelho
2018-12-15 9:03 ` [PATCH 23/24] mac80211: ftm responder: remove pointless defensive coding Luca Coelho
2018-12-15 9:03 ` [PATCH 24/24] mac80211: Properly access radiotap vendor data Luca Coelho
2018-12-18 12:06 ` [PATCH 00/24] cfg80211/mac80211 patches from our internal tree 2018-12-15 Johannes Berg
2018-12-18 12:08 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181215090325.31604-9-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox