From: Anton Blanchard <anton@samba.org>
To: leitao@linux.vnet.ibm.com
Cc: netdev@vger.kernel.org, michael@ellerman.id.au
Subject: [PATCH 14/14] ehea: Add GRO support
Date: Tue, 5 Apr 2011 21:45:01 +1000 [thread overview]
Message-ID: <20110405214501.111d3638@kryten> (raw)
In-Reply-To: <20110405212825.6eb85677@kryten>
Add GRO support to the ehea driver.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
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 |
next prev parent reply other threads:[~2011-04-05 11:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-05 11:28 [PATCH 1/14] ehea: Remove NETIF_F_LLTX Anton Blanchard
2011-04-05 11:29 ` [PATCH 2/14] ehea: Update multiqueue support Anton Blanchard
2011-04-11 1:13 ` Michael Ellerman
2011-04-05 11:30 ` [PATCH 3/14] ehea: Remove force_irq logic in napi poll routine Anton Blanchard
2011-04-05 11:32 ` [PATCH 4/14] ehea: Remove num_tx_qps module option Anton Blanchard
2011-04-05 11:33 ` [PATCH 5/14] ehea: Don't check NETIF_F_TSO in TX path Anton Blanchard
2011-04-05 11:35 ` [PATCH 6/14] ehea: Add vlan_features Anton Blanchard
2011-04-05 11:36 ` [PATCH 7/14] ehea: Allocate large enough skbs to avoid partial cacheline DMA writes Anton Blanchard
2011-04-05 11:39 ` [PATCH 8/14] ehea: Simplify ehea_xmit2 and ehea_xmit3 Anton Blanchard
2011-04-05 11:40 ` [PATCH 9/14] ehea: Merge swqe2 TSO and non TSO paths Anton Blanchard
2011-04-05 11:41 ` [PATCH 10/14] ehea: Simplify type 3 transmit routine Anton Blanchard
2011-04-05 11:41 ` [PATCH 11/14] ehea: Remove some unused definitions Anton Blanchard
2011-04-05 11:42 ` [PATCH 12/14] ehea: Add some more ethtool operations and 64bit stats Anton Blanchard
2011-04-05 13:07 ` Ben Hutchings
2011-04-05 21:35 ` Anton Blanchard
2011-04-05 11:43 ` [PATCH 13/14] ehea: Remove LRO support Anton Blanchard
2011-04-05 11:45 ` Anton Blanchard [this message]
2011-04-05 21:29 ` [PATCH 14/14] ehea: Add GRO support Jesse Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110405214501.111d3638@kryten \
--to=anton@samba.org \
--cc=leitao@linux.vnet.ibm.com \
--cc=michael@ellerman.id.au \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).