adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VLAN]: Proc entry is not renamed when vlan device name changes.

Browse source 
This may lead to situations, when each of two proc entries produce
data for the other's device.

Looks like a BUG, so this patch is for net-2.6. It will not apply to
net-2.6.26 since dev->nd_net access is replaced with dev_net(dev)
one.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2008-04-02 00:08:01 -07:00 committed by David S. Miller
parent f32c5f2c38
commit 802fb176d8
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/8021q/vlan.c
View file

@ -374,17 +374,35 @@ static void vlan_sync_address(struct net_device *dev,
memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN); memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN);
} }
static void __vlan_device_event(struct net_device *dev, unsigned long event)
{
switch (event) {
case NETDEV_CHANGENAME:
vlan_proc_rem_dev(dev);
if (vlan_proc_add_dev(dev) < 0)
pr_warning("8021q: failed to change proc name for %s\n",
dev->name);
break;
}
}
static int vlan_device_event(struct notifier_block *unused, unsigned long event, static int vlan_device_event(struct notifier_block *unused, unsigned long event,
void *ptr) void *ptr)
{ {
struct net_device *dev = ptr; struct net_device *dev = ptr;
struct vlan_group *grp = __vlan_find_group(dev->ifindex); struct vlan_group *grp;
int i, flgs; int i, flgs;
struct net_device *vlandev; struct net_device *vlandev;
if (dev->nd_net != &init_net) if (dev->nd_net != &init_net)
return NOTIFY_DONE; return NOTIFY_DONE;
if (is_vlan_dev(dev)) {
__vlan_device_event(dev, event);
goto out;
}
grp = __vlan_find_group(dev->ifindex);
if (!grp) if (!grp)
goto out; goto out;

5
net/8021q/vlan.h
View file

@ -45,4 +45,9 @@ void vlan_netlink_fini(void);
extern struct rtnl_link_ops vlan_link_ops; extern struct rtnl_link_ops vlan_link_ops;
static inline int is_vlan_dev(struct net_device *dev)
{
return dev->priv_flags & IFF_802_1Q_VLAN;
}
#endif /* !(__BEN_VLAN_802_1Q_INC__) */ #endif /* !(__BEN_VLAN_802_1Q_INC__) */

5
net/8021q/vlanproc.c
View file

@ -210,11 +210,6 @@ int vlan_proc_rem_dev(struct net_device *vlandev)
* The following few functions build the content of /proc/net/vlan/config * The following few functions build the content of /proc/net/vlan/config
*/ */
static inline int is_vlan_dev(struct net_device *dev)
{
return dev->priv_flags & IFF_802_1Q_VLAN;
}
/* start read of /proc/net/vlan/config */ /* start read of /proc/net/vlan/config */
static void *vlan_seq_start(struct seq_file *seq, loff_t *pos) static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(dev_base_lock) __acquires(dev_base_lock)