From: James Chapman <jchapman@katalix.com>
To: netdev@vger.kernel.org
Cc: Chris Elston <celston@katalix.com>
Subject: [PATCH 08/10 net-next] ipv6: Export ipv6 functions for use by other protocols
Date: Mon, 30 Apr 2012 08:48:53 +0100 [thread overview]
Message-ID: <1335772135-27910-9-git-send-email-jchapman@katalix.com> (raw)
In-Reply-To: <1335772135-27910-1-git-send-email-jchapman@katalix.com>
From: Chris Elston <celston@katalix.com>
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>
---
net/ipv6/datagram.c | 4 ++++
net/ipv6/exthdrs.c | 1 +
net/ipv6/ip6_flowlabel.c | 1 +
net/ipv6/ip6_output.c | 3 +++
4 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 7fba35a..b8b61ac 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -22,6 +22,7 @@
#include <linux/ipv6.h>
#include <linux/route.h>
#include <linux/slab.h>
+#include <linux/export.h>
#include <net/ipv6.h>
#include <net/ndisc.h>
@@ -202,6 +203,7 @@ out:
fl6_sock_release(flowlabel);
return err;
}
+EXPORT_SYMBOL_GPL(ip6_datagram_connect);
void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
__be16 port, u32 info, u8 *payload)
@@ -414,6 +416,7 @@ out_free_skb:
out:
return err;
}
+EXPORT_SYMBOL_GPL(ipv6_recv_error);
/*
* Handle IPV6_RECVPATHMTU
@@ -868,3 +871,4 @@ int datagram_send_ctl(struct net *net, struct sock *sk,
exit_f:
return err;
}
+EXPORT_SYMBOL_GPL(datagram_send_ctl);
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index aa0a51e..a93bd23 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -883,6 +883,7 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
return opt;
}
+EXPORT_SYMBOL_GPL(ipv6_fixup_options);
/**
* fl6_update_dst - update flowi destination address with info given
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 1dd6329..cb43df6 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)
{
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index b7ca461..2a16aa9 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1535,6 +1535,7 @@ error:
IP6_INC_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);
return err;
}
+EXPORT_SYMBOL_GPL(ip6_append_data);
static void ip6_cork_release(struct inet_sock *inet, struct ipv6_pinfo *np)
{
@@ -1638,6 +1639,7 @@ error:
IP6_INC_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);
goto out;
}
+EXPORT_SYMBOL_GPL(ip6_push_pending_frames);
void ip6_flush_pending_frames(struct sock *sk)
{
@@ -1652,3 +1654,4 @@ void ip6_flush_pending_frames(struct sock *sk)
ip6_cork_release(inet_sk(sk), inet6_sk(sk));
}
+EXPORT_SYMBOL_GPL(ip6_flush_pending_frames);
--
1.7.0.4
next prev parent reply other threads:[~2012-04-30 7:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-30 7:48 [PATCH 00/10 net-next] l2tp: misc fixes and add L2TPv3 IP encap over IPv6 James Chapman
2012-04-30 7:48 ` [PATCH 01/10 net-next] l2tp: fix locking of 64-bit counters for smp James Chapman
2012-04-30 7:48 ` [PATCH 02/10 net-next] l2tp: Use ip4_datagram_connect() in l2tp_ip_connect() James Chapman
2012-04-30 7:48 ` [PATCH 03/10 net-next] l2tp: remove unused stats from l2tp_ip socket James Chapman
2012-04-30 7:48 ` [PATCH 04/10 net-next] pppox: Replace __attribute__((packed)) in if_pppox.h James Chapman
2012-04-30 7:48 ` [PATCH 05/10 net-next] l2tp: pppol2tp_connect() handles ipv6 sockaddr variants James Chapman
2012-04-30 7:48 ` [PATCH 06/10 net-next] l2tp: show IPv6 addresses in l2tp debugfs file James Chapman
2012-04-30 7:48 ` [PATCH 07/10 net-next] l2tp: netlink api for l2tpv3 ipv6 unmanaged tunnels James Chapman
2012-04-30 7:48 ` James Chapman [this message]
2012-04-30 7:48 ` [PATCH 09/10 net-next] l2tp: introduce L2TPv3 IP encapsulation support for IPv6 James Chapman
2012-04-30 7:48 ` [PATCH 10/10 net-next] l2tp: let iproute2 create L2TPv3 IP tunnels using IPv6 James Chapman
2012-04-30 17:46 ` [PATCH 00/10 net-next] l2tp: misc fixes and add L2TPv3 IP encap over IPv6 David Miller
2012-05-01 8:38 ` James Chapman
2012-05-01 13:38 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335772135-27910-9-git-send-email-jchapman@katalix.com \
--to=jchapman@katalix.com \
--cc=celston@katalix.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).