Skip to content

Commit

Permalink
[ATALK]: In notifier handlers convert the void pointer to a netdevice
Browse files Browse the repository at this point in the history
This slightly improves code safety and clarity.

Later network namespace patches touch this code so this is a
preliminary cleanup.

Signed-off-by: Eric W. Biederman <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
ebiederm authored and David S. Miller committed Oct 10, 2007
1 parent ab5f5e8 commit 890d52d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 4 additions & 3 deletions net/appletalk/aarp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion net/appletalk/ddp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 890d52d

Please sign in to comment.