From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Networking <netdev@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Jesper Dangaard Brouer <brouer@redhat.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the net-next tree
Date: Tue, 21 Jul 2020 10:53:55 +0200 [thread overview]
Message-ID: <20200721085355.GA2315@lore-desk> (raw)
In-Reply-To: <20200721121630.5c06c492@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 993 bytes --]
[...]
> diff --cc include/net/xdp.h
> index d3005bef812f,5be0d4d65b94..000000000000
> --- a/include/net/xdp.h
> +++ b/include/net/xdp.h
> @@@ -104,15 -98,12 +104,21 @@@ struct xdp_frame
> struct net_device *dev_rx; /* used by cpumap */
> };
>
> +static inline struct skb_shared_info *
> +xdp_get_shared_info_from_frame(struct xdp_frame *frame)
> +{
> + void *data_hard_start = frame->data - frame->headroom - sizeof(*frame);
> +
> + return (struct skb_shared_info *)(data_hard_start + frame->frame_sz -
> + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));
> +}
> +
> + struct xdp_cpumap_stats {
> + unsigned int redirect;
> + unsigned int pass;
> + unsigned int drop;
> + };
Hi Stephen,
the fix is correct, thanks and sorry for the noise. I will point out possible
conflicts next time.
Regards,
Lorenzo
> +
> /* Clear kernel pointers in xdp_frame */
> static inline void xdp_scrub_frame(struct xdp_frame *frame)
> {
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2020-07-21 8:54 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 2:16 linux-next: manual merge of the bpf-next tree with the net-next tree Stephen Rothwell
2020-07-21 8:53 ` Lorenzo Bianconi [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-17 23:29 Stephen Rothwell
2023-12-14 23:56 Stephen Rothwell
2023-11-30 22:47 Stephen Rothwell
2023-04-13 16:12 broonie
2023-04-13 16:31 ` Christian Ehrig
2023-03-19 23:09 Stephen Rothwell
2023-03-20 3:17 ` Bagas Sanjaya
2023-02-19 23:00 Stephen Rothwell
2023-02-20 11:53 ` Alexander Lobakin
2023-02-06 23:19 Stephen Rothwell
2022-05-11 1:10 Stephen Rothwell
2021-01-25 0:12 Stephen Rothwell
2021-01-25 16:09 ` Stanislav Fomichev
2021-01-25 18:03 ` Arjun Roy
2021-02-14 21:12 ` Stephen Rothwell
2021-02-14 21:40 ` Arjun Roy
2021-02-14 23:00 ` Stephen Rothwell
2020-08-03 3:05 Stephen Rothwell
2020-07-21 2:12 Stephen Rothwell
2019-11-24 23:58 Stephen Rothwell
2019-11-25 1:19 ` Alexei Starovoitov
2019-07-01 4:47 Stephen Rothwell
2018-11-21 23:36 Stephen Rothwell
2018-04-26 0:49 Stephen Rothwell
2018-04-26 7:56 ` Daniel Borkmann
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=20200721085355.GA2315@lore-desk \
--to=lorenzo@kernel.org \
--cc=ast@kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.