From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCHv2 NEXT 2/5] qlcnic: vlan gro support Date: Fri, 17 Sep 2010 11:24:55 -0700 (PDT) Message-ID: <20100917.112455.191154697.davem@davemloft.net> References: <1284700483-16397-1-git-send-email-amit.salecha@qlogic.com> <1284700483-16397-3-git-send-email-amit.salecha@qlogic.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, ameen.rahman@qlogic.com, anirban.chakraborty@qlogic.com To: amit.salecha@qlogic.com Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:40244 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754452Ab0IQSYg (ORCPT ); Fri, 17 Sep 2010 14:24:36 -0400 In-Reply-To: <1284700483-16397-3-git-send-email-amit.salecha@qlogic.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Amit Kumar Salecha Date: Thu, 16 Sep 2010 22:14:40 -0700 > @@ -796,7 +796,7 @@ qlcnic_set_netdev_features(struct qlcnic_adapter *adapter, > features = (NETIF_F_SG | NETIF_F_IP_CSUM | > NETIF_F_IPV6_CSUM | NETIF_F_GRO); > vlan_features = (NETIF_F_SG | NETIF_F_IP_CSUM | > - NETIF_F_IPV6_CSUM); > + NETIF_F_IPV6_CSUM | NETIF_F_GRO); > > if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO) { > features |= (NETIF_F_TSO | NETIF_F_TSO6); > @@ -1456,7 +1456,7 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, > netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | > NETIF_F_IPV6_CSUM | NETIF_F_GRO | NETIF_F_HW_VLAN_RX); > netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | > - NETIF_F_IPV6_CSUM); > + NETIF_F_IPV6_CSUM | NETIF_F_GRO); > > if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO) { Drivers no longer should set NETIF_F_GRO in their vlan_features flags, the generic networking core does this for you now in register_netdevice() in net-next-2.6 Please respin this patch with these settings removed. Thanks.