diff options
| author | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-09-07 18:15:43 (GMT) |
|---|---|---|
| committer | J. German Rivera <German.Rivera@freescale.com> | 2013-09-07 18:15:43 (GMT) |
| commit | 78f1554f2ac9a8a3dd622fa49f4623cddba9e036 (patch) | |
| tree | b488208f99a90f1966ba8d7803cd5ddcc287a1fa /drivers/net | |
| parent | 188c08c4064ffc2fa303b8512a673016d1d4071c (diff) | |
| parent | db651a6e8e0df939cb977a8799816c04b07506c3 (diff) | |
| download | linux-fsl-qoriq-78f1554f2ac9a8a3dd622fa49f4623cddba9e036.tar.xz | |
Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8
Conflicts temporarily resolved for:
drivers/net/ethernet/freescale/dpa/dpaa_eth.c
Permanent solution needs to be provided by the author of
commit ec6aa025.
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c index 0b5d269..a593882 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c @@ -577,17 +577,11 @@ void __hot _dpa_rx(struct net_device *net_dev, skb_len = skb->len; if (use_gro) { - gro_result_t gro_result; - - gro_result = napi_gro_receive(&percpu_priv->napi, skb); - if (unlikely(gro_result == GRO_DROP)) { - percpu_stats->rx_dropped++; + if (unlikely(napi_gro_receive(&percpu_priv->napi, skb) == + GRO_DROP)) goto packet_dropped; - } - } else if (unlikely(netif_receive_skb(skb) == NET_RX_DROP)) { - percpu_stats->rx_dropped++; + } else if (unlikely(netif_receive_skb(skb) == NET_RX_DROP)) goto packet_dropped; - } percpu_stats->rx_packets++; percpu_stats->rx_bytes += skb_len; |