Merge branch 'so_incoming_cpu'
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 Nov 2014 18:00:11 +0000 (13:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Nov 2014 18:00:11 +0000 (13:00 -0500)
commitb00394c007269183d9f539fa87e65892ac2006e2
treee3c81c868a7c14ca2bac7efd69b6b21e25c355d4
parent2e1af7d74f4f7b4d4c1b0fbf5da3b5f92d9c332f
parent2c8c56e15df3d4c2af3d656e44feb18789f75837
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>