diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-09-23 11:19:49 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-23 11:19:49 -0700 |
| commit | 2fcd14d0f78090f57aecd7f424e2b0373cd631a7 (patch) | |
| tree | f8946c307a3b5d319c17ec988d8a38c0fe7a08de /drivers/net/ethernet/mediatek/mtk_ppe_offload.c | |
| parent | 9aad3e4ede9bebda23579f674420123dacb61fda (diff) | |
| parent | 9bc62afe03afdf33904f5e784e1ad68c50ff00bb (diff) | |
| download | linux-stable-2fcd14d0f78090f57aecd7f424e2b0373cd631a7.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/mptcp/protocol.c
977d293e23b4 ("mptcp: ensure tx skbs always have the MPTCP ext")
efe686ffce01 ("mptcp: ensure tx skbs always have the MPTCP ext")
same patch merged in both trees, keep net-next.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/mediatek/mtk_ppe_offload.c')
| -rw-r--r-- | drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c index b5f68f66d42a..7bb1f20002b5 100644 --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c @@ -186,6 +186,9 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) int hash; int i; + if (rhashtable_lookup(ð->flow_table, &f->cookie, mtk_flow_ht_params)) + return -EEXIST; + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META)) { struct flow_match_meta match; |