From owner-svn-src-all@FreeBSD.ORG Mon Aug 23 20:53:24 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF7F11065696; Mon, 23 Aug 2010 20:53:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 82ADD8FC19; Mon, 23 Aug 2010 20:53:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7NKrODa052659; Mon, 23 Aug 2010 20:53:24 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7NKrO2G052654; Mon, 23 Aug 2010 20:53:24 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201008232053.o7NKrO2G052654@svn.freebsd.org> From: John Baldwin Date: Mon, 23 Aug 2010 20:53:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211720 - in stable/7: contrib/bsnmp/snmp_mibII sbin/ifconfig usr.sbin/ndp usr.sbin/ppp X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2010 20:53:24 -0000 Author: jhb Date: Mon Aug 23 20:53:24 2010 New Revision: 211720 URL: http://svn.freebsd.org/changeset/base/211720 Log: MFC 210936,210946: Ethernet vlan(4) interfaces have valid Ethernet link layer addresses but use a different interface type (IFT_L2VLAN vs IFT_ETHER). Treat IFT_L2VLAN interfaces like IFT_ETHER interfaces when handling link layer addresses. Modified: stable/7/contrib/bsnmp/snmp_mibII/mibII.c stable/7/sbin/ifconfig/af_link.c stable/7/usr.sbin/ndp/ndp.c stable/7/usr.sbin/ppp/ipv6cp.c Directory Properties: stable/7/contrib/bsnmp/ (props changed) stable/7/sbin/ifconfig/ (props changed) stable/7/usr.sbin/ndp/ (props changed) stable/7/usr.sbin/ppp/ (props changed) Modified: stable/7/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- stable/7/contrib/bsnmp/snmp_mibII/mibII.c Mon Aug 23 20:53:01 2010 (r211719) +++ stable/7/contrib/bsnmp/snmp_mibII/mibII.c Mon Aug 23 20:53:24 2010 (r211720) @@ -821,6 +821,7 @@ check_llbcast(struct mibif *ifp) case IFT_ETHER: case IFT_FDDI: case IFT_ISO88025: + case IFT_L2VLAN: if (mib_find_rcvaddr(ifp->index, ether_bcast, 6) == NULL && (rcv = mib_rcvaddr_create(ifp, ether_bcast, 6)) != NULL) rcv->flags |= MIBRCVADDR_BCAST; Modified: stable/7/sbin/ifconfig/af_link.c ============================================================================== --- stable/7/sbin/ifconfig/af_link.c Mon Aug 23 20:53:01 2010 (r211719) +++ stable/7/sbin/ifconfig/af_link.c Mon Aug 23 20:53:24 2010 (r211720) @@ -58,7 +58,9 @@ link_status(int s __unused, const struct struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr; if (sdl != NULL && sdl->sdl_alen > 0) { - if (sdl->sdl_type == IFT_ETHER && + if ((sdl->sdl_type == IFT_ETHER || + sdl->sdl_type == IFT_L2VLAN || + sdl->sdl_type == IFT_BRIDGE) && sdl->sdl_alen == ETHER_ADDR_LEN) printf("\tether %s\n", ether_ntoa((struct ether_addr *)LLADDR(sdl))); Modified: stable/7/usr.sbin/ndp/ndp.c ============================================================================== --- stable/7/usr.sbin/ndp/ndp.c Mon Aug 23 20:53:01 2010 (r211719) +++ stable/7/usr.sbin/ndp/ndp.c Mon Aug 23 20:53:24 2010 (r211720) @@ -433,6 +433,7 @@ set(argc, argv) switch (sdl->sdl_type) { case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023: case IFT_ISO88024: case IFT_ISO88025: + case IFT_L2VLAN: case IFT_BRIDGE: goto overwrite; } } Modified: stable/7/usr.sbin/ppp/ipv6cp.c ============================================================================== --- stable/7/usr.sbin/ppp/ipv6cp.c Mon Aug 23 20:53:01 2010 (r211719) +++ stable/7/usr.sbin/ppp/ipv6cp.c Mon Aug 23 20:53:24 2010 (r211720) @@ -148,6 +148,7 @@ SetInterfaceID(u_char *ifid, int userand switch(sdl->sdl_type) { case IFT_ETHER: case IFT_FDDI: + case IFT_L2VLAN: /* XXX need more cases? */ break; default: