diff --git a/[refs] b/[refs] index 4c321cc12e2d..90770b2fb610 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 699a411451a32cc111410f44f172b265f6d679c8 +refs/heads/master: e3876605450979fe52a1a03e7eb78a89bf59e76a diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index f15a3ffff635..ab935778ce81 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1744,6 +1744,7 @@ static int process_backlog(struct net_device *backlog_dev, int *budget) struct softnet_data *queue = &__get_cpu_var(softnet_data); unsigned long start_time = jiffies; + backlog_dev->weight = weight_p; for (;;) { struct sk_buff *skb; struct net_device *dev;