lkml.org 
[lkml]   [2015]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 121/164] tcp: call sk_mark_napi_id() on the child, not the listener
    Date
    3.19.8-ckt11 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eric Dumazet <edumazet@google.com>

    commit 38cb52455c2c3e8b5751350a3fb32e43e82e129a upstream.

    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: 3d97379a67486 ("tcp: move sk_mark_napi_id() at the right place")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/ipv4/tcp_ipv4.c | 2 +-
    net/ipv6/tcp_ipv6.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
    index 982347e..4441dd9 100644
    --- a/net/ipv4/tcp_ipv4.c
    +++ b/net/ipv4/tcp_ipv4.c
    @@ -1456,7 +1456,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;
    diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
    index fb41d5c..5cf4d0a 100644
    --- a/net/ipv6/tcp_ipv6.c
    +++ b/net/ipv6/tcp_ipv6.c
    @@ -1326,7 +1326,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)
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-12-02 18:41    [W:4.191 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site