Skip to content

Commit

Permalink
[IPV6]: Event type in addrconf_ifdown is mis-used.
Browse files Browse the repository at this point in the history
addrconf_ifdown is broken in respect to the usage of how
parameter. This function is called with (event != NETDEV_DOWN) and (2)
on the IPv6 stop.  It the latter case inet6_dev from loopback device
should be destroyed.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed Apr 3, 2008
1 parent af26818 commit 439e238
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions net/ipv6/addrconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2469,7 +2469,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
/* Step 1: remove reference to ipv6 device from parent device.
Do not dev_put!
*/
if (how == 1) {
if (how) {
idev->dead = 1;

/* protected by rtnl_lock */
Expand Down Expand Up @@ -2501,12 +2501,12 @@ static int addrconf_ifdown(struct net_device *dev, int how)
write_lock_bh(&idev->lock);

/* Step 3: clear flags for stateless addrconf */
if (how != 1)
if (!how)
idev->if_flags &= ~(IF_RS_SENT|IF_RA_RCVD|IF_READY);

/* Step 4: clear address list */
#ifdef CONFIG_IPV6_PRIVACY
if (how == 1 && del_timer(&idev->regen_timer))
if (how && del_timer(&idev->regen_timer))
in6_dev_put(idev);

/* clear tempaddr list */
Expand Down Expand Up @@ -2543,7 +2543,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)

/* Step 5: Discard multicast list */

if (how == 1)
if (how)
ipv6_mc_destroy_dev(idev);
else
ipv6_mc_down(idev);
Expand All @@ -2552,7 +2552,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)

/* Shot the device (if unregistered) */

if (how == 1) {
if (how) {
addrconf_sysctl_unregister(idev);
neigh_parms_release(&nd_tbl, idev->nd_parms);
neigh_ifdown(&nd_tbl, dev);
Expand Down

0 comments on commit 439e238

Please sign in to comment.