diff options
| author | David S. Miller <davem@davemloft.net> | 2021-10-01 14:16:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-01 14:16:29 +0100 |
| commit | 5abab4982d5b3bfe33d318b621951a13bbe6ae77 (patch) | |
| tree | 01b6187469565b7de404ad7030439b2f22f0f74d /drivers/net/wireless/marvell/mwifiex/sta_tx.c | |
| parent | ca6e11c337daf7925ff8a2aac8e84490a8691905 (diff) | |
| parent | 603a1621caa097be23c7784e36cb8edf23cd31db (diff) | |
Merge tag 'wireless-drivers-2021-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
wireless-drivers fixes for v5.15
Second set of fixes for v5.15, nothing major this time. Most important
here are reverting a brcmfmac regression and a fix for an old rare
ath5k build error.
iwlwifi
* fixes to NULL dereference, off by one and missing unlock
* add support for Killer AX1650 on Dell XPS 15 (9510) laptop
ath5k
* build fix with LEDS=m
brcmfmac
* revert a regression causing BCM4359/9 devices stop working as access point
mwifiex
* fix clang warning about null pointer arithmetic
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/sta_tx.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/sta_tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_tx.c b/drivers/net/wireless/marvell/mwifiex/sta_tx.c index 241305377e20..a9b5eb992220 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_tx.c +++ b/drivers/net/wireless/marvell/mwifiex/sta_tx.c @@ -62,8 +62,8 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv, pkt_type = mwifiex_is_skb_mgmt_frame(skb) ? PKT_TYPE_MGMT : 0; - pad = ((void *)skb->data - (sizeof(*local_tx_pd) + hroom)- - NULL) & (MWIFIEX_DMA_ALIGN_SZ - 1); + pad = ((uintptr_t)skb->data - (sizeof(*local_tx_pd) + hroom)) & + (MWIFIEX_DMA_ALIGN_SZ - 1); skb_push(skb, sizeof(*local_tx_pd) + pad); local_tx_pd = (struct txpd *) skb->data; |