]> 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)
commit6293e4d674d0f6cb01cd19307dd477988776c521
tree06fb904b95b6f0427a577120753713aa39050660
parent39c64d8c876622e766dd2112baf81151dd82da02
parent84c6b86875e01a08a0daa6fdd4a01b36bf0bf0b2
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>