diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2016-07-20 18:11:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-22 06:50:41 +0200 |
| commit | 5f652bb2eb3eb38f97194ce5c41da1fa12e914b8 (patch) | |
| tree | da586a6359ddf65f17d178bbbbf1e9a82934d1ca /include/net/gro_cells.h | |
| parent | Merge tag 'nfc-next-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s... (diff) | |
| download | linux-5f652bb2eb3eb38f97194ce5c41da1fa12e914b8.tar.xz linux-5f652bb2eb3eb38f97194ce5c41da1fa12e914b8.zip | |
gro_cells: gro_cells_receive now return error code
so that the caller can update stats accordingly, if needed
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/gro_cells.h')
| -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 */ |