From f66b270ceb31183ac05d121e827ccdf0a432bdd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 03:21:00 -0800
Subject: [PATCH] --- yaml --- r: 78770 b: refs/heads/master c:
 50eb431d6e98189eb40606fcd4d03ecd8e168afa h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/route.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 566dbd2e2276..8c021d2b2fc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1486cbd777316e55aa30aeb37e231ce618c29d2e
+refs/heads/master: 50eb431d6e98189eb40606fcd4d03ecd8e168afa
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 48c8d7cb9020..a429900d16aa 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1763,8 +1763,7 @@ int ipv6_route_ioctl(unsigned int cmd, void __user *arg)
  *	Drop the packet on the floor
  */
 
-static inline int ip6_pkt_drop(struct sk_buff *skb, int code,
-			       int ipstats_mib_noroutes)
+static int ip6_pkt_drop(struct sk_buff *skb, int code, int ipstats_mib_noroutes)
 {
 	int type;
 	switch (ipstats_mib_noroutes) {