Date: Thu, 10 Jul 2014 16:46:47 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268501 - head/sys/dev/e1000 Message-ID: <201407101646.s6AGklRR090324@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Thu Jul 10 16:46:46 2014 New Revision: 268501 URL: http://svnweb.freebsd.org/changeset/base/268501 Log: Correct the setting of the VID in transmit descriptors when hardware VLAN tagging is enabled. This was broken in r266978. Reported by: gjb Tested by: gjb Modified: head/sys/dev/e1000/if_em.c Modified: head/sys/dev/e1000/if_em.c ============================================================================== --- head/sys/dev/e1000/if_em.c Thu Jul 10 16:10:39 2014 (r268500) +++ head/sys/dev/e1000/if_em.c Thu Jul 10 16:46:46 2014 (r268501) @@ -2012,7 +2012,7 @@ retry: if (m_head->m_flags & M_VLANTAG) { /* Set the vlan id. */ - txd_upper |= htole16((if_getvtag(m_head)) << 16); + txd_upper |= htole16(if_getvtag(m_head)) << 16; /* Tell hardware to add tag */ txd_lower |= htole32(E1000_TXD_CMD_VLE); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407101646.s6AGklRR090324>