summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_flowlabel.c
diff options
context:
space:
mode:
authorChris Elston <celston@katalix.com>2012-04-29 23:48:53 +0200
committerDavid S. Miller <davem@davemloft.net>2012-05-01 15:30:55 +0200
commita495f8364efe11f4813914b09cf0d026364d6969 (patch)
tree80bc059942c937399165c39642e3b1dcc510593d /net/ipv6/ip6_flowlabel.c
parentl2tp: netlink api for l2tpv3 ipv6 unmanaged tunnels (diff)
downloadlinux-a495f8364efe11f4813914b09cf0d026364d6969.tar.xz
linux-a495f8364efe11f4813914b09cf0d026364d6969.zip
ipv6: Export ipv6 functions for use by other protocols
For implementing other protocols on top of IPv6, such as L2TPv3's IP encapsulation over ipv6, we'd like to call some IPv6 functions which are not currently exported. This patch exports them. Signed-off-by: Chris Elston <celston@katalix.com> Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
-rw-r--r--net/ipv6/ip6_flowlabel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 1dd632971bce..cb43df690210 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -294,6 +294,7 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space,
opt_space->opt_flen = fopt->opt_flen;
return opt_space;
}
+EXPORT_SYMBOL_GPL(fl6_merge_options);
static unsigned long check_linger(unsigned long ttl)
{