]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'xsk-improvements-to-RX-queue-check-and-replace'
authorDavid S. Miller <davem@davemloft.net>
Tue, 31 Jul 2018 16:48:22 +0000 (09:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Jul 2018 16:48:22 +0000 (09:48 -0700)
commited7ac999d4bee08aec231c365f44e06fd00e76d2
tree06fb904b95b6f0427a577120753713aa39050660
parent67374d635ee4de3e4d88da9f160597156b24e8a1
parent5b348ad1887159657766f0b096821ba27e300f3b
Merge branch 'xsk-improvements-to-RX-queue-check-and-replace'

Jakub Kicinski says:

====================
xsk: improvements to RX queue check and replace

First 3 patches of my recent RFC.  The first one make the check against
real_num_rx_queues slightly more reliable, while the latter two redefine
XDP_QUERY_XSK_UMEM slightly to disallow replacing UMEM in the driver at
the stack level.

I'm not sure where this lays on the bpf vs net trees scale, but there
should be no conflicts with either tree.
====================

Acked-by: Björn Töpel <bjorn.topel@intel.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>