diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2011-07-20 04:54:46 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-07-21 13:47:58 -0700 |
| commit | cc0e40700656b09d93b062ef6c818aa45429d09a (patch) | |
| tree | e9501fb2576086a2bb932b8db872276e29340450 /drivers/net/bonding/bond_ipv6.c | |
| parent | staging: et131x: remove unused prototype et131x_vlan_rx_register (diff) | |
| download | linux-dev-cc0e40700656b09d93b062ef6c818aa45429d09a.tar.xz linux-dev-cc0e40700656b09d93b062ef6c818aa45429d09a.zip | |
bonding: do vlan cleanup
Now when all devices are cleaned up, bond can be cleaned up as well
- remove bond->vlgrp
- remove bond_vlan_rx_register
- substitute necessary occurences of vlan_group_get_device
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_ipv6.c')
| -rw-r--r-- | drivers/net/bonding/bond_ipv6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c index 84fbd4ebd778..027a0ee7d85b 100644 --- a/drivers/net/bonding/bond_ipv6.c +++ b/drivers/net/bonding/bond_ipv6.c @@ -183,10 +183,10 @@ static int bond_inet6addr_event(struct notifier_block *this, } list_for_each_entry(vlan, &bond->vlan_list, vlan_list) { - if (!bond->vlgrp) - continue; - vlan_dev = vlan_group_get_device(bond->vlgrp, - vlan->vlan_id); + rcu_read_lock(); + vlan_dev = __vlan_find_dev_deep(bond->dev, + vlan->vlan_id); + rcu_read_unlock(); if (vlan_dev == event_dev) { switch (event) { case NETDEV_UP: |