git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
dvb-core
/
dvb_net.c
diff --git
a/drivers/media/dvb/dvb-core/dvb_net.c
b/drivers/media/dvb/dvb-core/dvb_net.c
index
2f0f358
..
9fd8752
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dvb_net.c
+++ b/
drivers/media/dvb/dvb-core/dvb_net.c
@@
-1052,7
+1052,7
@@
static void wq_set_multicast_list (void *data)
dvb_net_feed_stop(dev);
priv->rx_mode = RX_MODE_UNI;
dvb_net_feed_stop(dev);
priv->rx_mode = RX_MODE_UNI;
-
spin_lock_bh(&dev->xmit_lock
);
+
netif_tx_lock_bh(dev
);
if (dev->flags & IFF_PROMISC) {
dprintk("%s: promiscuous mode\n", dev->name);
if (dev->flags & IFF_PROMISC) {
dprintk("%s: promiscuous mode\n", dev->name);
@@
-1077,7
+1077,7
@@
static void wq_set_multicast_list (void *data)
}
}
}
}
-
spin_unlock_bh(&dev->xmit_lock
);
+
netif_tx_unlock_bh(dev
);
dvb_net_feed_start(dev);
}
dvb_net_feed_start(dev);
}