Received: by mail.netbsd.org (Postfix, from userid 605) id 7645784D8E; Sun, 1 Sep 2019 11:07:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EF03384D8D for ; Sun, 1 Sep 2019 11:07:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 5miTL8oJJN7e for ; Sun, 1 Sep 2019 11:07:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4C23D84CEE for ; Sun, 1 Sep 2019 11:07:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 44B2CFBF4; Sun, 1 Sep 2019 11:07:06 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Sun, 1 Sep 2019 11:07:06 +0000 From: "Martin Husemann" Subject: CVS commit: [netbsd-9] src/sys To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20190901110706.44B2CFBF4@cvs.NetBSD.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Martin Husemann" Mail-Followup-To: source-changes-d@NetBSD.org List-Unsubscribe: Module Name: src Committed By: martin Date: Sun Sep 1 11:07:06 UTC 2019 Modified Files: src/sys/dev/pci/ixgbe [netbsd-9]: ixgbe.c ixv.c src/sys/net [netbsd-9]: if_vlan.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #133): sys/dev/pci/ixgbe/ixgbe.c: revision 1.200 sys/dev/pci/ixgbe/ixgbe.c: revision 1.201 sys/dev/pci/ixgbe/ixv.c: revision 1.126 sys/dev/pci/ixgbe/ixv.c: revision 1.127 sys/net/if_vlan.c: revision 1.142 sys/net/if_vlan.c: revision 1.143 sys/net/if_vlan.c: revision 1.144 sys/net/if_vlan.c: revision 1.145 sys/net/if_vlan.c: revision 1.146 Check ec_capenable instead of ec_capabilities to control TX side of VLAN HW tagging correctly. XXX pullup-9 Add missing IFNET_LOCK() and IFNET_UNLOCK() in vlan_config(). XXX pullup-9 Fix a bug that VLAN HW "tagging" enable/disable may not reflect correctly. - Always call ec_vlan_cb() if it exists. - Some (or all?) ethernet drivers don't enable HW tagging if no any vlan is attached. ixgbe is one of them. Check the the transition and update VLAN HW tagging function. XXX pullup-9 Use ETHER_LOCK()/ETHER_UNLOCK() suggested by knakahara. - kmem_alloc(,KM_SLEEP) never return NULL, so remove NULL check. - VLAN ID is never duplicated, so break the loop when found. Also move kmen_free() outside of ETHER_LOCK(ec)/ETHER_UNLOCK(ec) to reduce the hold time. suggested by ozaki-r. - Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.199.2.1 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.125 -r1.125.2.1 src/sys/dev/pci/ixgbe/ixv.c cvs rdiff -u -r1.141 -r1.141.2.1 src/sys/net/if_vlan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.