svn commit: r193469 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb

Kip Macy kmacy at FreeBSD.org
Thu Jun 4 22:23:45 UTC 2009


Author: kmacy
Date: Thu Jun  4 22:23:44 2009
New Revision: 193469
URL: http://svn.freebsd.org/changeset/base/193469

Log:
  remove gratuitous INET specific bits from cxgb_ioctl

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 22:14:36 2009	(r193468)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Thu Jun  4 22:23:44 2009	(r193469)
@@ -2098,16 +2098,6 @@ cxgb_ioctl(struct ifnet *ifp, unsigned l
 	case SIOCSIFMTU:
 		error = cxgb_set_mtu(p, ifr->ifr_mtu);
 		break;
-	case SIOCSIFADDR:
-		if (ifa->ifa_addr->sa_family == AF_INET) {
-			ifp->if_flags |= IFF_UP;
-			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
-				cxgb_init(p);
-			}
-			arp_ifinit(ifp, ifa);
-		} else
-			error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		PORT_LOCK(p);
 		if (ifp->if_flags & IFF_UP) {

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 22:14:36 2009	(r193468)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h	Thu Jun  4 22:23:44 2009	(r193469)
@@ -116,11 +116,11 @@ struct t3_mbuf_hdr {
 
 #if __FreeBSD_version >= 701000
 #include "opt_inet.h"
-#ifdef notyet
+#ifdef INET
 #define LRO_SUPPORTED
-#endif
 #define TOE_SUPPORTED
 #endif
+#endif
 
 #if __FreeBSD_version < 800054
 #if defined (__GNUC__)


More information about the svn-src-user mailing list