]> git.baikalelectronics.ru Git - kernel.git/commit
nfp: flower-ct: fill in ct merge check function
authorLouis Peens <louis.peens@corigine.com>
Wed, 16 Jun 2021 10:02:05 +0000 (12:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jun 2021 19:42:52 +0000 (12:42 -0700)
commit8770b197ae30ae9473fd0e6ca00f6b28886ee595
tree0977abcbb151123c81e8beac8edf590043afec7b
parent6c534e73e16240d9712ed8e887faf02f4d6552ec
nfp: flower-ct: fill in ct merge check function

Replace merge check stub code with the actual implementation. This
checks that the match parts of two tc flows does not conflict.
Only overlapping keys needs to be checked, and only the narrowest
masked parts needs to be checked, so each key is masked with the
AND'd result of both masks before comparing.

Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/flower/conntrack.c
drivers/net/ethernet/netronome/nfp/flower/conntrack.h