From: David S. Miller Date: Fri, 4 Mar 2011 05:27:42 +0000 (-0800) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a0e9ae1bd788bc19adc4d4ae08c98b233697402;p=linux-beck.git Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bnx2x/bnx2x.h --- 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 diff --cc MAINTAINERS index 0d83e5898233,6d1814857a58..75760e796ae3 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1692,8 -1693,14 +1693,15 @@@ M: Andy Whitcroft + L: xiyoulinuxkernelgroup@googlegroups.com + L: linux-kernel@zh-kernel.org (moderated for non-subscribers) + S: Maintained + F: Documentation/zh_CN/ + CISCO VIC ETHERNET NIC DRIVER +M: Christian Benvenuti M: Vasanthy Kolluri M: Roopa Prabhu M: David Wang diff --cc net/netfilter/ipvs/ip_vs_ctl.c index c73b0c831a2d,ba98e1308f3c..d69ec26b6bd4 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@@ -769,12 -808,12 +769,12 @@@ __ip_vs_update_dest(struct ip_vs_servic dest->u_threshold = udest->u_threshold; dest->l_threshold = udest->l_threshold; - spin_lock(&dest->dst_lock); + spin_lock_bh(&dest->dst_lock); ip_vs_dst_reset(dest); - spin_unlock(&dest->dst_lock); + spin_unlock_bh(&dest->dst_lock); if (add) - ip_vs_new_estimator(&dest->stats); + ip_vs_new_estimator(svc->net, &dest->stats); write_lock_bh(&__ip_vs_svc_lock); diff --cc net/sched/sch_generic.c index a854cab03f1e,1bc698039ae2..c84b65920d1b --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@@ -844,8 -839,8 +844,9 @@@ void dev_deactivate(struct net_device * list_add(&dev->unreg_list, &single); dev_deactivate_many(&single); + list_del(&single); } +EXPORT_SYMBOL(dev_deactivate); static void dev_init_scheduler_queue(struct net_device *dev, struct netdev_queue *dev_queue,