From owner-svn-src-user@FreeBSD.ORG Fri Nov 21 08:19:21 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 4F71D1065673;
Fri, 21 Nov 2008 08:19:21 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 3EC648FC1B;
Fri, 21 Nov 2008 08:19:21 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAL8JL8e078955;
Fri, 21 Nov 2008 08:19:21 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAL8JLu0078953;
Fri, 21 Nov 2008 08:19:21 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811210819.mAL8JLu0078953@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 21 Nov 2008 08:19:21 +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: r185152 - user/kmacy/HEAD_fast_multi_xmit/sys/net
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" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Nov 2008 08:19:21 -0000
Author: kmacy
Date: Fri Nov 21 08:19:20 2008
New Revision: 185152
URL: http://svn.freebsd.org/changeset/base/185152
Log:
compile fixes for previous commit
Modified:
user/kmacy/HEAD_fast_multi_xmit/sys/net/if.c
user/kmacy/HEAD_fast_multi_xmit/sys/net/if_var.h
Modified: user/kmacy/HEAD_fast_multi_xmit/sys/net/if.c
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/net/if.c Fri Nov 21 08:10:07 2008 (r185151)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/net/if.c Fri Nov 21 08:19:20 2008 (r185152)
@@ -113,7 +113,7 @@ static int ifconf(u_long, caddr_t);
static void if_freemulti(struct ifmultiaddr *);
static void if_grow(void);
static void if_init(void *);
-static void if_qflush(struct ifaltq *);
+static void if_qflush(struct ifnet *);
static void if_route(struct ifnet *, int flag, int fam);
static int if_setflag(struct ifnet *, int, int, int *, int);
static void if_slowtimo(void *);
@@ -481,10 +481,10 @@ if_free_type(struct ifnet *ifp, u_char t
};
void
-ifq_attach(struct ifaltq *ifq, char *buf)
+ifq_attach(struct ifaltq *ifq, struct ifnet *ifp)
{
- mtx_init(ifq->ifq_mtx, buf, "if send queue", MTX_DEF);
+ mtx_init(&ifq->ifq_mtx, ifp->if_xname, "if send queue", MTX_DEF);
if (ifq->ifq_maxlen == 0)
ifq->ifq_maxlen = ifqmaxlen;
@@ -499,7 +499,7 @@ ifq_attach(struct ifaltq *ifq, char *buf
void
ifq_detach(struct ifaltq *ifq)
{
- mtx_destroy(ifq->ifq_mtx);
+ mtx_destroy(&ifq->ifq_mtx);
}
/*
@@ -556,7 +556,7 @@ if_attach(struct ifnet *ifp)
make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d",
net_cdevsw.d_name, ifp->if_index);
- ifq_attach(&ifp->if_snd, ifp->if_xname);
+ ifq_attach(&ifp->if_snd, ifp);
/*
* create a Link Level name for this device
Modified: user/kmacy/HEAD_fast_multi_xmit/sys/net/if_var.h
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/net/if_var.h Fri Nov 21 08:10:07 2008 (r185151)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/net/if_var.h Fri Nov 21 08:19:20 2008 (r185152)
@@ -187,7 +187,7 @@ struct ifnet {
void *if_pf_kif;
void *if_lagg; /* lagg glue */
void *if_pspare[8]; /* multiq/TOE 3; vimage 3; general use 4 */
- int (*if_qflush) /* flush any queues */
+ void (*if_qflush) /* flush any queues */
(struct ifnet *);
int (*if_transmit) /* initiate output routine */
(struct ifnet *, struct mbuf *);
@@ -690,7 +690,7 @@ int ifioctl(struct socket *, u_long, cad
int ifpromisc(struct ifnet *, int);
struct ifnet *ifunit(const char *);
-void ifq_attach(struct ifaltq *);
+void ifq_attach(struct ifaltq *, struct ifnet *ifp);
void ifq_detach(struct ifaltq *);
struct ifaddr *ifa_ifwithaddr(struct sockaddr *);