summaryrefslogtreecommitdiffstats
path: root/include/net/mpls_iptunnel.h
diff options
context:
space:
mode:
authorDavid Ahern <dsa@cumulusnetworks.com>2017-03-31 16:14:04 +0200
committerDavid S. Miller <davem@davemloft.net>2017-04-02 05:21:44 +0200
commit1511009cd68015c2e04135bfefa4bf5020baa8d9 (patch)
treeca1ca7c8f76a3bc752ccf31e3b216fa9119f71d7 /include/net/mpls_iptunnel.h
parentnet: mpls: bump maximum number of labels (diff)
downloadlinux-1511009cd68015c2e04135bfefa4bf5020baa8d9.tar.xz
linux-1511009cd68015c2e04135bfefa4bf5020baa8d9.zip
net: mpls: Increase max number of labels for lwt encap
Alow users to push down more labels per MPLS encap. Similar to LSR case, move label array to the end of mpls_iptunnel_encap and allocate based on the number of labels for the route. For consistency with the LSR case, re-use the same maximum number of labels. Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/mpls_iptunnel.h')
-rw-r--r--include/net/mpls_iptunnel.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/mpls_iptunnel.h b/include/net/mpls_iptunnel.h
index a18af6a16eb5..9d22bf67ac86 100644
--- a/include/net/mpls_iptunnel.h
+++ b/include/net/mpls_iptunnel.h
@@ -14,13 +14,12 @@
#ifndef _NET_MPLS_IPTUNNEL_H
#define _NET_MPLS_IPTUNNEL_H 1
-#define MAX_NEW_LABELS 2
-
struct mpls_iptunnel_encap {
- u32 label[MAX_NEW_LABELS];
u8 labels;
u8 ttl_propagate;
u8 default_ttl;
+ u8 reserved1;
+ u32 label[0];
};
static inline struct mpls_iptunnel_encap *mpls_lwtunnel_encap(struct lwtunnel_state *lwtstate)