From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Pirko Subject: Re: [patch net-next-2.6 35/47] e1000: do vlan cleanup Date: Wed, 20 Jul 2011 21:08:27 +0200 Message-ID: <20110720190825.GC2688@minipsycho.redhat.com> References: <1311173689-17419-1-git-send-email-jpirko@redhat.com> <1311173689-17419-36-git-send-email-jpirko@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, bruce.w.allan@intel.com, jesse.brandeburg@intel.com, mirqus@gmail.com, john.ronciak@intel.com, shemminger@linux-foundation.org, davem@davemloft.net To: Jesse Gross Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: e1000-devel-bounces@lists.sourceforge.net List-Id: netdev.vger.kernel.org Wed, Jul 20, 2011 at 07:48:32PM CEST, jesse@nicira.com wrote: >On Wed, Jul 20, 2011 at 7:54 AM, Jiri Pirko wrote: >> @@ -4532,9 +4539,8 @@ static void e1000_vlan_rx_register(struct net_devi= ce *netdev, >> >> =A0 =A0 =A0 =A0if (!test_bit(__E1000_DOWN, &adapter->flags)) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0e1000_irq_disable(adapter); >> - =A0 =A0 =A0 adapter->vlgrp =3D grp; >> >> - =A0 =A0 =A0 if (grp) { >> + =A0 =A0 =A0 if (vlan_on) { >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* enable VLAN tag insert/strip */ >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ctrl =3D er32(CTRL); >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ctrl |=3D E1000_CTRL_VME; > >Same comment here as with the igb driver. The driver behaviour remains intact here. ---------------------------------------------------------------------------= --- 10 Tips for Better Web Security Learn 10 ways to better secure your business today. Topics covered include: Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, security Microsoft Exchange, secure Instant Messaging, and much more. http://www.accelacomm.com/jaw/sfnl/114/51426210/ _______________________________________________ E1000-devel mailing list E1000-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/e1000-devel To learn more about Intel® Ethernet, visit http://communities.intel.co= m/community/wired