From owner-svn-src-user@FreeBSD.ORG  Thu Jun  4 22:23:45 2009
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 423E21065670;
	Thu,  4 Jun 2009 22:23:45 +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 30DF08FC1E;
	Thu,  4 Jun 2009 22:23:45 +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 n54MNi8E006196;
	Thu, 4 Jun 2009 22:23:44 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54MNiED006194;
	Thu, 4 Jun 2009 22:23:44 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906042223.n54MNiED006194@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 4 Jun 2009 22:23:44 +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: r193469 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	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: Thu, 04 Jun 2009 22:23:45 -0000

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__)