From: Daniel Borkmann <daniel@iogearbox.net>
To: David Miller <davem@davemloft.net>
Cc: alexei.starovoitov@gmail.com, tgraf@suug.ch, jesse@kernel.org,
netdev@vger.kernel.org
Subject: Re: [PATCH net] bpf: fix csum setting for bpf_set_tunnel_key
Date: Thu, 25 Feb 2016 11:45:47 +0100 [thread overview]
Message-ID: <56CEDB5B.7060805@iogearbox.net> (raw)
In-Reply-To: <20160224.162400.1248598061435588351.davem@davemloft.net>
On 02/24/2016 10:24 PM, David Miller wrote:
[...]
> Applied to 'net', thanks Daniel.
Thanks!
Btw, in case net gets merged into net-next, there will be a minor
merge conflict due to stackid flags present in net-next. This can
be easily resolved by keeping both chunks.
For example, result after merge in include/uapi/linux/bpf.h then
looks like:
/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
#define BPF_F_TUNINFO_IPV6 (1ULL << 0)
/* BPF_FUNC_skb_set_tunnel_key flags. */
#define BPF_F_ZERO_CSUM_TX (1ULL << 1)
/* BPF_FUNC_get_stackid flags. */
#define BPF_F_SKIP_FIELD_MASK 0xffULL
#define BPF_F_USER_STACK (1ULL << 8)
#define BPF_F_FAST_STACK_CMP (1ULL << 9)
#define BPF_F_REUSE_STACKID (1ULL << 10)
Thanks,
Daniel
next prev parent reply other threads:[~2016-02-25 10:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 1:05 [PATCH net] bpf: fix csum setting for bpf_set_tunnel_key Daniel Borkmann
2016-02-24 21:24 ` David Miller
2016-02-25 10:45 ` Daniel Borkmann [this message]
2016-02-25 16:36 ` 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=56CEDB5B.7060805@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=alexei.starovoitov@gmail.com \
--cc=davem@davemloft.net \
--cc=jesse@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tgraf@suug.ch \
/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.