aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/if_vlan.h
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-07-14 18:52:56 -0700
committerDavid S. Miller <davem@davemloft.net>2007-07-14 18:52:56 -0700
commit6c78dcbd47a68a7d25d2bee7a6c74b9136cb5fde (patch)
tree21e4a2ea3eb7ed87ce525c59bb8c4d23d8c84589 /include/linux/if_vlan.h
parent[NET]: dev_mcast: add multicast list synchronization helpers (diff)
downloadlinux-dev-6c78dcbd47a68a7d25d2bee7a6c74b9136cb5fde.tar.xz
linux-dev-6c78dcbd47a68a7d25d2bee7a6c74b9136cb5fde.zip
[VLAN]: Fix promiscous/allmulti synchronization races
The set_multicast_list function may be called without holding the rtnl mutex, resulting in races when changing the underlying device's promiscous and allmulti state. Use the change_rx_mode hook, which is always invoked under the rtnl. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_vlan.h')
-rw-r--r--include/linux/if_vlan.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 61a57dc2ac99..7f71df4c952f 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -132,8 +132,6 @@ struct vlan_dev_info {
* made, in order to feed the right changes down
* to the real hardware...
*/
- int old_allmulti; /* similar to above. */
- int old_promiscuity; /* similar to above. */
struct net_device *real_dev; /* the underlying device/interface */
unsigned char real_dev_addr[ETH_ALEN];
struct proc_dir_entry *dent; /* Holds the proc data */