diff options
author | Patrick McHardy <kaber@trash.net> | 2007-07-14 18:52:56 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-07-14 18:52:56 -0700 |
commit | 6c78dcbd47a68a7d25d2bee7a6c74b9136cb5fde (patch) | |
tree | 21e4a2ea3eb7ed87ce525c59bb8c4d23d8c84589 /include/linux/if_vlan.h | |
parent | a0a400d79e3dd7843e7e81baa3ef2957bdc292d0 (diff) | |
download | op-kernel-dev-6c78dcbd47a68a7d25d2bee7a6c74b9136cb5fde.zip op-kernel-dev-6c78dcbd47a68a7d25d2bee7a6c74b9136cb5fde.tar.gz |
[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.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 61a57dc..7f71df4 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 */ |