diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-12 11:26:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-11 01:49:02 +0200 |
| commit | 890d52d3f1e28888c4122e120426588f5ad63d37 (patch) | |
| tree | c082ca5fd5e00e033cb22067c927e19a00160beb | |
| parent | [XFRM]: xfrm audit calls (diff) | |
| download | linux-890d52d3f1e28888c4122e120426588f5ad63d37.tar.xz linux-890d52d3f1e28888c4122e120426588f5ad63d37.zip | |
[ATALK]: In notifier handlers convert the void pointer to a netdevice
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 <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/appletalk/aarp.c | 7 | ||||
| -rw-r--r-- | net/appletalk/ddp.c | 4 |
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) 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/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) 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; } |