diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-17 12:44:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-17 12:44:40 +1000 |
| commit | c134d52434dca8be3145c182887af60b723882a4 (patch) | |
| tree | dc44017795845e32f6466c433f4bd9b7daad30e0 /security | |
| parent | c19d6b23ffe944a666999f7200a2af8352c209b6 (diff) | |
| parent | 2e0c9e7911465b29daf85f7de97949004bf7b31c (diff) | |
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/xen-netback/netback.c
net/batman-adv/bat_iv_ogm.c
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/netif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/netif.c b/security/selinux/netif.c index 47a49d1a6f6a..694e9e43855f 100644 --- a/security/selinux/netif.c +++ b/security/selinux/netif.c @@ -264,7 +264,7 @@ static int sel_netif_avc_callback(u32 event) static int sel_netif_netdev_notifier_handler(struct notifier_block *this, unsigned long event, void *ptr) { - struct net_device *dev = ptr; + struct net_device *dev = netdev_notifier_info_to_dev(ptr); if (dev_net(dev) != &init_net) return NOTIFY_DONE; |