Date: Sat, 2 Jun 2012 00:47:14 +0000 (UTC) From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r236429 - user/np/toe_iwarp/sys/dev/cxgbe Message-ID: <201206020047.q520lEJP054377@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: np Date: Sat Jun 2 00:47:14 2012 New Revision: 236429 URL: http://svn.freebsd.org/changeset/base/236429 Log: There is no need to do anything for vlan_unconfig. Modified: user/np/toe_iwarp/sys/dev/cxgbe/adapter.h user/np/toe_iwarp/sys/dev/cxgbe/t4_main.c Modified: user/np/toe_iwarp/sys/dev/cxgbe/adapter.h ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgbe/adapter.h Sat Jun 2 00:29:42 2012 (r236428) +++ user/np/toe_iwarp/sys/dev/cxgbe/adapter.h Sat Jun 2 00:47:14 2012 (r236429) @@ -214,7 +214,6 @@ struct port_info { struct port_stats stats; eventhandler_tag vlan_c; - eventhandler_tag vlan_u; struct callout tick; struct sysctl_ctx_list ctx; /* from ifconfig up to driver detach */ Modified: user/np/toe_iwarp/sys/dev/cxgbe/t4_main.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgbe/t4_main.c Sat Jun 2 00:29:42 2012 (r236428) +++ user/np/toe_iwarp/sys/dev/cxgbe/t4_main.c Sat Jun 2 00:47:14 2012 (r236429) @@ -302,7 +302,6 @@ static void reg_block_dump(struct adapte static void t4_get_regs(struct adapter *, struct t4_regdump *, uint8_t *); static void cxgbe_tick(void *); static void cxgbe_vlan_config(void *, struct ifnet *, uint16_t); -static void cxgbe_vlan_unconfig(void *, struct ifnet *, uint16_t); static int cpl_not_handled(struct sge_iq *, const struct rss_header *, struct mbuf *); static int t4_sysctls(struct adapter *); @@ -854,8 +853,6 @@ cxgbe_attach(device_t dev) pi->vlan_c = EVENTHANDLER_REGISTER(vlan_config, cxgbe_vlan_config, ifp, EVENTHANDLER_PRI_ANY); - pi->vlan_u = EVENTHANDLER_REGISTER(vlan_unconfig, cxgbe_vlan_unconfig, - ifp, EVENTHANDLER_PRI_ANY); ether_ifattach(ifp, pi->hw_addr); @@ -891,8 +888,6 @@ cxgbe_detach(device_t dev) if (pi->vlan_c) EVENTHANDLER_DEREGISTER(vlan_config, pi->vlan_c); - if (pi->vlan_u) - EVENTHANDLER_DEREGISTER(vlan_unconfig, pi->vlan_u); PORT_LOCK(pi); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; @@ -2916,18 +2911,6 @@ cxgbe_vlan_config(void *arg, struct ifne VLAN_SETCOOKIE(vlan, ifp); } -static void -cxgbe_vlan_unconfig(void *arg, struct ifnet *ifp, uint16_t vid) -{ - struct ifnet *vlan; - - if (arg != ifp) - return; - - vlan = VLAN_DEVAT(ifp, vid); - VLAN_SETCOOKIE(vlan, NULL); -} - static int cpl_not_handled(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206020047.q520lEJP054377>