On Tue, 2003-04-01 at 09:51, David S. Miller wrote: > Please fix this stuff. Here is an update with the correct style. diff -urN -X dontdiff linux-2.5/include/linux/netdevice.h linux-2.5-netsync/include/linux/netdevice.h --- linux-2.5/include/linux/netdevice.h 2003-03-31 10:45:58.000000000 -0800 +++ linux-2.5-netsync/include/linux/netdevice.h 2003-03-31 13:42:39.000000000 -0800 @@ -486,6 +486,7 @@ extern int dev_queue_xmit(struct sk_buff *skb); extern int register_netdevice(struct net_device *dev); extern int unregister_netdevice(struct net_device *dev); +extern void synchronize_net(void); extern int register_netdevice_notifier(struct notifier_block *nb); extern int unregister_netdevice_notifier(struct notifier_block *nb); extern int call_netdevice_notifiers(unsigned long val, void *v); diff -urN -X dontdiff linux-2.5/net/core/dev.c linux-2.5-netsync/net/core/dev.c --- linux-2.5/net/core/dev.c 2003-03-31 10:46:01.000000000 -0800 +++ linux-2.5-netsync/net/core/dev.c 2003-04-01 10:29:35.000000000 -0800 @@ -2646,6 +2646,13 @@ return 0; } +/* Synchronize with packet receive processing. */ +void synchronize_net(void) +{ + br_write_lock_bh(BR_NETPROTO_LOCK); + br_write_unlock_bh(BR_NETPROTO_LOCK); +} + /** * unregister_netdevice - remove device from the kernel * @dev: device @@ -2688,10 +2695,7 @@ return -ENODEV; } - /* Synchronize to net_rx_action. */ - br_write_lock_bh(BR_NETPROTO_LOCK); - br_write_unlock_bh(BR_NETPROTO_LOCK); - + synchronize_net(); #ifdef CONFIG_NET_FASTROUTE dev_clear_fastroute(dev); diff -urN -X dontdiff linux-2.5/net/netsyms.c linux-2.5-netsync/net/netsyms.c --- linux-2.5/net/netsyms.c 2003-03-31 10:46:00.000000000 -0800 +++ linux-2.5-netsync/net/netsyms.c 2003-03-31 13:42:41.000000000 -0800 @@ -548,6 +548,7 @@ EXPORT_SYMBOL(loopback_dev); EXPORT_SYMBOL(register_netdevice); EXPORT_SYMBOL(unregister_netdevice); +EXPORT_SYMBOL(synchronize_net); EXPORT_SYMBOL(netdev_state_change); EXPORT_SYMBOL(dev_new_index); EXPORT_SYMBOL(dev_get_by_flags); - : send the line "unsubscribe linux-net" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html