]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: socionext: fix xdp_result initialization in netsec_process_rx
authorLorenzo Bianconi <lorenzo@kernel.org>
Sat, 25 Jan 2020 11:48:51 +0000 (12:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 1 Feb 2020 09:32:58 +0000 (09:32 +0000)
[ Upstream commit 02758cb6dac31a2b4bd9e535cffbe718acd46404 ]

Fix xdp_result initialization in netsec_process_rx in order to not
increase rx counters if there is no bpf program attached to the xdp hook
and napi_gro_receive returns GRO_DROP

Fixes: ba2b232108d3c ("net: netsec: add XDP support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/socionext/netsec.c

index 0e12a9856aea79882db25719f134d695d0bc0f99..56c0e643f4300be13c068e96fefb3c424d37d73c 100644 (file)
@@ -942,8 +942,8 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget)
                struct netsec_de *de = dring->vaddr + (DESC_SZ * idx);
                struct netsec_desc *desc = &dring->desc[idx];
                struct page *page = virt_to_page(desc->addr);
+               u32 xdp_result = NETSEC_XDP_PASS;
                struct sk_buff *skb = NULL;
-               u32 xdp_result = XDP_PASS;
                u16 pkt_len, desc_len;
                dma_addr_t dma_handle;
                struct xdp_buff xdp;