From: David S. Miller <davem@davemloft.net>
Date: Thu, 8 Dec 2016 16:47:14 +0000 (-0500)
Subject: Merge branch 'cls_flower-ICMP'
X-Git-Tag: v4.10-rc1~202^2~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=334c5e2ba718c9c2f74d56316624f048169ebfd6;p=karo-tx-linux.git

Merge branch 'cls_flower-ICMP'

Simon Horman says:

====================
net/sched: cls_flower: Support matching on ICMP

this series adds support for matching on ICMP type and code to cls_flower.

Changes v5->v6:
* Restore missing signed-off-by

Changes v4->v5:
* Drop all helpers

Changes v3->v4:
* Do not add icmp to struct flow_keys, it is not needed
* Do not test for ICMP protocols in packet in __skb_flow_dissect,
  this is also not needed

Changes v2->v3:
* Add FLOW_DISSECTOR_KEY_ICMP and use separate structure for ICMP

Changes v1->v2:
* Include all dissector helpers in first patch
====================

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

334c5e2ba718c9c2f74d56316624f048169ebfd6