diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2007-10-24 00:07:32 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-24 00:27:55 -0400 |
commit | c2636b4d9e8ab8d16b9e2bf0f0744bb8418d4026 (patch) | |
tree | 4db39ee9b93871385d72e776bec2e640166e3b34 /net/ipv6 | |
parent | 0ffdd581497286e8af529b0b39770c01eab15b30 (diff) |
[NET]: Treat the sign of the result of skb_headroom() consistently
In some places, the result of skb_headroom() is compared to an unsigned
integer, and in others, the result is compared to a signed integer. Make
the comparisons consistent and correct.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_output.c | 2 | ||||
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 | ||||
-rw-r--r-- | net/ipv6/sit.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 13565dfb1b45..653fc0a8235b 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -171,7 +171,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, | |||
171 | u32 mtu; | 171 | u32 mtu; |
172 | 172 | ||
173 | if (opt) { | 173 | if (opt) { |
174 | int head_room; | 174 | unsigned int head_room; |
175 | 175 | ||
176 | /* First: exthdrs may take lots of space (~8K for now) | 176 | /* First: exthdrs may take lots of space (~8K for now) |
177 | MAX_HEADER is not enough. | 177 | MAX_HEADER is not enough. |
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 2320cc27ff9e..5383b33db8ca 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -838,7 +838,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb, | |||
838 | struct dst_entry *dst; | 838 | struct dst_entry *dst; |
839 | struct net_device *tdev; | 839 | struct net_device *tdev; |
840 | int mtu; | 840 | int mtu; |
841 | int max_headroom = sizeof(struct ipv6hdr); | 841 | unsigned int max_headroom = sizeof(struct ipv6hdr); |
842 | u8 proto; | 842 | u8 proto; |
843 | int err = -1; | 843 | int err = -1; |
844 | int pkt_len; | 844 | int pkt_len; |
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 466657a9a8bd..71433d29d884 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -430,7 +430,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
430 | struct rtable *rt; /* Route to the other host */ | 430 | struct rtable *rt; /* Route to the other host */ |
431 | struct net_device *tdev; /* Device to other host */ | 431 | struct net_device *tdev; /* Device to other host */ |
432 | struct iphdr *iph; /* Our new IP header */ | 432 | struct iphdr *iph; /* Our new IP header */ |
433 | int max_headroom; /* The extra header space needed */ | 433 | unsigned int max_headroom; /* The extra header space needed */ |
434 | __be32 dst = tiph->daddr; | 434 | __be32 dst = tiph->daddr; |
435 | int mtu; | 435 | int mtu; |
436 | struct in6_addr *addr6; | 436 | struct in6_addr *addr6; |