From: David S. Miller Date: Mon, 24 Apr 2017 18:30:47 +0000 (-0400) Subject: Merge branch 'cls_flower-MPLS' X-Git-Tag: v6.6-pxa1908~16785^2~105 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=0d688a0d337628ded9bb05c99f35fac7424af4f8;p=linux.git Merge branch 'cls_flower-MPLS' Benjamin LaHaise says: ==================== flower: add MPLS matching support This patch series adds support for parsing MPLS flows in the flow dissector and the flower classifier. Each of the MPLS TTL, BOS, TC and Label fields can be used for matching. v2: incorporate style feedback, move #defines to linux/include/mpls.h Note: this omits Jiri's request to remove tabs between the type and field names in struct declarations. This would be inconsistent with numerous other struct definitions. ==================== Signed-off-by: David S. Miller --- 0d688a0d337628ded9bb05c99f35fac7424af4f8