diff options
author | Cong Wang <amwang@redhat.com> | 2013-05-28 23:30:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-29 00:58:54 -0400 |
commit | 75538c2b85cf22eb9af6adfaf26ed7219025adeb (patch) | |
tree | f6791d0d285ff7e716fe8f225c4648e62a34421e /net/atm | |
parent | 06ecf24bdf2b7afc6c8fd13de6dba2a96dd331b6 (diff) |
net: always pass struct netdev_notifier_info to netdevice notifiers
commit 351638e7deeed2ec8ce451b53d3 (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>
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/clip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index cce241eb01d9..8215f7cb170b 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
@@ -575,6 +575,7 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event, | |||
575 | void *ifa) | 575 | void *ifa) |
576 | { | 576 | { |
577 | struct in_device *in_dev; | 577 | struct in_device *in_dev; |
578 | struct netdev_notifier_info info; | ||
578 | 579 | ||
579 | in_dev = ((struct in_ifaddr *)ifa)->ifa_dev; | 580 | in_dev = ((struct in_ifaddr *)ifa)->ifa_dev; |
580 | /* | 581 | /* |
@@ -583,7 +584,8 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event, | |||
583 | */ | 584 | */ |
584 | if (event != NETDEV_UP) | 585 | if (event != NETDEV_UP) |
585 | return NOTIFY_DONE; | 586 | return NOTIFY_DONE; |
586 | return clip_device_event(this, NETDEV_CHANGE, in_dev->dev); | 587 | netdev_notifier_info_init(&info, in_dev->dev); |
588 | return clip_device_event(this, NETDEV_CHANGE, &info); | ||
587 | } | 589 | } |
588 | 590 | ||
589 | static struct notifier_block clip_dev_notifier = { | 591 | static struct notifier_block clip_dev_notifier = { |