diff options
| author | Anton Blanchard <anton@samba.org> | 2011-10-14 05:31:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-17 19:00:55 -0400 |
| commit | 3428414f71e12f8111dfa16e4d958e6ed055268a (patch) | |
| tree | 8168af90842f9611a6bce11a8d62ba61193e60e2 /drivers/net/ethernet | |
| parent | 2cb1deb56f5bf413da83491e0cb5a0474393c8ef (diff) | |
| download | linux-3.10-3428414f71e12f8111dfa16e4d958e6ed055268a.tar.gz linux-3.10-3428414f71e12f8111dfa16e4d958e6ed055268a.tar.bz2 linux-3.10-3428414f71e12f8111dfa16e4d958e6ed055268a.zip | |
ehea: Add GRO support
Add GRO support to the ehea driver.
v3:
[cascardo] no need to enable GRO, since it's enabled by default
[cascardo] vgrp was removed in the vlan cleanup
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 3b8e6574da0..bfd08b2a991 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -647,15 +647,6 @@ static int ehea_treat_poll_error(struct ehea_port_res *pr, int rq, return 0; } -static void ehea_proc_skb(struct ehea_port_res *pr, struct ehea_cqe *cqe, - struct sk_buff *skb) -{ - if (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) - __vlan_hwaccel_put_tag(skb, cqe->vlan_tag); - - netif_receive_skb(skb); -} - static int ehea_proc_rwqes(struct net_device *dev, struct ehea_port_res *pr, int budget) @@ -732,7 +723,11 @@ static int ehea_proc_rwqes(struct net_device *dev, } processed_bytes += skb->len; - ehea_proc_skb(pr, cqe, skb); + + if (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) + __vlan_hwaccel_put_tag(skb, cqe->vlan_tag); + + napi_gro_receive(&pr->napi, skb); } else { pr->p_stats.poll_receive_errors++; port_reset = ehea_treat_poll_error(pr, rq, cqe, |