Module Name: src
Committed By: nonaka
Date: Mon Jan 9 09:15:54 UTC 2017
Modified Files:
src/sys/dev/pci: if_iwm.c if_iwmreg.h
Log Message:
Added enum iwm_tx_pm_timeouts from FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/if_iwm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/if_iwmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.53 src/sys/dev/pci/if_iwm.c:1.54
--- src/sys/dev/pci/if_iwm.c:1.53 Mon Jan 9 08:10:25 2017
+++ src/sys/dev/pci/if_iwm.c Mon Jan 9 09:15:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.53 2017/01/09 08:10:25 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.54 2017/01/09 09:15:54 nonaka Exp $ */
/* OpenBSD: if_iwm.c,v 1.147 2016/11/17 14:12:33 stsp Exp */
#define IEEE80211_NO_HT
/*
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.53 2017/01/09 08:10:25 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.54 2017/01/09 09:15:54 nonaka Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -4214,11 +4214,11 @@ iwm_tx(struct iwm_softc *sc, struct mbuf
if (subtype == IEEE80211_FC0_SUBTYPE_ASSOC_REQ ||
subtype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ)
- tx->pm_frame_timeout = htole16(3);
+ tx->pm_frame_timeout = htole16(IWM_PM_FRAME_ASSOC);
else
- tx->pm_frame_timeout = htole16(2);
+ tx->pm_frame_timeout = htole16(IWM_PM_FRAME_MGMT);
} else {
- tx->pm_frame_timeout = htole16(0);
+ tx->pm_frame_timeout = htole16(IWM_PM_FRAME_NONE);
}
if (hdrlen & 3) {
Index: src/sys/dev/pci/if_iwmreg.h
diff -u src/sys/dev/pci/if_iwmreg.h:1.3 src/sys/dev/pci/if_iwmreg.h:1.4
--- src/sys/dev/pci/if_iwmreg.h:1.3 Sun Dec 18 02:18:29 2016
+++ src/sys/dev/pci/if_iwmreg.h Mon Jan 9 09:15:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwmreg.h,v 1.3 2016/12/18 02:18:29 nonaka Exp $ */
+/* $NetBSD: if_iwmreg.h,v 1.4 2017/01/09 09:15:54 nonaka Exp $ */
/* OpenBSD: if_iwmreg.h,v 1.19 2016/09/20 11:46:09 stsp Exp */
/******************************************************************************
@@ -4302,6 +4302,18 @@ enum iwm_tx_flags {
IWM_TX_CMD_FLG_HCCA_CHUNK = (1 << 31)
}; /* IWM_TX_FLAGS_BITS_API_S_VER_1 */
+/**
+ * enum iwm_tx_pm_timeouts - pm timeout values in TX command
+ * @IWM_PM_FRAME_NONE: no need to suspend sleep mode
+ * @IWM_PM_FRAME_MGMT: fw suspend sleep mode for 100TU
+ * @IWM_PM_FRAME_ASSOC: fw suspend sleep mode for 10sec
+ */
+enum iwm_tx_pm_timeouts {
+ IWM_PM_FRAME_NONE = 0,
+ IWM_PM_FRAME_MGMT = 2,
+ IWM_PM_FRAME_ASSOC = 3,
+};
+
/*
* TX command security control
*/
