diff options
author | Alexander Graf <agraf@suse.de> | 2013-08-29 00:41:59 +0200 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-08-29 00:41:59 +0200 |
commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /net/can/raw.c | |
parent | KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate() (diff) | |
parent | KVM: x86: Update symbolic exit codes (diff) | |
download | linux-dev-bf550fc93d9855872a95e69e4002256110d89858.tar.xz linux-dev-bf550fc93d9855872a95e69e4002256110d89858.zip |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Diffstat (limited to 'net/can/raw.c')
-rw-r--r-- | net/can/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index 1085e65f848e..641e1c895123 100644 --- 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; |