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) {