diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-07-11 19:45:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-07-11 19:45:24 -0700 |
| commit | 8c979c26a0f093c13290320edda799d8335e50ae (patch) | |
| tree | 3189e5568583a794aff9d014898ff9a74b79d7cc /include/linux | |
| parent | 71bffe556c59a7865bf0b1ecd94530f1e296cdb0 (diff) | |
| download | op-kernel-dev-8c979c26a0f093c13290320edda799d8335e50ae.zip op-kernel-dev-8c979c26a0f093c13290320edda799d8335e50ae.tar.gz | |
[VLAN]: Fix MAC address handling
The VLAN MAC address handling is broken in multiple ways. When the address
differs when setting it, the real device is put in promiscous mode twice,
but never taken out again. Additionally it doesn't resync when the real
device's address is changed and needlessly puts it in promiscous mode when
the vlan device is still down.
Fix by moving address handling to vlan_dev_open/vlan_dev_stop and properly
deal with address changes in the device notifier. Also switch to
dev_unicast_add (which needs the exact same handling).
Since the set_mac_address handler is identical to the generic ethernet one
with these changes, kill it and use ether_setup().
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_vlan.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index c791287..61a57dc 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -135,6 +135,7 @@ struct vlan_dev_info { 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 */ unsigned long cnt_inc_headroom_on_tx; /* How many times did we have to grow the skb on TX. */ unsigned long cnt_encap_on_xmit; /* How many times did we have to encapsulate the skb on TX. */ |
