From 8b584409a874a2ad9b940cc4825f87184a98d7d6 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 25 Jun 2006 17:50:09 -0300 Subject: Spin lock on network changed on 2.6.18 From: Mauro Carvalho Chehab kernel-sync Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/dvb-core/dvb_net.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'linux/drivers/media/dvb/dvb-core') diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index a1989e336..eb666e1e0 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -1137,7 +1137,11 @@ static void wq_set_multicast_list (void *data) dvb_net_feed_stop(dev); priv->rx_mode = RX_MODE_UNI; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) spin_lock_bh(&dev->xmit_lock); +#else + netif_tx_lock_bh(dev); +#endif if (dev->flags & IFF_PROMISC) { dprintk("%s: promiscuous mode\n", dev->name); @@ -1162,7 +1166,11 @@ static void wq_set_multicast_list (void *data) } } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) spin_unlock_bh(&dev->xmit_lock); +#else + netif_tx_unlock_bh(dev); +#endif dvb_net_feed_start(dev); } -- cgit v1.2.3