mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-06 06:21:31 +00:00
net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool
inet_proto_csum_replace4,2,16 take a pseudohdr argument which indicates the checksum field carries a pseudo header. This argument should be a boolean instead of an int. Signed-off-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2536862311
commit
4b048d6d9d
18 changed files with 38 additions and 36 deletions
|
@ -284,14 +284,14 @@ static void update_ip_l4_checksum(struct sk_buff *skb, struct iphdr *nh,
|
|||
if (nh->protocol == IPPROTO_TCP) {
|
||||
if (likely(transport_len >= sizeof(struct tcphdr)))
|
||||
inet_proto_csum_replace4(&tcp_hdr(skb)->check, skb,
|
||||
addr, new_addr, 1);
|
||||
addr, new_addr, true);
|
||||
} else if (nh->protocol == IPPROTO_UDP) {
|
||||
if (likely(transport_len >= sizeof(struct udphdr))) {
|
||||
struct udphdr *uh = udp_hdr(skb);
|
||||
|
||||
if (uh->check || skb->ip_summed == CHECKSUM_PARTIAL) {
|
||||
inet_proto_csum_replace4(&uh->check, skb,
|
||||
addr, new_addr, 1);
|
||||
addr, new_addr, true);
|
||||
if (!uh->check)
|
||||
uh->check = CSUM_MANGLED_0;
|
||||
}
|
||||
|
@ -316,14 +316,14 @@ static void update_ipv6_checksum(struct sk_buff *skb, u8 l4_proto,
|
|||
if (l4_proto == NEXTHDR_TCP) {
|
||||
if (likely(transport_len >= sizeof(struct tcphdr)))
|
||||
inet_proto_csum_replace16(&tcp_hdr(skb)->check, skb,
|
||||
addr, new_addr, 1);
|
||||
addr, new_addr, true);
|
||||
} else if (l4_proto == NEXTHDR_UDP) {
|
||||
if (likely(transport_len >= sizeof(struct udphdr))) {
|
||||
struct udphdr *uh = udp_hdr(skb);
|
||||
|
||||
if (uh->check || skb->ip_summed == CHECKSUM_PARTIAL) {
|
||||
inet_proto_csum_replace16(&uh->check, skb,
|
||||
addr, new_addr, 1);
|
||||
addr, new_addr, true);
|
||||
if (!uh->check)
|
||||
uh->check = CSUM_MANGLED_0;
|
||||
}
|
||||
|
@ -331,7 +331,7 @@ static void update_ipv6_checksum(struct sk_buff *skb, u8 l4_proto,
|
|||
} else if (l4_proto == NEXTHDR_ICMP) {
|
||||
if (likely(transport_len >= sizeof(struct icmp6hdr)))
|
||||
inet_proto_csum_replace16(&icmp6_hdr(skb)->icmp6_cksum,
|
||||
skb, addr, new_addr, 1);
|
||||
skb, addr, new_addr, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -498,7 +498,7 @@ static int set_ipv6(struct sk_buff *skb, struct sw_flow_key *flow_key,
|
|||
static void set_tp_port(struct sk_buff *skb, __be16 *port,
|
||||
__be16 new_port, __sum16 *check)
|
||||
{
|
||||
inet_proto_csum_replace2(check, skb, *port, new_port, 0);
|
||||
inet_proto_csum_replace2(check, skb, *port, new_port, false);
|
||||
*port = new_port;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue