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.
Showing the changes to tools/include/uapi/linux (1 of 47 files). Show all
Unified · Split
| @@ -645,7 +645,7 @@ union bpf_attr { · 644 unmodified lines | |||
| 645 | * @map: pointer to sockmap | 645 | * @map: pointer to sockmap |
| 646 | * @key: key to lookup sock in map | 646 | * @key: key to lookup sock in map |
| 647 | * @flags: reserved for future use | 647 | * @flags: reserved for future use |
| 648 | * Return: SK_REDIRECT | 648 | * Return: SK_PASS |
| 649 | * | 649 | * |
| 650 | * int bpf_sock_map_update(skops, map, key, flags) | 650 | * int bpf_sock_map_update(skops, map, key, flags) |
| 651 | * @skops: pointer to bpf_sock_ops | 651 | * @skops: pointer to bpf_sock_ops |
| @@ -889,7 +889,6 @@ struct xdp_md { · 237 unmodified lines | |||
| 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 |