lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: always pass struct netdev_notifier_info to netdevice notifiers

Browse Source 
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:
Cong Wang
2013-05-29 11:30:50 +08:00
committed by David S. Miller
parent 06ecf24bdf
commit 75538c2b85
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netdevice.h
View File

@@ -1609,6 +1609,12 @@ struct netdev_notifier_change_info {
unsigned int flags_changed; 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 * static inline struct net_device *
netdev_notifier_info_to_dev(const struct netdev_notifier_info *info) netdev_notifier_info_to_dev(const struct netdev_notifier_info *info)
{ {

4
net/atm/clip.c
View File

@@ -575,6 +575,7 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
void *ifa) void *ifa)
{ {
struct in_device *in_dev; struct in_device *in_dev;
struct netdev_notifier_info info;
in_dev = ((struct in_ifaddr *)ifa)->ifa_dev; 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) if (event != NETDEV_UP)
return NOTIFY_DONE; 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 = { static struct notifier_block clip_dev_notifier = {

6
net/core/dev.c
View File

@@ -1391,12 +1391,6 @@ void dev_disable_lro(struct net_device *dev)
} }
EXPORT_SYMBOL(dev_disable_lro); 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, static int call_netdevice_notifier(struct notifier_block *nb, unsigned long val,
struct net_device *dev) struct net_device *dev)
{ {

5
net/ipv4/netfilter/ipt_MASQUERADE.c
View File

@@ -129,7 +129,10 @@ static int masq_inet_event(struct notifier_block *this,
void *ptr) void *ptr)
{ {
struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev; 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 = { static struct notifier_block masq_dev_notifier = {

7
net/ipv6/addrconf.c
View File

@@ -4645,13 +4645,16 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write,
static void dev_disable_change(struct inet6_dev *idev) static void dev_disable_change(struct inet6_dev *idev)
{ {
struct netdev_notifier_info info;
if (!idev || !idev->dev) if (!idev || !idev->dev)
return; return;
netdev_notifier_info_init(&info, idev->dev);
if (idev->cnf.disable_ipv6) if (idev->cnf.disable_ipv6)
addrconf_notify(NULL, NETDEV_DOWN, idev->dev); addrconf_notify(NULL, NETDEV_DOWN, &info);
else else
addrconf_notify(NULL, NETDEV_UP, idev->dev); addrconf_notify(NULL, NETDEV_UP, &info);
} }
static void addrconf_disable_change(struct net *net, __s32 newf) static void addrconf_disable_change(struct net *net, __s32 newf)

4
net/ipv6/netfilter/ip6t_MASQUERADE.c
View File

@@ -89,8 +89,10 @@ static int masq_inet_event(struct notifier_block *this,
unsigned long event, void *ptr) unsigned long event, void *ptr)
{ {
struct inet6_ifaddr *ifa = 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 = { static struct notifier_block masq_inet_notifier = {