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>
This commit is contained in:
commit
ed29668d1a
47 changed files with 285 additions and 170 deletions
|
|
@ -889,7 +889,6 @@ struct xdp_md {
|
|||
enum sk_action {
|
||||
SK_DROP = 0,
|
||||
SK_PASS,
|
||||
SK_REDIRECT,
|
||||
};
|
||||
|
||||
#define BPF_TAG_SIZE 8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue