diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2009-08-09 10:12:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-14 01:43:31 +0200 |
| commit | e651f03afe833326faa0abe55948c1c6cfd0b8ac (patch) | |
| tree | 77058921e3842568e885f23b7b6829c628a0051b /net/ipv6/ip6_output.c | |
| parent | net: skb ftracer - Add actual ftrace code to kernel (v3) (diff) | |
| download | linux-e651f03afe833326faa0abe55948c1c6cfd0b8ac.tar.xz linux-e651f03afe833326faa0abe55948c1c6cfd0b8ac.zip | |
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>
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 93beee944657..6ad5aadf81ad 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -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); |