diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-06-01 20:18:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-06-01 20:18:52 -0300 |
| commit | 4e4c168746908b7dc88bb1fe46b7308164fb145c (patch) | |
| tree | f69dfba3f28b1359e0bae7a238c7c4b1684c8878 /linux/drivers/media/dvb/dvb-core | |
| parent | 8391e4a8e4148d94a9eaecf3fbd242d959ace901 (diff) | |
| download | mediapointer-dvb-s2-4e4c168746908b7dc88bb1fe46b7308164fb145c.tar.gz mediapointer-dvb-s2-4e4c168746908b7dc88bb1fe46b7308164fb145c.tar.bz2 | |
Reverting last changeset. There were two different patches merged together
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index e180cdf53..408c3b638 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -1171,7 +1171,7 @@ static void wq_set_multicast_list (struct work_struct *work) dvb_net_feed_stop(dev); priv->rx_mode = RX_MODE_UNI; -#ifdef OLD_XMIT_LOCK /* Kernels equal or lower than 2.6.17 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) spin_lock_bh(&dev->xmit_lock); #else netif_tx_lock_bh(dev); @@ -1200,7 +1200,7 @@ static void wq_set_multicast_list (struct work_struct *work) } } -#ifdef OLD_XMIT_LOCK /* Kernels equal or lower than 2.6.17 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) spin_unlock_bh(&dev->xmit_lock); #else netif_tx_unlock_bh(dev); |