From patchwork Tue Apr 5 11:45:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 89837 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 2DDBBB6F9C for ; Tue, 5 Apr 2011 21:45:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753341Ab1DELpG (ORCPT ); Tue, 5 Apr 2011 07:45:06 -0400 Received: from ozlabs.org ([203.10.76.45]:49916 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753286Ab1DELpF (ORCPT ); Tue, 5 Apr 2011 07:45:05 -0400 Received: from kryten (ppp121-44-158-134.lns20.syd7.internode.on.net [121.44.158.134]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 0B9E2B6F9C; Tue, 5 Apr 2011 21:45:04 +1000 (EST) Date: Tue, 5 Apr 2011 21:45:01 +1000 From: Anton Blanchard To: leitao@linux.vnet.ibm.com Cc: netdev@vger.kernel.org, michael@ellerman.id.au Subject: [PATCH 14/14] ehea: Add GRO support Message-ID: <20110405214501.111d3638@kryten> In-Reply-To: <20110405212825.6eb85677@kryten> References: <20110405212825.6eb85677@kryten> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add GRO support to the ehea driver. Signed-off-by: Anton Blanchard --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/net/ehea/ehea_main.c =================================================================== --- linux-2.6.orig/drivers/net/ehea/ehea_main.c 2011-04-05 20:47:47.870323182 +1000 +++ linux-2.6/drivers/net/ehea/ehea_main.c 2011-04-05 20:47:50.709998860 +1000 @@ -634,18 +634,6 @@ static int ehea_treat_poll_error(struct return 0; } -static void ehea_proc_skb(struct ehea_port_res *pr, struct ehea_cqe *cqe, - struct sk_buff *skb) -{ - int vlan_extracted = ((cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) && - pr->port->vgrp); - - if (vlan_extracted) - vlan_hwaccel_receive_skb(skb, pr->port->vgrp, cqe->vlan_tag); - else - netif_receive_skb(skb); -} - static int ehea_proc_rwqes(struct net_device *dev, struct ehea_port_res *pr, int budget) @@ -728,7 +716,14 @@ static int ehea_proc_rwqes(struct net_de } processed_bytes += skb->len; - ehea_proc_skb(pr, cqe, skb); + + if ((cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) && + pr->port->vgrp) { + vlan_gro_receive(&pr->napi, pr->port->vgrp, + cqe->vlan_tag, skb); + } else { + napi_gro_receive(&pr->napi, skb); + } } else { pr->p_stats.poll_receive_errors++; port_reset = ehea_treat_poll_error(pr, rq, cqe, @@ -3045,7 +3040,7 @@ struct ehea_port *ehea_setup_single_port dev->netdev_ops = &ehea_netdev_ops; ehea_set_ethtool_ops(dev); - dev->features = NETIF_F_SG | NETIF_F_TSO + dev->features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_GRO | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER; dev->vlan_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA |