From owner-svn-src-head@FreeBSD.ORG  Tue Jul  5 15:00:55 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A6E11065672;
	Tue,  5 Jul 2011 15:00:55 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A8628FC15;
	Tue,  5 Jul 2011 15:00:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p65F0tIZ074170;
	Tue, 5 Jul 2011 15:00:55 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p65F0tZ5074168;
	Tue, 5 Jul 2011 15:00:55 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201107051500.p65F0tZ5074168@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 5 Jul 2011 15:00:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223792 - head/sys/powerpc/ps3
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2011 15:00:55 -0000

Author: nwhitehorn
Date: Tue Jul  5 15:00:55 2011
New Revision: 223792
URL: http://svn.freebsd.org/changeset/base/223792

Log:
  Follow Linux by unconditionally stripping the RX vlan tag from incoming
  packets. It turns out that all firmware versions insert it, whether or not
  they support VLAN tagging.
  
  Submitted by:	glevand <geoffrey.levand at mail dot ru>

Modified:
  head/sys/powerpc/ps3/if_glc.c

Modified: head/sys/powerpc/ps3/if_glc.c
==============================================================================
--- head/sys/powerpc/ps3/if_glc.c	Tue Jul  5 14:58:10 2011	(r223791)
+++ head/sys/powerpc/ps3/if_glc.c	Tue Jul  5 15:00:55 2011	(r223792)
@@ -155,7 +155,7 @@ glc_attach(device_t dev) 
 	lv1_net_control(sc->sc_bus, sc->sc_dev, GELIC_GET_MAC_ADDRESS,
 	    0, 0, 0, &mac64, &junk);
 	memcpy(sc->sc_enaddr, &((uint8_t *)&mac64)[2], sizeof(sc->sc_enaddr));
-	sc->sc_tx_vlan = sc->sc_rx_vlan =  -1;
+	sc->sc_tx_vlan = sc->sc_rx_vlan = -1;
 	err = lv1_net_control(sc->sc_bus, sc->sc_dev, GELIC_GET_VLAN_ID,
 	    GELIC_VLAN_TX_ETHERNET, 0, 0, &val, &junk);
 	if (err == 0)
@@ -178,7 +178,7 @@ glc_attach(device_t dev) 
 	}
 
 	bus_setup_intr(dev, sc->sc_irq,
-	    INTR_TYPE_MISC | INTR_MPSAFE | INTR_ENTROPY,
+	    INTR_TYPE_NET | INTR_MPSAFE | INTR_ENTROPY,
 	    glc_intr_filter, glc_intr, sc, &sc->sc_irqctx);
 	sc->sc_hwirq_status = (uint64_t *)contigmalloc(8, M_GLC, M_ZERO, 0,
 	    BUS_SPACE_MAXADDR_32BIT, 8, PAGE_SIZE);
@@ -755,8 +755,11 @@ glc_rxintr(struct glc_softc *sc)
 		m->m_len = sc->sc_rxdmadesc[i].valid_size;
 		m->m_pkthdr.len = m->m_len;
 
-		if (sc->sc_rx_vlan >= 0)
-			m_adj(m, 2);
+		/*
+		 * Remove VLAN tag. Even on early firmwares that do not allow
+		 * multiple VLANs, the VLAN tag is still in place here.
+		 */
+		m_adj(m, 2);
 
 		mtx_unlock(&sc->sc_mtx);
 		(*ifp->if_input)(ifp, m);