On Mon, May 4, 2015 at 5:56 PM, Alexei Starovoitov
[off-list ref] wrote:

On Mon, May 04, 2015 at 04:02:40PM -0700, Tom Herbert wrote:

quoted

In flow dissector if an MPLS header contains an entropy label this is
saved in the new extra entropy field of flow_keys. The entropy label is
then represented in the flow hash function input.

Signed-off-by: Tom Herbert <redacted>
---
 include/uapi/linux/in.h   |  2 ++
 include/uapi/linux/mpls.h |  3 +++
 net/core/flow_dissector.c | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index 589ced0..c86f6ab 100644
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h

@@ -69,6 +69,8 @@ enum {
 #define IPPROTO_SCTP         IPPROTO_SCTP
   IPPROTO_UDPLITE = 136,     /* UDP-Lite (RFC 3828)                  */
 #define IPPROTO_UDPLITE              IPPROTO_UDPLITE
+  IPPROTO_MPLS = 137,                /* MPLS in IP (RFC 4023)                */
+#define IPPROTO_MPLS         IPPROTO_SCTP

odd typo. was it tested?

Yep, that's a typo. Also noticed that LABEL_ENTROPY_INDICATOR is
defined also in internal.h (shouldn't reserved labels be in uapi?).
Not tested, we need a way to do MPLS over IP for that!