diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:27:19 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:27:19 -0400 |
| commit | 39c853ebfe169f187a760b34f9cbf54751bfce00 (patch) | |
| tree | 2a5a741d0cff7d4f90998b31b32ff80cfccd0369 /security/security.c | |
| parent | fdc81f45e9f57858da6351836507fbcf1b7583ee (diff) | |
| parent | 01e97e6517053d7c0b9af5248e944a9209909cf5 (diff) | |
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) | |||
| 1359 | } | 1359 | } |
| 1360 | EXPORT_SYMBOL(security_tun_dev_open); | 1360 | EXPORT_SYMBOL(security_tun_dev_open); |
| 1361 | 1361 | ||
| 1362 | void security_skb_owned_by(struct sk_buff *skb, struct sock *sk) | ||
| 1363 | { | ||
| 1364 | security_ops->skb_owned_by(skb, sk); | ||
| 1365 | } | ||
| 1366 | |||
| 1367 | #endif /* CONFIG_SECURITY_NETWORK */ | 1362 | #endif /* CONFIG_SECURITY_NETWORK */ |
| 1368 | 1363 | ||
| 1369 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 1364 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |