git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xfrm: Reinject transport-mode packets through tasklet
[pandora-kernel.git]
/
net
/
ipv4
/
devinet.c
diff --git
a/net/ipv4/devinet.c
b/net/ipv4/devinet.c
index
65f01dc
..
757bee7
100644
(file)
--- a/
net/ipv4/devinet.c
+++ b/
net/ipv4/devinet.c
@@
-258,7
+258,7
@@
static struct in_device *inetdev_init(struct net_device *dev)
ip_mc_up(in_dev);
/* we can receive as soon as ip_ptr is set -- do this last */
ip_mc_up(in_dev);
/* we can receive as soon as ip_ptr is set -- do this last */
-
RCU_INIT_POINTER
(dev->ip_ptr, in_dev);
+
rcu_assign_pointer
(dev->ip_ptr, in_dev);
out:
return in_dev;
out_kfree:
out:
return in_dev;
out_kfree:
@@
-326,6
+326,9
@@
static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,
ASSERT_RTNL();
ASSERT_RTNL();
+ if (in_dev->dead)
+ goto no_promotions;
+
/* 1. Deleting primary ifaddr forces deletion all secondaries
* unless alias promotion is set
**/
/* 1. Deleting primary ifaddr forces deletion all secondaries
* unless alias promotion is set
**/
@@
-372,6
+375,7
@@
static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,
fib_del_ifaddr(ifa, ifa1);
}
fib_del_ifaddr(ifa, ifa1);
}
+no_promotions:
/* 2. Unlink it */
*ifap = ifa1->ifa_next;
/* 2. Unlink it */
*ifap = ifa1->ifa_next;