apparmor: Fix warning about unused function apparmor_ipv6_postroute

pevik · jrjohansen · commit a1a02062ad46 · 2019-02-01T04:12:57.000-08:00
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 &lt;Golden_Miller83@protonmail.ch&gt;
Tested-by: Jordan Glover &lt;Golden_Miller83@protonmail.ch&gt;
Signed-off-by: Petr Vorel &lt;pvorel@suse.cz&gt;
Signed-off-by: John Johansen &lt;john.johansen@canonical.com&gt;
diff --git 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[] = {
 	{

Original file line number	Diff line number	Diff line change
`@@ -1599,12 +1599,14 @@ static unsigned int apparmor_ipv4_postroute(void *priv,`
`1599`	`1599`	`return apparmor_ip_postroute(priv, skb, state);`
`1600`	`1600`	`}`
`1601`	`1601`
	`1602`	`+#if IS_ENABLED(CONFIG_IPV6)`
`1602`	`1603`	`static unsigned int apparmor_ipv6_postroute(void *priv,`
`1603`	`1604`	`struct sk_buff *skb,`
`1604`	`1605`	`const struct nf_hook_state *state)`
`1605`	`1606`	`{`
`1606`	`1607`	`return apparmor_ip_postroute(priv, skb, state);`
`1607`	`1608`	`}`
	`1609`	`+#endif`
`1608`	`1610`
`1609`	`1611`	`static const struct nf_hook_ops apparmor_nf_ops[] = {`
`1610`	`1612`	`{`