mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
net: always pass struct netdev_notifier_info to netdevice notifiers
commit 351638e7de
(net: pass info struct via netdevice notifier)
breaks booting of my KVM guest, this is due to we still forget to pass
struct netdev_notifier_info in several places. This patch completes it.
Cc: Jiri Pirko <jiri@resnulli.us>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
06ecf24bdf
commit
75538c2b85
@ -1609,6 +1609,12 @@ struct netdev_notifier_change_info {
|
||||
unsigned int flags_changed;
|
||||
};
|
||||
|
||||
static inline void netdev_notifier_info_init(struct netdev_notifier_info *info,
|
||||
struct net_device *dev)
|
||||
{
|
||||
info->dev = dev;
|
||||
}
|
||||
|
||||
static inline struct net_device *
|
||||
netdev_notifier_info_to_dev(const struct netdev_notifier_info *info)
|
||||
{
|
||||
|
@ -575,6 +575,7 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
|
||||
void *ifa)
|
||||
{
|
||||
struct in_device *in_dev;
|
||||
struct netdev_notifier_info info;
|
||||
|
||||
in_dev = ((struct in_ifaddr *)ifa)->ifa_dev;
|
||||
/*
|
||||
@ -583,7 +584,8 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
|
||||
*/
|
||||
if (event != NETDEV_UP)
|
||||
return NOTIFY_DONE;
|
||||
return clip_device_event(this, NETDEV_CHANGE, in_dev->dev);
|
||||
netdev_notifier_info_init(&info, in_dev->dev);
|
||||
return clip_device_event(this, NETDEV_CHANGE, &info);
|
||||
}
|
||||
|
||||
static struct notifier_block clip_dev_notifier = {
|
||||
|
@ -1391,12 +1391,6 @@ void dev_disable_lro(struct net_device *dev)
|
||||
}
|
||||
EXPORT_SYMBOL(dev_disable_lro);
|
||||
|
||||
static void netdev_notifier_info_init(struct netdev_notifier_info *info,
|
||||
struct net_device *dev)
|
||||
{
|
||||
info->dev = dev;
|
||||
}
|
||||
|
||||
static int call_netdevice_notifier(struct notifier_block *nb, unsigned long val,
|
||||
struct net_device *dev)
|
||||
{
|
||||
|
@ -129,7 +129,10 @@ static int masq_inet_event(struct notifier_block *this,
|
||||
void *ptr)
|
||||
{
|
||||
struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
|
||||
return masq_device_event(this, event, dev);
|
||||
struct netdev_notifier_info info;
|
||||
|
||||
netdev_notifier_info_init(&info, dev);
|
||||
return masq_device_event(this, event, &info);
|
||||
}
|
||||
|
||||
static struct notifier_block masq_dev_notifier = {
|
||||
|
@ -4645,13 +4645,16 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write,
|
||||
|
||||
static void dev_disable_change(struct inet6_dev *idev)
|
||||
{
|
||||
struct netdev_notifier_info info;
|
||||
|
||||
if (!idev || !idev->dev)
|
||||
return;
|
||||
|
||||
netdev_notifier_info_init(&info, idev->dev);
|
||||
if (idev->cnf.disable_ipv6)
|
||||
addrconf_notify(NULL, NETDEV_DOWN, idev->dev);
|
||||
addrconf_notify(NULL, NETDEV_DOWN, &info);
|
||||
else
|
||||
addrconf_notify(NULL, NETDEV_UP, idev->dev);
|
||||
addrconf_notify(NULL, NETDEV_UP, &info);
|
||||
}
|
||||
|
||||
static void addrconf_disable_change(struct net *net, __s32 newf)
|
||||
|
@ -89,8 +89,10 @@ static int masq_inet_event(struct notifier_block *this,
|
||||
unsigned long event, void *ptr)
|
||||
{
|
||||
struct inet6_ifaddr *ifa = ptr;
|
||||
struct netdev_notifier_info info;
|
||||
|
||||
return masq_device_event(this, event, ifa->idev->dev);
|
||||
netdev_notifier_info_init(&info, ifa->idev->dev);
|
||||
return masq_device_event(this, event, &info);
|
||||
}
|
||||
|
||||
static struct notifier_block masq_inet_notifier = {
|
||||
|
Loading…
Reference in New Issue
Block a user