[src/trunk]: src/sys/dev/pci Added enum iwm_tx_pm_timeouts from FreeBSD.

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/84b45432d248
branches:  trunk
changeset: 820413:84b45432d248
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Mon Jan 09 09:15:54 2017 +0000

description:
Added enum iwm_tx_pm_timeouts from FreeBSD.

diffstat:

 sys/dev/pci/if_iwm.c    |  10 +++++-----
 sys/dev/pci/if_iwmreg.h |  14 +++++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r aeaa59c76a99 -r 84b45432d248 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Mon Jan 09 08:10:25 2017 +0000
+++ b/sys/dev/pci/if_iwm.c      Mon Jan 09 09:15:54 2017 +0000
@@ -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 @@
 
                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) {
diff -r aeaa59c76a99 -r 84b45432d248 sys/dev/pci/if_iwmreg.h
--- a/sys/dev/pci/if_iwmreg.h   Mon Jan 09 08:10:25 2017 +0000
+++ b/sys/dev/pci/if_iwmreg.h   Mon Jan 09 09:15:54 2017 +0000
@@ -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 @@
        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
  */