From owner-svn-src-all@FreeBSD.ORG Wed Aug 19 19:07:08 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7ED6F106568F; Wed, 19 Aug 2009 19:07:08 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: from an-out-0708.google.com (an-out-0708.google.com [209.85.132.240]) by mx1.freebsd.org (Postfix) with ESMTP id D1C2A8FC43; Wed, 19 Aug 2009 19:07:07 +0000 (UTC) Received: by an-out-0708.google.com with SMTP id d14so1708421and.13 for ; Wed, 19 Aug 2009 12:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=lSvS1UtKvd4kdsuqWMfsB1FSND4djbuDIeLR3Mk4pA0=; b=Udw843J8599KG+A2kYkfvLAU8JinsMPyDLFRWLbHmUgC5Qf1TLTWAzXKjQzJf/qlYP bRBNB7LdjoTZccdTx1MJxOZg1UjbmbdZeTBY7AVIR8tQ9ASvr85nP8Vu5cofpykJVCWv uLYhnLPjpb4sQSq8fQVvPsPCOL/oY73dfZvTU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=V9UQjmjpgoatKhE03ylABpNbuSn719+1mttvLSfIFOnGqg7M1aXMuslAkJpP64Xyyq wd4V4v0n2uxB8EuYmSbwxFG/+0eMupz93LYRllaLAGMFGRSel8tDUEHFJZINfKOxgyD0 jvW8scc+BNh77cZW3xx5IM1QfCB68hFOdvj7w= MIME-Version: 1.0 Received: by 10.101.90.3 with SMTP id s3mr7547748anl.23.1250707214359; Wed, 19 Aug 2009 11:40:14 -0700 (PDT) In-Reply-To: <200908191808.n7JI8pNM061610@svn.freebsd.org> References: <200908191808.n7JI8pNM061610@svn.freebsd.org> Date: Wed, 19 Aug 2009 11:40:14 -0700 Message-ID: <2a41acea0908191140n7ac726b6x46ae428e3490e0de@mail.gmail.com> From: Jack Vogel To: Xin LI Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r196387 - in stable/8/sys: . dev/e1000 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2009 19:07:08 -0000 Thanks for doing this for me Xin. Jack On Wed, Aug 19, 2009 at 11:08 AM, Xin LI wrote: > Author: delphij > Date: Wed Aug 19 18:08:50 2009 > New Revision: 196387 > URL: http://svn.freebsd.org/changeset/base/196387 > > Log: > MFC r196386: > > Temporarily enhance em(4) and igb(4) hack to take account for IFF_NOARP. > Without this changeset there will be no way to prevent these NICs from > sending ARP, which is harmful in server farms that is configured as > "Direct Server Return" behind a load balancer. > > A better fix would remove the whole hack completely but it would be > later than 8.0-RELEASE. > > Reviewed by: jfv, yongari > Approved by: re (kib) > > Modified: > stable/8/sys/ (props changed) > stable/8/sys/dev/e1000/if_em.c > stable/8/sys/dev/e1000/if_igb.c > > Modified: stable/8/sys/dev/e1000/if_em.c > > ============================================================================== > --- stable/8/sys/dev/e1000/if_em.c Wed Aug 19 17:59:41 2009 > (r196386) > +++ stable/8/sys/dev/e1000/if_em.c Wed Aug 19 18:08:50 2009 > (r196387) > @@ -1204,7 +1204,8 @@ em_ioctl(struct ifnet *ifp, u_long comma > em_init_locked(adapter); > EM_CORE_UNLOCK(adapter); > } > - arp_ifinit(ifp, ifa); > + if (!(ifp->if_flags & IFF_NOARP)) > + arp_ifinit(ifp, ifa); > } else > #endif > error = ether_ioctl(ifp, command, data); > > Modified: stable/8/sys/dev/e1000/if_igb.c > > ============================================================================== > --- stable/8/sys/dev/e1000/if_igb.c Wed Aug 19 17:59:41 2009 > (r196386) > +++ stable/8/sys/dev/e1000/if_igb.c Wed Aug 19 18:08:50 2009 > (r196387) > @@ -952,7 +952,8 @@ igb_ioctl(struct ifnet *ifp, u_long comm > igb_init_locked(adapter); > IGB_CORE_UNLOCK(adapter); > } > - arp_ifinit(ifp, ifa); > + if (!(ifp->if_flags & IFF_NOARP)) > + arp_ifinit(ifp, ifa); > } else > #endif > error = ether_ioctl(ifp, command, data); >