From a17616a5776284b9c8174d2077bbfa13324e341d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 15 Jun 2012 20:01:57 -0700
Subject: [PATCH] --- yaml --- r: 314277 b: refs/heads/master c:
 42ae66c80d94645e8f74080c7f344596d6f19cd5 h: refs/heads/master i:   314275:
 717ebb4ae597594903a44fe3a587df8439a702c5 v: v3

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

diff --git a/[refs] b/[refs]
index 0664f25329b1..70dad671ee01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e52b33bd50faa866bc3e6e97e68438bc5e52251
+refs/heads/master: 42ae66c80d94645e8f74080c7f344596d6f19cd5
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index c7ccc36ba63e..1c279fe2c9b4 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1065,8 +1065,8 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
 	}
 }
 
-void ip6_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
-		     int oif, __be32 mark)
+void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
+		     int oif, u32 mark)
 {
 	const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data;
 	struct dst_entry *dst;