From owner-p4-projects@FreeBSD.ORG Fri Nov 9 05:38:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A632C16A421; Fri, 9 Nov 2007 05:38:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27D1D16A41A for ; Fri, 9 Nov 2007 05:38:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15DEF13C49D for ; Fri, 9 Nov 2007 05:38:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA95cDsV047989 for ; Fri, 9 Nov 2007 05:38:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA95cDvD047986 for perforce@freebsd.org; Fri, 9 Nov 2007 05:38:13 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 9 Nov 2007 05:38:13 GMT Message-Id: <200711090538.lA95cDvD047986@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128853 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2007 05:38:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=128853 Change 128853 by kmacy@kmacy:storage:toestack on 2007/11/09 05:37:25 fix handling of GET_IFF_MAC Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#16 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#16 (text+ko) ==== @@ -205,26 +205,29 @@ static struct ifnet * get_iff_from_mac(adapter_t *adapter, const uint8_t *mac, unsigned int vlan) { -#ifdef notyet int i; for_each_port(adapter, i) { +#ifdef notyet const struct vlan_group *grp; +#endif const struct port_info *p = &adapter->port[i]; - struct ifnet *ifnet = p->ifp; + struct ifnet *ifp = p->ifp; if (!memcmp(p->hw_addr, mac, ETHER_ADDR_LEN)) { +#ifdef notyet + if (vlan && vlan != EVL_VLID_MASK) { grp = p->vlan_grp; dev = grp ? grp->vlan_devices[vlan] : NULL; } else while (dev->master) dev = dev->master; - return dev; +#endif + return (ifp); } } -#endif - return NULL; + return (NULL); } static inline void