diff options
| author | Petr Vorel | 2018-11-12 11:59:12 +0100 |
|---|---|---|
| committer | John Johansen | 2019-02-01 13:12:57 +0100 |
| commit | a1a02062ad466052a34a8c4323143ccf9726eb52 (patch) | |
| tree | 415a53e262e76721ce6e0e5077fa310ea2252a40 /security | |
| parent | Linux 5.0-rc4 (diff) | |
| download | kernel-qcow2-linux-a1a02062ad466052a34a8c4323143ccf9726eb52.tar.gz kernel-qcow2-linux-a1a02062ad466052a34a8c4323143ccf9726eb52.tar.xz kernel-qcow2-linux-a1a02062ad466052a34a8c4323143ccf9726eb52.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')
| -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 2c010874329f..8db1731d046a 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1599,12 +1599,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[] = { { |