Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 4 Jun 2009 03:19:00 +0000 (UTC)
From:      Kip Macy <kmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r193421 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
Message-ID:  <200906040319.n543J05o075643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kmacy
Date: Thu Jun  4 03:18:59 2009
New Revision: 193421
URL: http://svn.freebsd.org/changeset/base/193421

Log:
  remove #ifdef INET
  call cxgb_init instead of cxgb_init_locked

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Thu Jun  4 02:49:50 2009	(r193420)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Thu Jun  4 03:18:59 2009	(r193421)
@@ -2086,9 +2086,7 @@ static int
 cxgb_ioctl(struct ifnet *ifp, unsigned long command, caddr_t data)
 {
 	struct port_info *p = ifp->if_softc;
-#ifdef INET
 	struct ifaddr *ifa = (struct ifaddr *)data;
-#endif
 	struct ifreq *ifr = (struct ifreq *)data;
 	int flags, error = 0, reinit = 0;
 	uint32_t mask;
@@ -2101,17 +2099,13 @@ cxgb_ioctl(struct ifnet *ifp, unsigned l
 		error = cxgb_set_mtu(p, ifr->ifr_mtu);
 		break;
 	case SIOCSIFADDR:
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET) {
 			ifp->if_flags |= IFF_UP;
 			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
-				PORT_LOCK(p);
-				cxgb_init_locked(p);
-				PORT_UNLOCK(p);
+				cxgb_init(p);
 			}
 			arp_ifinit(ifp, ifa);
 		} else
-#endif
 			error = ether_ioctl(ifp, command, data);
 		break;
 	case SIOCSIFFLAGS:
@@ -2122,8 +2116,11 @@ cxgb_ioctl(struct ifnet *ifp, unsigned l
 				if (((ifp->if_flags ^ flags) & IFF_PROMISC) ||
 				    ((ifp->if_flags ^ flags) & IFF_ALLMULTI))
 					cxgb_set_rxmode(p);
-			} else
+			} else {
+				PORT_UNLOCK(p);
 				cxgb_init_locked(p);
+				PORT_LOCK(p);
+			}
 			p->if_flags = ifp->if_flags;
 		} else if (ifp->if_drv_flags & IFF_DRV_RUNNING) 
 			cxgb_stop_locked(p);

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h	Thu Jun  4 02:49:50 2009	(r193420)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h	Thu Jun  4 03:18:59 2009	(r193421)
@@ -116,7 +116,7 @@ struct t3_mbuf_hdr {
 
 #if __FreeBSD_version >= 701000
 #include "opt_inet.h"
-#ifdef INET
+#ifdef notyet
 #define LRO_SUPPORTED
 #endif
 #define TOE_SUPPORTED

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906040319.n543J05o075643>