Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index d609366da95c71cca75f36166fe6ae0f9610c0aa..316b4032317e0bf75a1d0941a74d563b4d0d6814 100644 (file)
--- 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;