[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>
This commit is contained in:
parent
0ffdd58149
commit
c2636b4d9e
9 changed files with 10 additions and 10 deletions
|
@ -674,7 +674,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
struct rtable *rt; /* Route to the other host */
|
||||
struct net_device *tdev; /* Device to other host */
|
||||
struct iphdr *iph; /* Our new IP header */
|
||||
int max_headroom; /* The extra header space needed */
|
||||
unsigned int max_headroom; /* The extra header space needed */
|
||||
int gre_hlen;
|
||||
__be32 dst;
|
||||
int mtu;
|
||||
|
|
|
@ -161,7 +161,7 @@ static inline int ip_finish_output2(struct sk_buff *skb)
|
|||
struct dst_entry *dst = skb->dst;
|
||||
struct rtable *rt = (struct rtable *)dst;
|
||||
struct net_device *dev = dst->dev;
|
||||
int hh_len = LL_RESERVED_SPACE(dev);
|
||||
unsigned int hh_len = LL_RESERVED_SPACE(dev);
|
||||
|
||||
if (rt->rt_type == RTN_MULTICAST)
|
||||
IP_INC_STATS(IPSTATS_MIB_OUTMCASTPKTS);
|
||||
|
|
|
@ -515,7 +515,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
struct net_device *tdev; /* Device to other host */
|
||||
struct iphdr *old_iph = ip_hdr(skb);
|
||||
struct iphdr *iph; /* Our new IP header */
|
||||
int max_headroom; /* The extra header space needed */
|
||||
unsigned int max_headroom; /* The extra header space needed */
|
||||
__be32 dst = tiph->daddr;
|
||||
int mtu;
|
||||
|
||||
|
|
|
@ -325,7 +325,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
|
|||
__be16 df = old_iph->frag_off;
|
||||
sk_buff_data_t old_transport_header = skb->transport_header;
|
||||
struct iphdr *iph; /* Our new IP header */
|
||||
int max_headroom; /* The extra header space needed */
|
||||
unsigned int max_headroom; /* The extra header space needed */
|
||||
int mtu;
|
||||
|
||||
EnterFunction(10);
|
||||
|
|
|
@ -3909,7 +3909,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,
|
|||
|
||||
while (before(start, end)) {
|
||||
struct sk_buff *nskb;
|
||||
int header = skb_headroom(skb);
|
||||
unsigned int header = skb_headroom(skb);
|
||||
int copy = SKB_MAX_ORDER(header, 0);
|
||||
|
||||
/* Too big header? This can happen with IPv6. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue