diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-06-30 01:45:27 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-06-30 01:45:27 +0300 |
| commit | b6df00789e2831fff7a2c65aa7164b2a4dcbe599 (patch) | |
| tree | a94cbeeca3f0ae2fffed008cb287c02dbee4dceb /net/core/dev.c | |
| parent | 3f8ad50a9e43b6a59070e6c9c5eec79626f81095 (diff) | |
| parent | a118ff661889ecee3ca90f8125bad8fb5bbc07d5 (diff) | |
| download | linux-b6df00789e2831fff7a2c65aa7164b2a4dcbe599.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index d609366da95c..316b4032317e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5304,9 +5304,9 @@ another_round: if (static_branch_unlikely(&generic_xdp_needed_key)) { int ret2; - preempt_disable(); + migrate_disable(); ret2 = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog), skb); - preempt_enable(); + migrate_enable(); if (ret2 != XDP_PASS) { ret = NET_RX_DROP; |