11490 SRS ring polling disabled for VLANs
11491 Want DLS bypass for VLAN traffic
11492 add VLVF bypass to ixgbe core
2869 duplicate packets with vnics over aggrs
11489 DLS stat delete and aggr kstat can deadlock
Portions contributed by: Theo Schlossnagle <jesus@omniti.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Dan McDonald <danmcd@joyent.com>

@@ -169,20 +169,20 @@
         dsp->ds_sap = sap;
 
         /*
          * The MAC layer does the VLAN demultiplexing and will only pass up
          * untagged packets to non-promiscuous primary MAC clients. In order to
-         * support the binding to the VLAN SAP which is required by DLPI, dls
+         * support binding to the VLAN SAP, which is required by DLPI, DLS
          * needs to get a copy of all tagged packets when the client binds to
          * the VLAN SAP. We do this by registering a separate promiscuous
-         * callback for each dls client binding to that SAP.
+         * callback for each DLS client binding to that SAP.
          *
          * Note: even though there are two promiscuous handles in dld_str_t,
          * ds_mph is for the regular promiscuous mode, ds_vlan_mph is the handle
-         * to receive VLAN pkt when promiscuous mode is not on. Only one of
-         * them can be non-NULL at the same time, to avoid receiving dup copies
-         * of pkts.
+         * to receive VLAN traffic when promiscuous mode is not on. Only one of
+         * them can be non-NULL at the same time, to avoid receiving duplicate
+         * copies of packets.
          */
         if (sap == ETHERTYPE_VLAN && dsp->ds_promisc == 0) {
                 int err;
 
                 if (dsp->ds_vlan_mph != NULL)

@@ -650,12 +650,12 @@
                 mac_diag_t diag;
 
                 /* request the primary MAC address */
                 if ((err = mac_unicast_add(dlp->dl_mch, NULL,
                     MAC_UNICAST_PRIMARY | MAC_UNICAST_TAG_DISABLE |
-                    MAC_UNICAST_DISABLE_TX_VID_CHECK, &dlp->dl_mah, 0,
-                    &diag)) != 0) {
+                    MAC_UNICAST_DISABLE_TX_VID_CHECK, &dlp->dl_mah,
+                    VLAN_ID_NONE, &diag)) != 0) {
                         return (err);
                 }
 
                 /*
                  * Set the function to start receiving packets.