From 3a1e5c75f5221f1841a6fd203298683b750857d7 Mon Sep 17 00:00:00 2001
From: Octavian Purdila <opurdila@ixiacom.com>
Date: Wed, 13 Jan 2010 18:10:36 -0800
Subject: [PATCH] --- yaml --- r: 179267 b: refs/heads/master c:
 cd65c3c7d1081290b7365897c2290a84aa967d4d h: refs/heads/master i:   179265:
 29a90170e65f3075213c0b31bca380f8486275ae   179263:
 189aa4086965491c14cb1b7b0fd3018f2832ea03 v: v3

---
 [refs]                 | 2 +-
 trunk/include/net/ip.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index efc986af167b..0a0155cb7990 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2570a4f5428bcdb1077622342181755741e7fa60
+refs/heads/master: cd65c3c7d1081290b7365897c2290a84aa967d4d
diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h
index d9a0e74d8923..fb63371c07a8 100644
--- a/trunk/include/net/ip.h
+++ b/trunk/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;
 }