diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 05:27:19 +0300 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 05:27:19 +0300 |
commit | 39c853ebfe169f187a760b34f9cbf54751bfce00 (patch) | |
tree | 2a5a741d0cff7d4f90998b31b32ff80cfccd0369 /security/security.c | |
parent | fdc81f45e9f57858da6351836507fbcf1b7583ee (diff) | |
parent | 01e97e6517053d7c0b9af5248e944a9209909cf5 (diff) | |
download | linux-39c853ebfe169f187a760b34f9cbf54751bfce00.tar.xz |
Merge branch 'for-davem' into for-next
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/security/security.c b/security/security.c index ed890c6d31c5..730ac65a5737 100644 --- a/security/security.c +++ b/security/security.c @@ -1359,11 +1359,6 @@ int security_tun_dev_open(void *security) } EXPORT_SYMBOL(security_tun_dev_open); -void security_skb_owned_by(struct sk_buff *skb, struct sock *sk) -{ - security_ops->skb_owned_by(skb, sk); -} - #endif /* CONFIG_SECURITY_NETWORK */ #ifdef CONFIG_SECURITY_NETWORK_XFRM |