]> git.baikalelectronics.ru Git - kernel.git/commitdiff
wireguard: receive: account for napi_gro_receive never returning GRO_DROP
authorJason A. Donenfeld <Jason@zx2c4.com>
Wed, 24 Jun 2020 22:06:03 +0000 (16:06 -0600)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 Jun 2020 23:16:21 +0000 (16:16 -0700)
The napi_gro_receive function no longer returns GRO_DROP ever, making
handling GRO_DROP dead code. This commit removes that dead code.
Further, it's not even clear that device drivers have any business in
taking action after passing off received packets; that's arguably out of
their hands.

Fixes: 4dff5496e367 ("net: WireGuard secure network tunnel")
Fixes: 3240c95a722e ("net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireguard/receive.c

index 91438144e4f7a7909f33690e15ca39103cab6061..9b2ab6fc91cdd9bb1cb60e235cab33be5438dd6f 100644 (file)
@@ -414,14 +414,8 @@ static void wg_packet_consume_data_done(struct wg_peer *peer,
        if (unlikely(routed_peer != peer))
                goto dishonest_packet_peer;
 
-       if (unlikely(napi_gro_receive(&peer->napi, skb) == GRO_DROP)) {
-               ++dev->stats.rx_dropped;
-               net_dbg_ratelimited("%s: Failed to give packet to userspace from peer %llu (%pISpfsc)\n",
-                                   dev->name, peer->internal_id,
-                                   &peer->endpoint.addr);
-       } else {
-               update_rx_stats(peer, message_data_len(len_before_trim));
-       }
+       napi_gro_receive(&peer->napi, skb);
+       update_rx_stats(peer, message_data_len(len_before_trim));
        return;
 
 dishonest_packet_peer: