From fc142f49cb5749c02d8e8703b2f8e5c0fe5422ba Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Sun, 16 Sep 2007 15:33:32 -0700 Subject: [PATCH] --- yaml --- r: 66602 b: refs/heads/master c: ad7379d49458a863c520a73a3c36441c572f850e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 2 +- trunk/net/core/dev.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9456baff0383..5a25132eb591 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22dd74950172dc8979576e2bef3b439f20ef0b05 +refs/heads/master: ad7379d49458a863c520a73a3c36441c572f850e diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 96964fb7478b..cf89ce677e41 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -792,7 +792,7 @@ extern void free_netdev(struct net_device *dev); extern void synchronize_net(void); extern int register_netdevice_notifier(struct notifier_block *nb); extern int unregister_netdevice_notifier(struct notifier_block *nb); -extern int call_netdevice_notifiers(unsigned long val, void *v); +extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev); extern struct net_device *dev_get_by_index(struct net *net, int ifindex); extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); extern int dev_restart(struct net_device *dev); diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index e9a6d93a194f..b517d36e653e 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1206,9 +1206,9 @@ int unregister_netdevice_notifier(struct notifier_block *nb) * are as for raw_notifier_call_chain(). */ -int call_netdevice_notifiers(unsigned long val, void *v) +int call_netdevice_notifiers(unsigned long val, struct net_device *dev) { - return raw_notifier_call_chain(&netdev_chain, val, v); + return raw_notifier_call_chain(&netdev_chain, val, dev); } /* When > 0 there are consumers of rx skb time stamps */