Commit cc84b3c6 authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

ipv6: export several functions 



This patch exports some neighbour discovery functions which can be used
by 6lowpan neighbour discovery ops functionality then.

Cc: David S. Miller <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Acked-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Reviewed-by: default avatarStefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: default avatarAlexander Aring <aar@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f997c55c

include/net/addrconf.h

+7 −0
Original line number Diff line number Diff line
@@ -97,6 +97,13 @@ void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr); 
void addrconf_add_linklocal(struct inet6_dev *idev,

			    const struct in6_addr *addr, u32 flags);



int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,

				 const struct prefix_info *pinfo,

				 struct inet6_dev *in6_dev,

				 const struct in6_addr *addr, int addr_type,

				 u32 addr_flags, bool sllao, bool tokenized,

				 __u32 valid_lft, u32 prefered_lft);



static inline int addrconf_ifid_eui48(u8 *eui, struct net_device *dev)

{

	if (dev->addr_len != ETH_ALEN)

include/net/ndisc.h

+12 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ enum { 


#include <net/neighbour.h>



/* Set to 3 to get tracing... */

#define ND_DEBUG 1



#define ND_PRINTK(val, level, fmt, ...)				\

do {								\

	if (val <= ND_DEBUG)					\

		net_##level##_ratelimited(fmt, ##__VA_ARGS__);	\

} while (0)



struct ctl_table;

struct inet6_dev;

struct net_device;
@@ -115,6 +124,9 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev, 
					  u8 *opt, int opt_len,

					  struct ndisc_options *ndopts);



void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,

			      int data_len, int pad);



#define NDISC_OPS_REDIRECT_DATA_SPACE	2



/*

net/ipv6/addrconf.c

+7 −8
Original line number Diff line number Diff line
@@ -2333,13 +2333,11 @@ static bool is_addr_mode_generate_stable(struct inet6_dev *idev) 
	       idev->addr_gen_mode == IN6_ADDR_GEN_MODE_RANDOM;

}



static int addrconf_prefix_rcv_add_addr(struct net *net,

					struct net_device *dev,

int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,

				 const struct prefix_info *pinfo,

				 struct inet6_dev *in6_dev,

					const struct in6_addr *addr,

					int addr_type, u32 addr_flags,

					bool sllao, bool tokenized,

				 const struct in6_addr *addr, int addr_type,

				 u32 addr_flags, bool sllao, bool tokenized,

				 __u32 valid_lft, u32 prefered_lft)

{

	struct inet6_ifaddr *ifp = ipv6_get_ifaddr(net, addr, dev, 1);
@@ -2430,6 +2428,7 @@ static int addrconf_prefix_rcv_add_addr(struct net *net, 


	return 0;

}

EXPORT_SYMBOL_GPL(addrconf_prefix_rcv_add_addr);



void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)

{

net/ipv6/ndisc.c

+3 −11
Original line number Diff line number Diff line
@@ -73,15 +73,6 @@ 
#include <linux/netfilter.h>

#include <linux/netfilter_ipv6.h>



/* Set to 3 to get tracing... */

#define ND_DEBUG 1



#define ND_PRINTK(val, level, fmt, ...)				\

do {								\

	if (val <= ND_DEBUG)					\

		net_##level##_ratelimited(fmt, ##__VA_ARGS__);	\

} while (0)



static u32 ndisc_hash(const void *pkey,

		      const struct net_device *dev,

		      __u32 *hash_rnd);
@@ -150,7 +141,7 @@ struct neigh_table nd_tbl = { 
};

EXPORT_SYMBOL_GPL(nd_tbl);



static void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,

void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,

			      int data_len, int pad)

{

	int space = __ndisc_opt_addr_space(data_len, pad);
@@ -170,6 +161,7 @@ static void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data, 
	if (space > 0)

		memset(opt, 0, space);

}

EXPORT_SYMBOL_GPL(__ndisc_fill_addr_option);



static inline void ndisc_fill_addr_option(struct sk_buff *skb, int type,

					  void *data, u8 icmp6_type)

CRA Git | Maintained and supported by SUSTech CRA and CCSE