From owner-svn-src-user@FreeBSD.ORG Fri Mar 12 01:51:39 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD497106564A; Fri, 12 Mar 2010 01:51:39 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A2E58FC14; Fri, 12 Mar 2010 01:51:39 +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 o2C1pdZZ054929; Fri, 12 Mar 2010 01:51:39 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2C1pdFt054927; Fri, 12 Mar 2010 01:51:39 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003120151.o2C1pdFt054927@svn.freebsd.org> From: Juli Mallett Date: Fri, 12 Mar 2010 01:51:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205059 - user/jmallett/octeon/sys/mips/cavium/dev/rgmii X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Mar 2010 01:51:40 -0000 Author: jmallett Date: Fri Mar 12 01:51:39 2010 New Revision: 205059 URL: http://svn.freebsd.org/changeset/base/205059 Log: Change octeon_rgmx_rx_promiscuous into octeon_rgmx_config_cam which does general CAM configuration stuff (in theory) and checks interface flags for its own use rather than expecting a caller to. Modified: user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c Modified: user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c Fri Mar 12 01:20:10 2010 (r205058) +++ user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c Fri Mar 12 01:51:39 2010 (r205059) @@ -209,7 +209,7 @@ static int octeon_rgmx_intr(void *arg); /* Standard driver entry points. These can be static. */ static void octeon_rgmx_init (void *); //static driver_intr_t rgmx_intr; -static void octeon_rgmx_rx_promiscuous (struct ifnet *, int); +static void octeon_rgmx_config_cam (struct ifnet *); static int octeon_rgmx_ioctl (struct ifnet *, u_long, caddr_t); static void octeon_rgmx_output_start (struct ifnet *); static void octeon_rgmx_output_start_locked (struct ifnet *); @@ -1684,7 +1684,7 @@ static void octeon_rgmx_medstat (struct RGMX_UNLOCK(sc); } -static void octeon_rgmx_rx_promiscuous (struct ifnet *ifp, int promisc) +static void octeon_rgmx_config_cam(struct ifnet *ifp) { struct rgmx_softc_dev *sc = ifp->if_softc; u_int port = sc->port; @@ -1704,7 +1704,11 @@ static void octeon_rgmx_rx_promiscuous ( adr_ctl |= OCTEON_RGMX_ADRCTL_ACCEPT_BROADCAST; /* - * For now always accept all multicast. + * Accept all multicast in all multicast mode and in + * promiscuous mode. + * + * XXX Since we don't handle programming the CAM for + * multicast filtering, always accept all multicast. */ adr_ctl &= ~OCTEON_RGMX_ADRCTL_REJECT_ALL_MULTICAST; adr_ctl |= OCTEON_RGMX_ADRCTL_ACCEPT_ALL_MULTICAST; @@ -1713,7 +1717,7 @@ static void octeon_rgmx_rx_promiscuous ( * In promiscuous mode, the CAM is shut off, so reject everything. * Otherwise, filter using the CAM. */ - if (promisc) { + if ((ifp->if_flags & IFF_PROMISC) != 0) { adr_ctl &= ~OCTEON_RGMX_ADRCTL_CAM_MODE_ACCEPT_DMAC; adr_ctl |= OCTEON_RGMX_ADRCTL_CAM_MODE_REJECT_DMAC; } else { @@ -1726,7 +1730,7 @@ static void octeon_rgmx_rx_promiscuous ( /* * If in promiscuous mode, disable the CAM. */ - if (promisc) + if ((ifp->if_flags & IFF_PROMISC) != 0) oct_write64(OCTEON_RGMX_RXX_ADR_CAM_EN(index, iface), 0); else oct_write64(OCTEON_RGMX_RXX_ADR_CAM_EN(index, iface), 1); @@ -1759,11 +1763,7 @@ static int octeon_rgmx_ioctl (struct ifn if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { octeon_rgmx_init(sc); } - - if ((ifp->if_flags & IFF_PROMISC) == 0) - octeon_rgmx_rx_promiscuous(ifp, 0); - else - octeon_rgmx_rx_promiscuous(ifp, 1); + octeon_rgmx_config_cam(ifp); } else { /* * New state is IFF_DOWN.