commit bd8be2cf8b69573707f837786474c00ff7423a0f
author David S. Miller <davem@davemloft.net> Mon Oct 15 23:17:25 2018 -0700
committer David S. Miller <davem@davemloft.net> Mon Oct 15 23:17:25 2018 -0700
tree d9045222d4b3dda9bf3292f5f16fe305ccb1fa0f
parent 1890fea7936ad9be0b7caf6a94146b0d905c4b60
parent 140b6abac26d799f75d772ab5e969b34ad8d68f1

Merge branch 'nfp-fix-pedit-set-action-offloads'

Jakub Kicinski says:

====================
nfp: fix pedit set action offloads

Pieter says:

This set fixes set actions when using multiple pedit actions with
partial masks and with multiple keys per pedit action. Additionally
it fixes set ipv6 pedit action offloads when using it in combination
with other header keys.

The problem would only trigger if one combines multiple pedit actions
of the same type with partial masks, e.g.:

$ tc filter add dev netdev protocol ip parent ffff: \
    flower indev netdev \
    ip_proto tcp \
    action pedit ex munge \
    ip src set 11.11.11.11 retain 65535 munge \
    ip src set 22.22.22.22 retain 4294901760 pipe \
    csum ip and tcp pipe \
    mirred egress redirect dev netdev
====================

Signed-off-by: David S. Miller <davem@davemloft.net>