From owner-svn-src-user@FreeBSD.ORG Sat Nov 10 20:34:48 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B9C3EB7E; Sat, 10 Nov 2012 20:34:48 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A065E8FC0C; Sat, 10 Nov 2012 20:34:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAAKYmop003478; Sat, 10 Nov 2012 20:34:48 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAAKYmYB003477; Sat, 10 Nov 2012 20:34:48 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201211102034.qAAKYmYB003477@svn.freebsd.org> From: Andre Oppermann Date: Sat, 10 Nov 2012 20:34:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r242876 - user/andre/tcp_workqueue/sys/dev/cxgbe/tom X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 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: Sat, 10 Nov 2012 20:34:48 -0000 Author: andre Date: Sat Nov 10 20:34:48 2012 New Revision: 242876 URL: http://svnweb.freebsd.org/changeset/base/242876 Log: Fix fallout from r242802 prototype to do ECMP with a next-hop array. rt_ifp is a #define and may not be used other variable names. Modified: user/andre/tcp_workqueue/sys/dev/cxgbe/tom/t4_connect.c Modified: user/andre/tcp_workqueue/sys/dev/cxgbe/tom/t4_connect.c ============================================================================== --- user/andre/tcp_workqueue/sys/dev/cxgbe/tom/t4_connect.c Sat Nov 10 19:32:16 2012 (r242875) +++ user/andre/tcp_workqueue/sys/dev/cxgbe/tom/t4_connect.c Sat Nov 10 20:34:48 2012 (r242876) @@ -279,7 +279,7 @@ t4_connect(struct toedev *tod, struct so struct wrqe *wr = NULL; struct cpl_act_open_req *cpl; struct l2t_entry *e = NULL; - struct ifnet *rt_ifp = rt->rt_ifp; + struct ifnet *ifp = rt->rt_ifp; struct port_info *pi; int atid = -1, mtu_idx, rscale, qid_atid, rc = ENOMEM; struct inpcb *inp = sotoinpcb(so); @@ -290,13 +290,13 @@ t4_connect(struct toedev *tod, struct so if (nam->sa_family != AF_INET) CXGBE_UNIMPLEMENTED("IPv6 connect"); - if (rt_ifp->if_type == IFT_ETHER) - pi = rt_ifp->if_softc; - else if (rt_ifp->if_type == IFT_L2VLAN) { - struct ifnet *ifp = VLAN_COOKIE(rt_ifp); - + if (ifp->if_type == IFT_ETHER) pi = ifp->if_softc; - } else if (rt_ifp->if_type == IFT_IEEE8023ADLAG) + else if (ifp->if_type == IFT_L2VLAN) { + struct ifnet *ifp_v = VLAN_COOKIE(ifp); + + pi = ifp_v->if_softc; + } else if (ifp->if_type == IFT_IEEE8023ADLAG) return (ENOSYS); /* XXX: implement lagg support */ else return (ENOTSUP); @@ -309,7 +309,7 @@ t4_connect(struct toedev *tod, struct so if (atid < 0) goto failed; - e = t4_l2t_get(pi, rt_ifp, + e = t4_l2t_get(pi, ifp, rt->rt_flags & RTF_GATEWAY ? rt->rt_gateway : nam); if (e == NULL) goto failed;