Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci if_iwn.c: add a comment noting which PCI IDs are...



details:   https://anonhg.NetBSD.org/src/rev/f02bd099657d
branches:  trunk
changeset: 450601:f02bd099657d
user:      gutteridge <gutteridge%NetBSD.org@localhost>
date:      Fri Apr 19 19:37:31 2019 +0000

description:
if_iwn.c: add a comment noting which PCI IDs are covered by an else
statement that loads a specific firmware variant. While here, also
amend the formatting of two other comments.

diffstat:

 sys/dev/pci/if_iwn.c |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r f93938d724ff -r f02bd099657d sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Fri Apr 19 19:36:26 2019 +0000
+++ b/sys/dev/pci/if_iwn.c      Fri Apr 19 19:37:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iwn.c,v 1.90 2018/06/26 06:48:01 msaitoh Exp $      */
+/*     $NetBSD: if_iwn.c,v 1.91 2019/04/19 19:37:31 gutteridge Exp $   */
 /*     $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $     */
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.90 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.91 2019/04/19 19:37:31 gutteridge Exp $");
 
 #define IWN_USE_RBUF   /* Use local storage for RX */
 #undef IWN_HWCRYPTO    /* XXX does not even compile yet */
@@ -523,9 +523,11 @@
        ic->ic_opmode = IEEE80211_M_STA;        /* default to BSS mode */
        ic->ic_state = IEEE80211_S_INIT;
 
-       /* Set device capabilities. */
-       /* XXX OpenBSD has IEEE80211_C_WEP, IEEE80211_C_RSN,
-        * and IEEE80211_C_PMGT too. */
+       /*
+        * Set device capabilities.
+        * XXX OpenBSD has IEEE80211_C_WEP, IEEE80211_C_RSN, and
+        * IEEE80211_C_PMGT too.
+        */
        ic->ic_caps =
            IEEE80211_C_IBSS |          /* IBSS mode support */
            IEEE80211_C_WPA |           /* 802.11i */
@@ -622,7 +624,7 @@
        /*
         * XXX for NetBSD, OpenBSD timeout_set replaced by
         * callout_init and callout_setfunc, above.
-       */
+        */
 
        if (pmf_device_register(self, NULL, iwn_resume))
                pmf_class_network_register(self, ifp);
@@ -780,6 +782,11 @@
                        sc->fwname = "iwlwifi-6000g2b-6.ucode";
                        ops->config_bt_coex = iwn_config_bt_coex_adv1;
                }
+               /*
+                * This covers:
+                * PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1
+                * PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2
+                */
                else
                        sc->fwname = "iwlwifi-6000g2a-5.ucode";
                break;



Home | Main Index | Thread Index | Old Index