From: Thomas Graf <tgraf@suug.ch>
Date: Thu, 13 Nov 2014 11:48:21 +0000 (+0100)
Subject: FOU: Fix no return statement warning for !CONFIG_NET_FOU_IP_TUNNELS
X-Git-Tag: v3.19-rc1~118^2~200
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=882288c05ede954e797baa623062f5ea06663ae1;p=linux-block.git

FOU: Fix no return statement warning for !CONFIG_NET_FOU_IP_TUNNELS

net/ipv4/fou.c: In function ‘ip_tunnel_encap_del_fou_ops’:
net/ipv4/fou.c:861:1: warning: no return statement in function returning non-void [-Wreturn-type]

Fixes: a8c5f90fb5 ("ip_tunnel: Ops registration for secondary encap (fou, gue)")
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index fe0907774ce8..b0b436b0692c 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -856,7 +856,7 @@ static int ip_tunnel_encap_add_fou_ops(void)
 	return 0;
 }
 
-static int ip_tunnel_encap_del_fou_ops(void)
+static void ip_tunnel_encap_del_fou_ops(void)
 {
 }