196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Wed, 24 Jun 2020 16:06:03 -0600
|
|
Subject: [PATCH] wireguard: receive: account for napi_gro_receive never
|
|
returning GRO_DROP
|
|
|
|
commit df08126e3833e9dca19e2407db5f5860a7c194fb upstream.
|
|
|
|
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: e7096c131e51 ("net: WireGuard secure network tunnel")
|
|
Fixes: 6570bc79c0df ("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>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
drivers/net/wireguard/receive.c | 10 ++--------
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/wireguard/receive.c
|
|
+++ b/drivers/net/wireguard/receive.c
|
|
@@ -414,14 +414,8 @@ static void wg_packet_consume_data_done(
|
|
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:
|