summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ila
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2016-05-03 09:58:27 +0200
committerDavid S. Miller <davem@davemloft.net>2016-05-03 16:21:33 -0400
commit79e8dc8b80bff0bc5bbb90ca5e73044bf207c8ac (patch)
treedb78889cdd36d86cf37ff562534583ef97c3b400 /net/ipv6/ila
parentcf6696608a069aaac10a253207deeb63dcd6a653 (diff)
downloadlinux-79e8dc8b80bff0bc5bbb90ca5e73044bf207c8ac.tar.gz
linux-79e8dc8b80bff0bc5bbb90ca5e73044bf207c8ac.tar.bz2
linux-79e8dc8b80bff0bc5bbb90ca5e73044bf207c8ac.zip
ipv6/ila: fix nlsize calculation for lwtunnel
The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR. Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module") CC: Tom Herbert <tom@herbertland.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ila')
-rw-r--r--net/ipv6/ila/ila_lwt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c
index 2ae3c4fd8aab..41f18de5dcc2 100644
--- a/net/ipv6/ila/ila_lwt.c
+++ b/net/ipv6/ila/ila_lwt.c
@@ -120,8 +120,7 @@ nla_put_failure:
static int ila_encap_nlsize(struct lwtunnel_state *lwtstate)
{
- /* No encapsulation overhead */
- return 0;
+ return nla_total_size(sizeof(u64)); /* ILA_ATTR_LOCATOR */
}
static int ila_encap_cmp(struct lwtunnel_state *a, struct lwtunnel_state *b)