Commit 0e6af897 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller

net: qualcomm: rmnet: remove some local variables

In rmnet_map_ipv4_dl_csum_trailer(), remove the "csum_temp" and
"addend" local variables, and simplify a few lines of code.

Remove the "csum_temp", "csum_value", "ip6_hdr_csum", and "addend"
local variables in rmnet_map_ipv6_dl_csum_trailer(), and simplify a
few lines of code there as well.
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73a37860
...@@ -35,10 +35,9 @@ rmnet_map_ipv4_dl_csum_trailer(struct sk_buff *skb, ...@@ -35,10 +35,9 @@ rmnet_map_ipv4_dl_csum_trailer(struct sk_buff *skb,
{ {
struct iphdr *ip4h = (struct iphdr *)skb->data; struct iphdr *ip4h = (struct iphdr *)skb->data;
void *txporthdr = skb->data + ip4h->ihl * 4; void *txporthdr = skb->data + ip4h->ihl * 4;
__sum16 *csum_field, csum_temp, pseudo_csum; __sum16 *csum_field, pseudo_csum;
__sum16 ip_payload_csum; __sum16 ip_payload_csum;
u16 csum_value_final; __sum16 csum_value_final;
__be16 addend;
/* Computing the checksum over just the IPv4 header--including its /* Computing the checksum over just the IPv4 header--including its
* checksum field--should yield 0. If it doesn't, the IP header * checksum field--should yield 0. If it doesn't, the IP header
...@@ -83,14 +82,11 @@ rmnet_map_ipv4_dl_csum_trailer(struct sk_buff *skb, ...@@ -83,14 +82,11 @@ rmnet_map_ipv4_dl_csum_trailer(struct sk_buff *skb,
pseudo_csum = ~csum_tcpudp_magic(ip4h->saddr, ip4h->daddr, pseudo_csum = ~csum_tcpudp_magic(ip4h->saddr, ip4h->daddr,
ntohs(ip4h->tot_len) - ip4h->ihl * 4, ntohs(ip4h->tot_len) - ip4h->ihl * 4,
ip4h->protocol, 0); ip4h->protocol, 0);
addend = (__force __be16)pseudo_csum; pseudo_csum = csum16_add(ip_payload_csum, (__force __be16)pseudo_csum);
pseudo_csum = csum16_add(ip_payload_csum, addend);
addend = (__force __be16)*csum_field; csum_value_final = ~csum16_sub(pseudo_csum, (__force __be16)*csum_field);
csum_temp = ~csum16_sub(pseudo_csum, addend);
csum_value_final = (__force u16)csum_temp;
if (unlikely(csum_value_final == 0)) { if (unlikely(!csum_value_final)) {
switch (ip4h->protocol) { switch (ip4h->protocol) {
case IPPROTO_UDP: case IPPROTO_UDP:
/* RFC 768 - DL4 1's complement rule for UDP csum 0 */ /* RFC 768 - DL4 1's complement rule for UDP csum 0 */
...@@ -105,7 +101,7 @@ rmnet_map_ipv4_dl_csum_trailer(struct sk_buff *skb, ...@@ -105,7 +101,7 @@ rmnet_map_ipv4_dl_csum_trailer(struct sk_buff *skb,
} }
} }
if (csum_value_final == (__force u16)*csum_field) { if (csum_value_final == *csum_field) {
priv->stats.csum_ok++; priv->stats.csum_ok++;
return 0; return 0;
} else { } else {
...@@ -122,12 +118,10 @@ rmnet_map_ipv6_dl_csum_trailer(struct sk_buff *skb, ...@@ -122,12 +118,10 @@ rmnet_map_ipv6_dl_csum_trailer(struct sk_buff *skb,
{ {
struct ipv6hdr *ip6h = (struct ipv6hdr *)skb->data; struct ipv6hdr *ip6h = (struct ipv6hdr *)skb->data;
void *txporthdr = skb->data + sizeof(*ip6h); void *txporthdr = skb->data + sizeof(*ip6h);
__sum16 *csum_field, pseudo_csum, csum_temp; __sum16 *csum_field, pseudo_csum;
__be16 ip6_hdr_csum, addend;
__sum16 ip6_payload_csum; __sum16 ip6_payload_csum;
__be16 ip_header_csum; __be16 ip_header_csum;
u16 csum_value_final; __sum16 csum_value_final;
__be16 csum_value;
u32 length; u32 length;
/* Checksum offload is only supported for UDP and TCP protocols; /* Checksum offload is only supported for UDP and TCP protocols;
...@@ -145,23 +139,18 @@ rmnet_map_ipv6_dl_csum_trailer(struct sk_buff *skb, ...@@ -145,23 +139,18 @@ rmnet_map_ipv6_dl_csum_trailer(struct sk_buff *skb,
* of the IP header from the trailer checksum. We then add the * of the IP header from the trailer checksum. We then add the
* checksum computed over the pseudo header. * checksum computed over the pseudo header.
*/ */
csum_value = ~csum_trailer->csum_value;
ip_header_csum = (__force __be16)ip_fast_csum(ip6h, sizeof(*ip6h) / 4); ip_header_csum = (__force __be16)ip_fast_csum(ip6h, sizeof(*ip6h) / 4);
ip6_hdr_csum = (__force __be16)~ip_header_csum; ip6_payload_csum = csum16_sub((__force __sum16)~csum_trailer->csum_value,
ip6_payload_csum = csum16_sub((__force __sum16)csum_value, ~ip_header_csum);
ip6_hdr_csum);
length = (ip6h->nexthdr == IPPROTO_UDP) ? length = (ip6h->nexthdr == IPPROTO_UDP) ?
ntohs(((struct udphdr *)txporthdr)->len) : ntohs(((struct udphdr *)txporthdr)->len) :
ntohs(ip6h->payload_len); ntohs(ip6h->payload_len);
pseudo_csum = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, pseudo_csum = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
length, ip6h->nexthdr, 0); length, ip6h->nexthdr, 0);
addend = (__force __be16)pseudo_csum; pseudo_csum = csum16_add(ip6_payload_csum, (__force __be16)pseudo_csum);
pseudo_csum = csum16_add(ip6_payload_csum, addend);
addend = (__force __be16)*csum_field; csum_value_final = ~csum16_sub(pseudo_csum, (__force __be16)*csum_field);
csum_temp = ~csum16_sub(pseudo_csum, addend);
csum_value_final = (__force u16)csum_temp;
if (unlikely(csum_value_final == 0)) { if (unlikely(csum_value_final == 0)) {
switch (ip6h->nexthdr) { switch (ip6h->nexthdr) {
...@@ -180,7 +169,7 @@ rmnet_map_ipv6_dl_csum_trailer(struct sk_buff *skb, ...@@ -180,7 +169,7 @@ rmnet_map_ipv6_dl_csum_trailer(struct sk_buff *skb,
} }
} }
if (csum_value_final == (__force u16)*csum_field) { if (csum_value_final == *csum_field) {
priv->stats.csum_ok++; priv->stats.csum_ok++;
return 0; return 0;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment