diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-09-04 17:20:14 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-09-04 17:20:14 -0700 |
| commit | 43b7724487109368363bb5cda034b3f600278d14 (patch) | |
| tree | 0ca0280d0e240aa38df3eab4b513b7bebfe465c1 /drivers/net/wireless/intel/iwlegacy/4965-mac.c | |
| parent | d57f7b45945ac0517ff8ea50655f00db6e8d637c (diff) | |
| parent | 97b766f989bcd06e5a7651b1080001d7327012f5 (diff) | |
| download | linux-43b7724487109368363bb5cda034b3f600278d14.tar.gz linux-43b7724487109368363bb5cda034b3f600278d14.tar.bz2 linux-43b7724487109368363bb5cda034b3f600278d14.zip | |
Merge tag 'wireless-next-2024-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next
Kalle Valo says:
====================
pull-request: wireless-next-2024-09-04
here's a pull request to net-next tree, more info below. Please let me know if
there are any problems.
====================
Conflicts:
drivers/net/wireless/ath/ath12k/hw.c
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
8be12629b428 ("wifi: ath12k: restore ASPM for supported hardwares only")
https://lore.kernel.org/87msldyj97.fsf@kernel.org
Link: https://patch.msgid.link/20240904153205.64C11C4CEC2@smtp.kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlegacy/4965-mac.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c index 1600c344edbb..fcccde7bb659 100644 --- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c @@ -1769,7 +1769,7 @@ il4965_tx_skb(struct il_priv *il, /* Set up first empty entry in queue's array of Tx/cmd buffers */ out_cmd = txq->cmd[q->write_ptr]; out_meta = &txq->meta[q->write_ptr]; - tx_cmd = &out_cmd->cmd.tx; + tx_cmd = container_of(&out_cmd->cmd.tx, struct il_tx_cmd, __hdr); memset(&out_cmd->hdr, 0, sizeof(out_cmd->hdr)); memset(tx_cmd, 0, sizeof(struct il_tx_cmd)); |