From: Octavian Purdila <opurdila@ixiacom.com>
Date: Thu, 14 Jan 2010 02:10:36 +0000 (-0800)
Subject: net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n
X-Git-Tag: v2.6.33-rc5~71^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd65c3c7d1081290b7365897c2290a84aa967d4d;p=thirdparty%2Fkernel%2Flinux.git

net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n

Fixed build errors introduced by commit 7ad6848c (ip: fix mc_loop
checks for tunnels with multicast outer addresses)

Signed-off-by: Octavian Purdila <opurdila@ixiacom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/ip.h b/include/net/ip.h
index d9a0e74d89237..fb63371c07a8e 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -338,7 +338,7 @@ static inline int sk_mc_loop(struct sock *sk)
 		return inet6_sk(sk)->mc_loop;
 #endif
 	}
-	__WARN();
+	WARN_ON(1);
 	return 1;
 }