2 files changed, 4 insertions, 2 deletions

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 9c7d7621466b..8893598a4124 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1429,6 +1429,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
                 struct dst_entry *dst = sk->sk_rx_dst;
 
                 sock_rps_save_rxhash(sk, skb);
+                sk_mark_napi_id(sk, skb);
                 if (dst) {
                         if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif ||
                             dst->ops->check(dst, 0) == NULL) {
@@ -1450,6 +1451,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);
                         if (tcp_child_process(sk, nsk, skb)) {
                                 rsk = nsk;
                                 goto reset;
@@ -1661,7 +1663,6 @@ process:
         if (sk_filter(sk, skb))
                 goto discard_and_relse;
 
-        sk_mark_napi_id(sk, skb);
         skb->dev = NULL;
 
         bh_lock_sock_nested(sk);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index ace29b60813c..fd8e50b380e7 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1293,6 +1293,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
                 struct dst_entry *dst = sk->sk_rx_dst;
 
                 sock_rps_save_rxhash(sk, skb);
+                sk_mark_napi_id(sk, skb);
                 if (dst) {
                         if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif ||
                             dst->ops->check(dst, np->rx_dst_cookie) == NULL) {
@@ -1322,6 +1323,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);
                         if (tcp_child_process(sk, nsk, skb))
                                 goto reset;
                         if (opt_skb)
@@ -1454,7 +1456,6 @@ process:
         if (sk_filter(sk, skb))
                 goto discard_and_relse;
 
-        sk_mark_napi_id(sk, skb);
         skb->dev = NULL;
 
         bh_lock_sock_nested(sk);