aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-06-22 10:52:40 -0700
committerDavid S. Miller <davem@davemloft.net>2021-06-22 10:52:40 -0700
commitf84974e75f539a814a0a0caee62df7cff23eb072 (patch)
tree465097e4754b0eb3d25b70094c554d5cdde4aed9 /drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
parentMAINTAINERS: network: add entry for WWAN (diff)
parenttc-testing: add test for ct DNAT tuple collision (diff)
downloadlinux-dev-f84974e75f539a814a0a0caee62df7cff23eb072.tar.xz
linux-dev-f84974e75f539a814a0a0caee62df7cff23eb072.zip
Merge branch 'tc-testing-dnat-tuple-collision'
Marcelo Ricardo Leitner says: ==================== tc-testing: add test for ct DNAT tuple collision That was fixed in 13c62f5371e3 ("net/sched: act_ct: handle DNAT tuple collision"). For that, it requires that tdc is able to send diverse packets with scapy, which is then done on the 2nd patch of this series. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c')
0 files changed, 0 insertions, 0 deletions