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: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com> Signed-off-by: Alexander Aring <aar@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f997c55c1d
commit
cc84b3c6b4
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
/*
|
||||
|
|
|
@ -2333,14 +2333,12 @@ 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,
|
||||
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)
|
||||
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)
|
||||
{
|
||||
struct inet6_ifaddr *ifp = ipv6_get_ifaddr(net, addr, dev, 1);
|
||||
int create = 0, update_lft = 0;
|
||||
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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,8 +141,8 @@ struct neigh_table nd_tbl = {
|
|||
};
|
||||
EXPORT_SYMBOL_GPL(nd_tbl);
|
||||
|
||||
static void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
|
||||
int data_len, int pad)
|
||||
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);
|
||||
u8 *opt = skb_put(skb, space);
|
||||
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue