From patchwork Tue Jul 23 20:05:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Metcalf X-Patchwork-Id: 261193 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0C7222C00CB for ; Wed, 24 Jul 2013 06:23:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934408Ab3GWUVy (ORCPT ); Tue, 23 Jul 2013 16:21:54 -0400 Received: from usmamail.tilera.com ([12.216.194.151]:23558 "EHLO USMAMAIL.TILERA.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934394Ab3GWUVx (ORCPT ); Tue, 23 Jul 2013 16:21:53 -0400 Received: from farm-0002.internal.tilera.com (10.2.0.32) by USMAEXCH2.tad.internal.tilera.com (10.3.0.33) with Microsoft SMTP Server (TLS) id 14.0.722.0; Tue, 23 Jul 2013 16:21:53 -0400 Received: (from cmetcalf@localhost) by farm-0002.internal.tilera.com (8.14.4/8.12.11/Submit) id r6NKLrAG009851; Tue, 23 Jul 2013 16:21:53 -0400 Message-ID: <1188c5613d72850983d54f3b6d0276f3a5aa98f0.1374609949.git.cmetcalf@tilera.com> In-Reply-To: References: From: Chris Metcalf Date: Tue, 23 Jul 2013 16:05:48 -0400 Subject: [PATCH 09/13] tile: enable GRO in the tilegx network driver To: , MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Chris Metcalf --- drivers/net/ethernet/tile/tilegx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index b34fd2c..9c128ff 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c @@ -458,7 +458,7 @@ static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb, /* Get RX timestamp from idesc. */ tile_rx_timestamp(skb, idesc); - netif_receive_skb(skb); + napi_gro_receive(&info->napi, skb); /* Update stats. */ tile_net_stats_add(1, &dev->stats.rx_packets); @@ -1880,6 +1880,7 @@ static void tile_net_setup(struct net_device *dev) dev->features |= NETIF_F_HW_CSUM; dev->features |= NETIF_F_SG; dev->features |= NETIF_F_TSO; + dev->features |= NETIF_F_GRO; dev->mtu = 1500; }