diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-02 01:59:52 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-02 02:23:39 -0400 |
| commit | ed29668d1aa2c6f01e61dd616df13b5241cee7e0 (patch) | |
| tree | a086cf6311ed8623b292d3ea8d73c03f53207be0 /include/uapi/linux | |
| parent | 65c959a39b7e9ad6b443b74904486b4a75b0232f (diff) | |
| parent | 3a99df9a3d14cd866b5516f8cba515a3bfd554ab (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Smooth Cong Wang's bug fix into 'net-next'. Basically put
the bulk of the tcf_block_put() logic from 'net' into
tcf_block_put_ext(), but after the offload unbind.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/bpf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 0b7b54d898bd..7cebba491011 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h | |||
| @@ -889,7 +889,6 @@ struct xdp_md { | |||
| 889 | enum sk_action { | 889 | enum sk_action { |
| 890 | SK_DROP = 0, | 890 | SK_DROP = 0, |
| 891 | SK_PASS, | 891 | SK_PASS, |
| 892 | SK_REDIRECT, | ||
| 893 | }; | 892 | }; |
| 894 | 893 | ||
| 895 | #define BPF_TAG_SIZE 8 | 894 | #define BPF_TAG_SIZE 8 |