svn commit: r343390 - head/sys/dev/iwm

Kyle Evans kevans at FreeBSD.org
Thu Jan 24 03:50:28 UTC 2019


Author: kevans
Date: Thu Jan 24 03:50:27 2019
New Revision: 343390
URL: https://svnweb.freebsd.org/changeset/base/343390

Log:
  iwm - Remove unused TX_CMD_NEXT_FRAME_*
  
  Taken-From: Linux git b1e06c65fb69c5e3fddcd91987561e225eaa9bfa
  
  Submitted by:	Augustin Cavalier <waddlesplash at gmail.com> (Haiku)
  Obtained from:	DragonFlyBSD (b0c6116f364a121ab6b9d634ca1997d4167fa747)

Modified:
  head/sys/dev/iwm/if_iwmreg.h

Modified: head/sys/dev/iwm/if_iwmreg.h
==============================================================================
--- head/sys/dev/iwm/if_iwmreg.h	Thu Jan 24 03:50:03 2019	(r343389)
+++ head/sys/dev/iwm/if_iwmreg.h	Thu Jan 24 03:50:27 2019	(r343390)
@@ -4283,30 +4283,7 @@ enum iwm_tx_pm_timeouts {
 #define IWM_TX_CMD_SEC_WEP_KEY_IDX_MSK	0xc0
 #define IWM_TX_CMD_SEC_KEY128		0x08
 
-/* TODO: how does these values are OK with only 16 bit variable??? */
 /*
- * TX command next frame info
- *
- * bits 0:2 - security control (IWM_TX_CMD_SEC_*)
- * bit 3 - immediate ACK required
- * bit 4 - rate is taken from STA table
- * bit 5 - frame belongs to BA stream
- * bit 6 - immediate BA response expected
- * bit 7 - unused
- * bits 8:15 - Station ID
- * bits 16:31 - rate
- */
-#define IWM_TX_CMD_NEXT_FRAME_ACK_MSK		(0x8)
-#define IWM_TX_CMD_NEXT_FRAME_STA_RATE_MSK	(0x10)
-#define IWM_TX_CMD_NEXT_FRAME_BA_MSK		(0x20)
-#define IWM_TX_CMD_NEXT_FRAME_IMM_BA_RSP_MSK	(0x40)
-#define IWM_TX_CMD_NEXT_FRAME_FLAGS_MSK		(0xf8)
-#define IWM_TX_CMD_NEXT_FRAME_STA_ID_MSK	(0xff00)
-#define IWM_TX_CMD_NEXT_FRAME_STA_ID_POS	(8)
-#define IWM_TX_CMD_NEXT_FRAME_RATE_MSK		(0xffff0000)
-#define IWM_TX_CMD_NEXT_FRAME_RATE_POS		(16)
-
-/*
  * TX command Frame life time in us - to be written in pm_frame_timeout
  */
 #define IWM_TX_CMD_LIFE_TIME_INFINITE	0xFFFFFFFF
@@ -4343,7 +4320,7 @@ enum iwm_tx_pm_timeouts {
  * @initial_rate_index: index into the rate table for initial TX attempt.
  *	Applied if IWM_TX_CMD_FLG_STA_RATE_MSK is set, normally 0 for data frames.
  * @key: security key
- * @next_frame_flags: IWM_TX_CMD_SEC_* and IWM_TX_CMD_NEXT_FRAME_*
+ * @reserved3: reserved
  * @life_time: frame life time (usecs??)
  * @dram_lsb_ptr: Physical address of scratch area in the command (try_cnt +
  *	btkill_cnd + reserved), first 32 bits. "0" disables usage.


More information about the svn-src-all mailing list