diff options
Diffstat (limited to 'net/ipv4/devinet.c')
-rw-r--r-- | net/ipv4/devinet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 2e667e2f90df..91d3d96805d0 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
@@ -138,8 +138,8 @@ void in_dev_finish_destroy(struct in_device *idev) | |||
138 | { | 138 | { |
139 | struct net_device *dev = idev->dev; | 139 | struct net_device *dev = idev->dev; |
140 | 140 | ||
141 | BUG_TRAP(!idev->ifa_list); | 141 | WARN_ON(idev->ifa_list); |
142 | BUG_TRAP(!idev->mc_list); | 142 | WARN_ON(idev->mc_list); |
143 | #ifdef NET_REFCNT_DEBUG | 143 | #ifdef NET_REFCNT_DEBUG |
144 | printk(KERN_DEBUG "in_dev_finish_destroy: %p=%s\n", | 144 | printk(KERN_DEBUG "in_dev_finish_destroy: %p=%s\n", |
145 | idev, dev ? dev->name : "NIL"); | 145 | idev, dev ? dev->name : "NIL"); |
@@ -399,7 +399,7 @@ static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa) | |||
399 | } | 399 | } |
400 | ipv4_devconf_setall(in_dev); | 400 | ipv4_devconf_setall(in_dev); |
401 | if (ifa->ifa_dev != in_dev) { | 401 | if (ifa->ifa_dev != in_dev) { |
402 | BUG_TRAP(!ifa->ifa_dev); | 402 | WARN_ON(ifa->ifa_dev); |
403 | in_dev_hold(in_dev); | 403 | in_dev_hold(in_dev); |
404 | ifa->ifa_dev = in_dev; | 404 | ifa->ifa_dev = in_dev; |
405 | } | 405 | } |