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;