projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RPC/RDMA: adhere to protocol for unpadded client trailing write chunks.
[linux-2.6-block.git]
/
net
/
atm
/
clip.c
diff --git
a/net/atm/clip.c
b/net/atm/clip.c
index 2ab1e36098fd2b1f2fa059c2eebf6e150b10f8e8..5b5b96344ce60fba334fb291a8fe21393aa8bb26 100644
(file)
--- a/
net/atm/clip.c
+++ b/
net/atm/clip.c
@@
-612,7
+612,7
@@
static int clip_device_event(struct notifier_block *this, unsigned long event,
{
struct net_device *dev = arg;
{
struct net_device *dev = arg;
- if (
dev->nd_net != &init_net
)
+ if (
!net_eq(dev_net(dev), &init_net)
)
return NOTIFY_DONE;
if (event == NETDEV_UNREGISTER) {
return NOTIFY_DONE;
if (event == NETDEV_UNREGISTER) {
@@
-648,10
+648,6
@@
static int clip_inet_event(struct notifier_block *this, unsigned long event,
struct in_device *in_dev;
in_dev = ((struct in_ifaddr *)ifa)->ifa_dev;
struct in_device *in_dev;
in_dev = ((struct in_ifaddr *)ifa)->ifa_dev;
- if (!in_dev || !in_dev->dev) {
- printk(KERN_WARNING "clip_inet_event: no device\n");
- return NOTIFY_DONE;
- }
/*
* Transitions are of the down-change-up type, so it's sufficient to
* handle the change on up.
/*
* Transitions are of the down-change-up type, so it's sufficient to
* handle the change on up.