diff options
| author | Petr Vorel <pvorel@suse.cz> | 2018-11-12 11:59:12 +0100 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2018-11-14 20:42:18 +0100 |
| commit | 43aa09fee2f08c8d90a4f35d4c8c711362afcaee (patch) | |
| tree | f375cb7b3f62f3dca92dc5c43ff1814d97f5c35a /security/apparmor | |
| parent | Merge tag 'for-linus-20181102' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-43aa09fee2f08c8d90a4f35d4c8c711362afcaee.tar.xz linux-43aa09fee2f08c8d90a4f35d4c8c711362afcaee.zip | |
apparmor: Fix warning about unused function apparmor_ipv6_postroute
when compiled without CONFIG_IPV6:
security/apparmor/lsm.c:1601:21: warning: ‘apparmor_ipv6_postroute’ defined but not used [-Wunused-function]
static unsigned int apparmor_ipv6_postroute(void *priv,
^~~~~~~~~~~~~~~~~~~~~~~
Reported-by: Jordan Glover <Golden_Miller83@protonmail.ch>
Tested-by: Jordan Glover <Golden_Miller83@protonmail.ch>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor')
| -rw-r--r-- | security/apparmor/lsm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 42446a216f3b..7d1eeb084968 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1598,12 +1598,14 @@ static unsigned int apparmor_ipv4_postroute(void *priv, return apparmor_ip_postroute(priv, skb, state); } +#if IS_ENABLED(CONFIG_IPV6) static unsigned int apparmor_ipv6_postroute(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { return apparmor_ip_postroute(priv, skb, state); } +#endif static const struct nf_hook_ops apparmor_nf_ops[] = { { |