inet6: Conversion from u8 to int
This replaces assignments of the type "int on LHS" = "u8 on RHS" with simpler code. The LHS can express all of the unsigned right hand side values, hence the assigned value can not be negative. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
9ec04da748
commit
e651f03afe
@@ -194,7 +194,8 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
|
||||
struct ipv6hdr *hdr;
|
||||
u8 proto = fl->proto;
|
||||
int seg_len = skb->len;
|
||||
int hlimit, tclass;
|
||||
int hlimit = -1;
|
||||
int tclass = 0;
|
||||
u32 mtu;
|
||||
|
||||
if (opt) {
|
||||
@@ -237,19 +238,13 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
|
||||
/*
|
||||
* Fill in the IPv6 header
|
||||
*/
|
||||
|
||||
hlimit = -1;
|
||||
if (np)
|
||||
if (np) {
|
||||
tclass = np->tclass;
|
||||
hlimit = np->hop_limit;
|
||||
}
|
||||
if (hlimit < 0)
|
||||
hlimit = ip6_dst_hoplimit(dst);
|
||||
|
||||
tclass = -1;
|
||||
if (np)
|
||||
tclass = np->tclass;
|
||||
if (tclass < 0)
|
||||
tclass = 0;
|
||||
|
||||
*(__be32 *)hdr = htonl(0x60000000 | (tclass << 20)) | fl->fl6_flowlabel;
|
||||
|
||||
hdr->payload_len = htons(seg_len);
|
||||
|
Reference in New Issue
Block a user