diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 12:53:50 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 12:53:50 -0300 |
commit | 132006918b3990079761954e1c88e46ac2b52e45 (patch) | |
tree | 503e593949cfd4c64e71f77fdb9e9d9c51418842 /linux/drivers/media/dvb | |
parent | 9ac332abfea493cd10a9c804cebb81f324071b82 (diff) | |
download | mediapointer-dvb-s2-132006918b3990079761954e1c88e46ac2b52e45.tar.gz mediapointer-dvb-s2-132006918b3990079761954e1c88e46ac2b52e45.tar.bz2 |
backport commit b9e40857682ecfc5bcd0356a23ff409883ffb982
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Author: David S. Miller <davem@davemloft.net>
Date: Tue Jul 15 00:15:08 2008 -0700
netdev: Do not use TX lock to protect address lists.
Now that we have a specific lock to protect the network
device unicast and multicast lists, remove extraneous
grabs of the TX lock in cases where the code only needs
address list protection.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index 3c0106f65..e0d60cdc4 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -1165,7 +1165,11 @@ static void wq_set_multicast_list (struct work_struct *work) #ifdef OLD_XMIT_LOCK /* Kernels equal or lower than 2.6.17 */ spin_lock_bh(&dev->xmit_lock); #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26) netif_tx_lock_bh(dev); +#else + netif_addr_lock_bh(dev); +#endif #endif if (dev->flags & IFF_PROMISC) { @@ -1194,7 +1198,11 @@ static void wq_set_multicast_list (struct work_struct *work) #ifdef OLD_XMIT_LOCK /* Kernels equal or lower than 2.6.17 */ spin_unlock_bh(&dev->xmit_lock); #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26) netif_tx_unlock_bh(dev); +#else + netif_addr_unlock_bh(dev); +#endif #endif dvb_net_feed_start(dev); } |