diff options
-rw-r--r-- | include/linux/netdevice.h | 2 | ||||
-rw-r--r-- | net/core/dev.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 96964fb7478b..cf89ce677e41 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -792,7 +792,7 @@ extern void free_netdev(struct net_device *dev); | |||
792 | extern void synchronize_net(void); | 792 | extern void synchronize_net(void); |
793 | extern int register_netdevice_notifier(struct notifier_block *nb); | 793 | extern int register_netdevice_notifier(struct notifier_block *nb); |
794 | extern int unregister_netdevice_notifier(struct notifier_block *nb); | 794 | extern int unregister_netdevice_notifier(struct notifier_block *nb); |
795 | extern int call_netdevice_notifiers(unsigned long val, void *v); | 795 | extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev); |
796 | extern struct net_device *dev_get_by_index(struct net *net, int ifindex); | 796 | extern struct net_device *dev_get_by_index(struct net *net, int ifindex); |
797 | extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); | 797 | extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); |
798 | extern int dev_restart(struct net_device *dev); | 798 | extern int dev_restart(struct net_device *dev); |
diff --git a/net/core/dev.c b/net/core/dev.c index e9a6d93a194f..b517d36e653e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1206,9 +1206,9 @@ int unregister_netdevice_notifier(struct notifier_block *nb) | |||
1206 | * are as for raw_notifier_call_chain(). | 1206 | * are as for raw_notifier_call_chain(). |
1207 | */ | 1207 | */ |
1208 | 1208 | ||
1209 | int call_netdevice_notifiers(unsigned long val, void *v) | 1209 | int call_netdevice_notifiers(unsigned long val, struct net_device *dev) |
1210 | { | 1210 | { |
1211 | return raw_notifier_call_chain(&netdev_chain, val, v); | 1211 | return raw_notifier_call_chain(&netdev_chain, val, dev); |
1212 | } | 1212 | } |
1213 | 1213 | ||
1214 | /* When > 0 there are consumers of rx skb time stamps */ | 1214 | /* When > 0 there are consumers of rx skb time stamps */ |