Commit 38cb5245 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: call sk_mark_napi_id() on the child, not the listener 



This fixes a typo : We want to store the NAPI id on child socket.
Presumably nobody really uses busy polling, on short lived flows.

Fixes: 3d97379a ("tcp: move sk_mark_napi_id() at the right place")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d2675f1

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 


		if (nsk != sk) {

			sock_rps_save_rxhash(nsk, skb);

			sk_mark_napi_id(sk, skb);

			sk_mark_napi_id(nsk, skb);

			if (tcp_child_process(sk, nsk, skb)) {

				rsk = nsk;

				goto reset;

net/ipv6/tcp_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
		 */

		if (nsk != sk) {

			sock_rps_save_rxhash(nsk, skb);

			sk_mark_napi_id(sk, skb);

			sk_mark_napi_id(nsk, skb);

			if (tcp_child_process(sk, nsk, skb))

				goto reset;

			if (opt_skb)

CRA Git | Maintained and supported by SUSTech CRA and CCSE