From owner-p4-projects@FreeBSD.ORG  Mon Dec 11 23:21:55 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 23B6616A415; Mon, 11 Dec 2006 23:21:55 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F1A4016A40F
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 23:21:54 +0000 (UTC)
	(envelope-from ticso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 43C5843CD4
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 23:19:59 +0000 (GMT)
	(envelope-from ticso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBNLCLI027412
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 23:21:12 GMT
	(envelope-from ticso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBNLBdW027393
	for perforce@freebsd.org; Mon, 11 Dec 2006 23:21:11 GMT
	(envelope-from ticso@freebsd.org)
Date: Mon, 11 Dec 2006 23:21:11 GMT
Message-Id: <200612112321.kBBNLBdW027393@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ticso@freebsd.org using -f
From: Bernd Walter <ticso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111509 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Dec 2006 23:21:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=111509

Change 111509 by ticso@ticso on 2006/12/11 23:20:33

	add VLAN_MTU support

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#65 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#65 (text+ko) ====

@@ -205,6 +205,8 @@
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_capabilities |= IFCAP_VLAN_MTU;
+	ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */
 	ifp->if_start = atestart;
 	ifp->if_ioctl = ateioctl;
 	ifp->if_init = ateinit;
@@ -306,6 +308,9 @@
 	}
 	IF_ADDR_UNLOCK(sc->ifp);
 
+	/* enable big packets */
+	WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG);
+
 	/*
 	 * Write the hash to the hash register.  This card can also
 	 * accept unicast packets as well as multicast packets using this
@@ -822,7 +827,7 @@
 		 */
 		WR4(sc, ETH_TAR, segs[0].ds_addr);
 		WR4(sc, ETH_TCR, segs[0].ds_len);
-	
+
 		/*
 		 * Tap off here if there is a bpf listener.
 		 */
@@ -914,7 +919,7 @@
 	struct ate_softc *sc = ifp->if_softc;
  	struct mii_data *mii;
  	struct ifreq *ifr = (struct ifreq *)data;	
-	int             error = 0;
+	int mask, error = 0;
 
 	switch (cmd) {
 	case SIOCSIFFLAGS:
@@ -944,6 +949,13 @@
  		mii = device_get_softc(sc->miibus);
  		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd);
   		break;
+	case SIOCSIFCAP:
+		mask = ifp->if_capenable ^ ifr->ifr_reqcap;
+		if (mask & IFCAP_VLAN_MTU) {
+			ATE_LOCK(sc);
+			ifp->if_capenable ^= IFCAP_VLAN_MTU;
+			ATE_UNLOCK(sc);
+		}
 	default:
 		error = ether_ioctl(ifp, cmd, data);
 		break;