From: David S. Miller <davem@davemloft.net>
Date: Tue, 16 Oct 2018 06:17:25 +0000 (-0700)
Subject: Merge branch 'nfp-fix-pedit-set-action-offloads'
X-Git-Tag: microblaze-v5.0-rc1~221^2~20
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=bd8be2cf8b69573707f837786474c00ff7423a0f;p=linux-2.6-microblaze.git

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>
---

bd8be2cf8b69573707f837786474c00ff7423a0f