From df7b40260461588a8b20c5b1dbe82e5b1b8caa8d Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Wed, 12 Sep 2007 11:26:59 +0200 Subject: [PATCH] --- yaml --- r: 66377 b: refs/heads/master c: 890d52d3f1e28888c4122e120426588f5ad63d37 h: refs/heads/master i: 66375: 0217f8e18eedb713a3a98a97d542f6ca02aaa03b v: v3 --- [refs] | 2 +- trunk/net/appletalk/aarp.c | 7 ++++--- trunk/net/appletalk/ddp.c | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 79e06470dc21..9a11bdf38887 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab5f5e8b144e4c804ef3aa1ce08a9ca9f01187ce +refs/heads/master: 890d52d3f1e28888c4122e120426588f5ad63d37 diff --git a/trunk/net/appletalk/aarp.c b/trunk/net/appletalk/aarp.c index 3d1655f98388..80b54148460f 100644 --- a/trunk/net/appletalk/aarp.c +++ b/trunk/net/appletalk/aarp.c @@ -330,15 +330,16 @@ static void aarp_expire_timeout(unsigned long unused) static int aarp_device_event(struct notifier_block *this, unsigned long event, void *ptr) { + struct net_device *dev = ptr; int ct; if (event == NETDEV_DOWN) { write_lock_bh(&aarp_lock); for (ct = 0; ct < AARP_HASH_SIZE; ct++) { - __aarp_expire_device(&resolved[ct], ptr); - __aarp_expire_device(&unresolved[ct], ptr); - __aarp_expire_device(&proxies[ct], ptr); + __aarp_expire_device(&resolved[ct], dev); + __aarp_expire_device(&unresolved[ct], dev); + __aarp_expire_device(&proxies[ct], dev); } write_unlock_bh(&aarp_lock); diff --git a/trunk/net/appletalk/ddp.c b/trunk/net/appletalk/ddp.c index fbdfb1224ae1..594b59739546 100644 --- a/trunk/net/appletalk/ddp.c +++ b/trunk/net/appletalk/ddp.c @@ -647,9 +647,11 @@ static inline void atalk_dev_down(struct net_device *dev) static int ddp_device_event(struct notifier_block *this, unsigned long event, void *ptr) { + struct net_device *dev = ptr; + if (event == NETDEV_DOWN) /* Discard any use of this */ - atalk_dev_down(ptr); + atalk_dev_down(dev); return NOTIFY_DONE; }