aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/appletalk/aarp.c7
-rw-r--r--net/appletalk/ddp.c4
2 files changed, 7 insertions, 4 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 3d1655f98388..80b54148460f 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -330,15 +330,16 @@ static void aarp_expire_timeout(unsigned long unused)
330static int aarp_device_event(struct notifier_block *this, unsigned long event, 330static int aarp_device_event(struct notifier_block *this, unsigned long event,
331 void *ptr) 331 void *ptr)
332{ 332{
333 struct net_device *dev = ptr;
333 int ct; 334 int ct;
334 335
335 if (event == NETDEV_DOWN) { 336 if (event == NETDEV_DOWN) {
336 write_lock_bh(&aarp_lock); 337 write_lock_bh(&aarp_lock);
337 338
338 for (ct = 0; ct < AARP_HASH_SIZE; ct++) { 339 for (ct = 0; ct < AARP_HASH_SIZE; ct++) {
339 __aarp_expire_device(&resolved[ct], ptr); 340 __aarp_expire_device(&resolved[ct], dev);
340 __aarp_expire_device(&unresolved[ct], ptr); 341 __aarp_expire_device(&unresolved[ct], dev);
341 __aarp_expire_device(&proxies[ct], ptr); 342 __aarp_expire_device(&proxies[ct], dev);
342 } 343 }
343 344
344 write_unlock_bh(&aarp_lock); 345 write_unlock_bh(&aarp_lock);
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index fbdfb1224ae1..594b59739546 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -647,9 +647,11 @@ static inline void atalk_dev_down(struct net_device *dev)
647static int ddp_device_event(struct notifier_block *this, unsigned long event, 647static int ddp_device_event(struct notifier_block *this, unsigned long event,
648 void *ptr) 648 void *ptr)
649{ 649{
650 struct net_device *dev = ptr;
651
650 if (event == NETDEV_DOWN) 652 if (event == NETDEV_DOWN)
651 /* Discard any use of this */ 653 /* Discard any use of this */
652 atalk_dev_down(ptr); 654 atalk_dev_down(dev);
653 655
654 return NOTIFY_DONE; 656 return NOTIFY_DONE;
655} 657}