From: Oren Laadan <orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org>
To: "Serge E. Hallyn" <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Cc: Linux Containers <containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org>
Subject: Re: [PATCH 1/1] skb->tail can be offset
Date: Tue, 16 Feb 2010 05:02:13 -0500 [thread overview]
Message-ID: <4B7A6D25.3070705@cs.columbia.edu> (raw)
In-Reply-To: <20100215221214.GA21108-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Nice catch -- applied.
Serge E. Hallyn wrote:
> Needed for socket c/r on 64-bit arches.
>
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
> net/checkpoint.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/checkpoint.c b/net/checkpoint.c
> index c6b6341..ee13050 100644
> --- a/net/checkpoint.c
> +++ b/net/checkpoint.c
> @@ -97,19 +97,19 @@ static void sock_record_header_info(struct sk_buff *skb,
> h->mac_len = skb->mac_len;
> h->skb_len = skb->len;
> h->hdr_len = skb->data - skb->head;
> - h->lin_len = ((unsigned long)skb->tail - (unsigned long)skb->head);
> h->frg_len = skb->data_len;
> -
> h->data_offset = (skb->data - skb->head);
>
> #ifdef NET_SKBUFF_DATA_USES_OFFSET
> h->transport_header = skb->transport_header;
> h->network_header = skb->network_header;
> h->mac_header = skb->mac_header;
> + h->lin_len = (unsigned long) skb->tail;
> #else
> h->transport_header = skb->transport_header - skb->head;
> h->network_header = skb->network_header - skb->head;
> h->mac_header = skb->mac_header - skb->head;
> + h->lin_len = ((unsigned long) skb->tail - (unsigned long) skb->head);
> #endif
>
> memcpy(h->cb, skb->cb, sizeof(skb->cb));
prev parent reply other threads:[~2010-02-16 10:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-15 22:12 [PATCH 1/1] skb->tail can be offset Serge E. Hallyn
[not found] ` <20100215221214.GA21108-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-02-16 10:02 ` Oren Laadan [this message]
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=4B7A6D25.3070705@cs.columbia.edu \
--to=orenl-eqauephvms7envbuuze7ea@public.gmane.org \
--cc=containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org \
--cc=serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox