Date: Thu, 7 Nov 2019 23:35:29 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354503 - head/sys/dev/iwm Message-ID: <201911072335.xA7NZTDE073836@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Thu Nov 7 23:35:29 2019 New Revision: 354503 URL: https://svnweb.freebsd.org/changeset/base/354503 Log: iwm: Sync the firmware tx_cmd descriptor fields with iwlwifi. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/iwm/if_iwm.c head/sys/dev/iwm/if_iwmreg.h Modified: head/sys/dev/iwm/if_iwm.c ============================================================================== --- head/sys/dev/iwm/if_iwm.c Thu Nov 7 23:35:15 2019 (r354502) +++ head/sys/dev/iwm/if_iwm.c Thu Nov 7 23:35:29 2019 (r354503) @@ -3656,7 +3656,6 @@ iwm_tx(struct iwm_softc *sc, struct mbuf *m, struct ie } else pad = 0; - tx->driver_txop = 0; tx->next_frame_len = 0; tx->len = htole16(totlen); Modified: head/sys/dev/iwm/if_iwmreg.h ============================================================================== --- head/sys/dev/iwm/if_iwmreg.h Thu Nov 7 23:35:15 2019 (r354502) +++ head/sys/dev/iwm/if_iwmreg.h Thu Nov 7 23:35:29 2019 (r354503) @@ -4465,8 +4465,7 @@ struct iwm_tx_cmd { uint8_t initial_rate_index; uint8_t reserved2; uint8_t key[16]; - uint16_t next_frame_flags; - uint16_t reserved3; + uint32_t reserved3; uint32_t life_time; uint32_t dram_lsb_ptr; uint8_t dram_msb_ptr; @@ -4474,7 +4473,7 @@ struct iwm_tx_cmd { uint8_t data_retry_limit; uint8_t tid_tspec; uint16_t pm_frame_timeout; - uint16_t driver_txop; + uint16_t reserved4; uint8_t payload[0]; struct ieee80211_frame hdr[0]; } __packed; /* IWM_TX_CMD_API_S_VER_3 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911072335.xA7NZTDE073836>