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/smack | |
| parent | fdc81f45e9f57858da6351836507fbcf1b7583ee (diff) | |
| parent | 01e97e6517053d7c0b9af5248e944a9209909cf5 (diff) | |
Merge branch 'for-davem' into for-next
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack_netfilter.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/security/smack/smack_netfilter.c b/security/smack/smack_netfilter.c index c952632afb0d..a455cfc9ec1f 100644 --- a/security/smack/smack_netfilter.c +++ b/security/smack/smack_netfilter.c | |||
| @@ -23,9 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | static unsigned int smack_ipv6_output(const struct nf_hook_ops *ops, | 24 | static unsigned int smack_ipv6_output(const struct nf_hook_ops *ops, |
| 25 | struct sk_buff *skb, | 25 | struct sk_buff *skb, |
| 26 | const struct net_device *in, | 26 | const struct nf_hook_state *state) |
| 27 | const struct net_device *out, | ||
| 28 | int (*okfn)(struct sk_buff *)) | ||
| 29 | { | 27 | { |
| 30 | struct socket_smack *ssp; | 28 | struct socket_smack *ssp; |
| 31 | struct smack_known *skp; | 29 | struct smack_known *skp; |
| @@ -42,9 +40,7 @@ static unsigned int smack_ipv6_output(const struct nf_hook_ops *ops, | |||
| 42 | 40 | ||
| 43 | static unsigned int smack_ipv4_output(const struct nf_hook_ops *ops, | 41 | static unsigned int smack_ipv4_output(const struct nf_hook_ops *ops, |
| 44 | struct sk_buff *skb, | 42 | struct sk_buff *skb, |
| 45 | const struct net_device *in, | 43 | const struct nf_hook_state *state) |
| 46 | const struct net_device *out, | ||
| 47 | int (*okfn)(struct sk_buff *)) | ||
| 48 | { | 44 | { |
| 49 | struct socket_smack *ssp; | 45 | struct socket_smack *ssp; |
| 50 | struct smack_known *skp; | 46 | struct smack_known *skp; |