diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-11 21:00:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-11 21:00:11 +0300 |
| commit | b00394c007269183d9f539fa87e65892ac2006e2 (patch) | |
| tree | e3c81c868a7c14ca2bac7efd69b6b21e25c355d4 /net/sctp/ulpqueue.c | |
| parent | 2e1af7d74f4f7b4d4c1b0fbf5da3b5f92d9c332f (diff) | |
| parent | 2c8c56e15df3d4c2af3d656e44feb18789f75837 (diff) | |
| download | linux-b00394c007269183d9f539fa87e65892ac2006e2.tar.xz | |
Merge branch 'so_incoming_cpu'
Eric Dumazet says:
====================
net: SO_INCOMING_CPU support
SO_INCOMING_CPU socket option (read by getsockopt()) provides
an alternative to RPS/RFS for high performance servers using
multi queues NIC.
TCP should use sk_mark_napi_id() for established sockets only.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/ulpqueue.c')
| -rw-r--r-- | net/sctp/ulpqueue.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index d49dc2ed30ad..ce469d648ffb 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c @@ -205,9 +205,10 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event) if (sock_flag(sk, SOCK_DEAD) || (sk->sk_shutdown & RCV_SHUTDOWN)) goto out_free; - if (!sctp_ulpevent_is_notification(event)) + if (!sctp_ulpevent_is_notification(event)) { sk_mark_napi_id(sk, skb); - + sk_incoming_cpu_update(sk); + } /* Check if the user wishes to receive this event. */ if (!sctp_ulpevent_is_enabled(event, &sctp_sk(sk)->subscribe)) goto out_free; |