summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller2012-06-16 05:01:57 +0200
committerDavid S. Miller2012-06-16 05:01:57 +0200
commit42ae66c80d94645e8f74080c7f344596d6f19cd5 (patch)
treea60af9f1e0fe532bd4404ecb301830ffb378db56
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadkernel-qcow2-linux-42ae66c80d94645e8f74080c7f344596d6f19cd5.tar.gz
kernel-qcow2-linux-42ae66c80d94645e8f74080c7f344596d6f19cd5.tar.xz
kernel-qcow2-linux-42ae66c80d94645e8f74080c7f344596d6f19cd5.zip
ipv6: Fix types of ip6_update_pmtu().
The mtu should be a __be32, not the mark. Reported-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/route.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index c7ccc36ba63e..1c279fe2c9b4 100644
--- a/net/ipv6/route.c
+++ b/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;