History

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.

David S. Miller committed 9 years ago

Commit ed296682 parents 65c959a 3a99df947 files · +284 −169Browse files

Showing the changes to include/uapi/linux (1 of 47 files). Show all

Unified · Split

include/uapi/linux/bpf.h+0−1
@@ -889,7 +889,6 @@ struct xdp_md { · 888 unmodified lines
889889 enum sk_action {
890890 SK_DROP = 0,
891891 SK_PASS,
892− SK_REDIRECT,
893892 };
894893
895894 #define BPF_TAG_SIZE 8