ipv6: Export ipv6 functions for use by other protocols

cdelston · davem330 · commit a495f8364efe · 2012-05-01T09:30:55.000-04:00
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 &lt;celston@katalix.com&gt;
Signed-off-by: James Chapman &lt;jchapman@katalix.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 	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 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
 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
@@ -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
@@ -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
@@ -1535,6 +1535,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
 	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 @@ int ip6_push_pending_frames(struct sock *sk)
 	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);

Original file line number	Diff line number	Diff line change
`@@ -883,6 +883,7 @@ struct ipv6_txoptions ipv6_fixup_options(struct ipv6_txoptions opt_space,`
`883`	`883`
`884`	`884`	`return opt;`
`885`	`885`	`}`
	`886`	`+EXPORT_SYMBOL_GPL(ipv6_fixup_options);`
`886`	`887`
`887`	`888`	`/**`
`888`	`889`	`* fl6_update_dst - update flowi destination address with info given`
Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,7 @@ struct ipv6_txoptions fl6_merge_options(struct ipv6_txoptions opt_space,`
`294`	`294`	`opt_space->opt_flen = fopt->opt_flen;`
`295`	`295`	`return opt_space;`
`296`	`296`	`}`
	`297`	`+EXPORT_SYMBOL_GPL(fl6_merge_options);`
`297`	`298`
`298`	`299`	`static unsigned long check_linger(unsigned long ttl)`
`299`	`300`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1535,6 +1535,7 @@ int ip6_append_data(struct sock sk, int getfrag(void from, char *to,`
`1535`	`1535`	`IP6_INC_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);`
`1536`	`1536`	`return err;`
`1537`	`1537`	`}`
	`1538`	`+EXPORT_SYMBOL_GPL(ip6_append_data);`
`1538`	`1539`
`1539`	`1540`	`static void ip6_cork_release(struct inet_sock inet, struct ipv6_pinfo np)`
`1540`	`1541`	`{`
`@@ -1638,6 +1639,7 @@ int ip6_push_pending_frames(struct sock *sk)`
`1638`	`1639`	`IP6_INC_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);`
`1639`	`1640`	`goto out;`
`1640`	`1641`	`}`
	`1642`	`+EXPORT_SYMBOL_GPL(ip6_push_pending_frames);`
`1641`	`1643`
`1642`	`1644`	`void ip6_flush_pending_frames(struct sock *sk)`
`1643`	`1645`	`{`
`@@ -1652,3 +1654,4 @@ void ip6_flush_pending_frames(struct sock *sk)`
`1652`	`1654`
`1653`	`1655`	`ip6_cork_release(inet_sk(sk), inet6_sk(sk));`
`1654`	`1656`	`}`
	`1657`	`+EXPORT_SYMBOL_GPL(ip6_flush_pending_frames);`