Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus

[~andy/linux] / net / can / raw.c

diff --git a/net/can/raw.c b/net/can/raw.c
index 1085e65f848eab9a3a634ad16b37d70bd80830b5..641e1c895123ac114330635c43d0b2ed778c2ae7 100644 (file)
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -239,9 +239,9 @@ static int raw_enable_allfilters(struct net_device *dev, struct sock *sk)
 }
 
 static int raw_notifier(struct notifier_block *nb,
-                       unsigned long msg, void *data)
+                       unsigned long msg, void *ptr)
 {
-       struct net_device *dev = (struct net_device *)data;
+       struct net_device *dev = netdev_notifier_info_to_dev(ptr);
        struct raw_sock *ro = container_of(nb, struct raw_sock, notifier);
        struct sock *sk = &ro->sk;