diff options
| author | David S. Miller | 2016-07-22 06:50:49 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-07-22 06:50:49 +0200 |
| commit | d95a93a9b71677a43f967a1b7986decab84b7765 (patch) | |
| tree | 5d8e34879a4a9c47ad1bf63481254f23bce0f61e /include/net | |
| parent | Merge tag 'nfc-next-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s... (diff) | |
| parent | macsec: enable GRO and RPS on macsec devices (diff) | |
| download | kernel-qcow2-linux-d95a93a9b71677a43f967a1b7986decab84b7765.tar.gz kernel-qcow2-linux-d95a93a9b71677a43f967a1b7986decab84b7765.tar.xz kernel-qcow2-linux-d95a93a9b71677a43f967a1b7986decab84b7765.zip | |
Merge branch 'macsec-gro'
Paolo Abeni says:
====================
macsec: enable s/w offloads
This patches leverage gro_cells infrastructure to enable both GRO and RPS
on macsec devices.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/gro_cells.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h index cf6c74550baa..d15214d673b2 100644 --- a/include/net/gro_cells.h +++ b/include/net/gro_cells.h @@ -14,27 +14,26 @@ struct gro_cells { struct gro_cell __percpu *cells; }; -static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *skb) +static inline int gro_cells_receive(struct gro_cells *gcells, struct sk_buff *skb) { struct gro_cell *cell; struct net_device *dev = skb->dev; - if (!gcells->cells || skb_cloned(skb) || !(dev->features & NETIF_F_GRO)) { - netif_rx(skb); - return; - } + if (!gcells->cells || skb_cloned(skb) || !(dev->features & NETIF_F_GRO)) + return netif_rx(skb); cell = this_cpu_ptr(gcells->cells); if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) { atomic_long_inc(&dev->rx_dropped); kfree_skb(skb); - return; + return NET_RX_DROP; } __skb_queue_tail(&cell->napi_skbs, skb); if (skb_queue_len(&cell->napi_skbs) == 1) napi_schedule(&cell->napi); + return NET_RX_SUCCESS; } /* called under BH context */ |