From: Jason Wang <jasowang@redhat.com>
To: roy.qing.li@gmail.com
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH net-next] xen-netfront: use skb_partial_csum_set() to simplify the codes
Date: Fri, 07 Jun 2013 11:05:29 +0800 [thread overview]
Message-ID: <51B14DF9.2060400@redhat.com> (raw)
In-Reply-To: <1370500519-2244-1-git-send-email-roy.qing.li@gmail.com>
On 06/06/2013 02:35 PM, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> use skb_partial_csum_set() to simplify the codes
>
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> ---
> drivers/net/xen-netfront.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
> index 62238a0..76a2236 100644
> --- a/drivers/net/xen-netfront.c
> +++ b/drivers/net/xen-netfront.c
> @@ -858,7 +858,6 @@ static RING_IDX xennet_fill_frags(struct netfront_info *np,
> static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
> {
> struct iphdr *iph;
> - unsigned char *th;
> int err = -EPROTO;
> int recalculate_partial_csum = 0;
>
> @@ -883,27 +882,27 @@ static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
> goto out;
>
> iph = (void *)skb->data;
> - th = skb->data + 4 * iph->ihl;
> - if (th >= skb_tail_pointer(skb))
> - goto out;
>
> - skb->csum_start = th - skb->head;
> switch (iph->protocol) {
> case IPPROTO_TCP:
> - skb->csum_offset = offsetof(struct tcphdr, check);
> + if (!skb_partial_csum_set(skb, 4 * iph->ihl,
> + offsetof(struct tcphdr, check)))
> + goto out;
>
> if (recalculate_partial_csum) {
> - struct tcphdr *tcph = (struct tcphdr *)th;
> + struct tcphdr *tcph = tcp_hdr(skb);
> tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
> skb->len - iph->ihl*4,
> IPPROTO_TCP, 0);
> }
> break;
> case IPPROTO_UDP:
> - skb->csum_offset = offsetof(struct udphdr, check);
> + if (!skb_partial_csum_set(skb, 4 * iph->ihl,
> + offsetof(struct udphdr, check)))
> + goto out;
>
> if (recalculate_partial_csum) {
> - struct udphdr *udph = (struct udphdr *)th;
> + struct udphdr *udph = udp_hdr(skb);
> udph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
> skb->len - iph->ihl*4,
> IPPROTO_UDP, 0);
> @@ -917,9 +916,6 @@ static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
> goto out;
> }
>
> - if ((th + skb->csum_offset + 2) > skb_tail_pointer(skb))
> - goto out;
> -
> err = 0;
>
> out:
Acked-by: Jason Wang <jasowang@redhat.com>
next prev parent reply other threads:[~2013-06-07 3:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-06 6:35 [PATCH net-next] xen-netfront: use skb_partial_csum_set() to simplify the codes roy.qing.li
2013-06-07 3:05 ` Jason Wang [this message]
2013-06-11 9:35 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51B14DF9.2060400@redhat.com \
--to=jasowang@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=roy.qing.li@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.