diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-25 18:58:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-25 18:58:11 -0700 |
| commit | 9fb16955fb661945ddffce4504dcffbe55cd518a (patch) | |
| tree | e0811476a96a9411686e24f15a48d63cc6d02e49 /net/netfilter/nf_flow_table_offload.c | |
| parent | 1f074e677a343afcd852af5ee725bacc937fa6bd (diff) | |
| parent | 1b649e0bcae71c118c1333e02249a7510ba7f70a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Overlapping header include additions in macsec.c
A bug fix in 'net' overlapping with the removal of 'version'
string in ena_netdev.c
Overlapping test additions in selftests Makefile
Overlapping PCI ID table adjustments in iwlwifi driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_flow_table_offload.c')
| -rw-r--r-- | net/netfilter/nf_flow_table_offload.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c index ad549317af30..024a91645d9c 100644 --- a/net/netfilter/nf_flow_table_offload.c +++ b/net/netfilter/nf_flow_table_offload.c @@ -120,6 +120,7 @@ static int nf_flow_rule_match(struct nf_flow_match *match, default: return -EOPNOTSUPP; } + mask->control.addr_type = 0xffff; match->dissector.used_keys |= BIT(key->control.addr_type); mask->basic.n_proto = 0xffff; |