diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /include/net/ndisc.h | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'include/net/ndisc.h')
-rw-r--r-- | include/net/ndisc.h | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 6bbda34..ea0cc26 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -110,8 +110,8 @@ struct ndisc_options { #define NDISC_OPT_SPACE(len) (((len)+2+7)&~7) -struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len, - struct ndisc_options *ndopts); +extern struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len, + struct ndisc_options *ndopts); /* * Return the padding between the option length and the start of the @@ -189,51 +189,60 @@ static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, cons return n; } -int ndisc_init(void); -int ndisc_late_init(void); +extern int ndisc_init(void); +extern int ndisc_late_init(void); -void ndisc_late_cleanup(void); -void ndisc_cleanup(void); +extern void ndisc_late_cleanup(void); +extern void ndisc_cleanup(void); -int ndisc_rcv(struct sk_buff *skb); +extern int ndisc_rcv(struct sk_buff *skb); -void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh, - const struct in6_addr *solicit, - const struct in6_addr *daddr, const struct in6_addr *saddr); +extern void ndisc_send_ns(struct net_device *dev, + struct neighbour *neigh, + const struct in6_addr *solicit, + const struct in6_addr *daddr, + const struct in6_addr *saddr); -void ndisc_send_rs(struct net_device *dev, - const struct in6_addr *saddr, const struct in6_addr *daddr); -void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, - const struct in6_addr *daddr, - const struct in6_addr *solicited_addr, - bool router, bool solicited, bool override, bool inc_opt); +extern void ndisc_send_rs(struct net_device *dev, + const struct in6_addr *saddr, + const struct in6_addr *daddr); +extern void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, + const struct in6_addr *daddr, + const struct in6_addr *solicited_addr, + bool router, bool solicited, bool override, + bool inc_opt); -void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target); +extern void ndisc_send_redirect(struct sk_buff *skb, + const struct in6_addr *target); -int ndisc_mc_map(const struct in6_addr *addr, char *buf, struct net_device *dev, - int dir); +extern int ndisc_mc_map(const struct in6_addr *addr, char *buf, + struct net_device *dev, int dir); /* * IGMP */ -int igmp6_init(void); +extern int igmp6_init(void); -void igmp6_cleanup(void); +extern void igmp6_cleanup(void); -int igmp6_event_query(struct sk_buff *skb); +extern int igmp6_event_query(struct sk_buff *skb); -int igmp6_event_report(struct sk_buff *skb); +extern int igmp6_event_report(struct sk_buff *skb); #ifdef CONFIG_SYSCTL -int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, - void __user *buffer, size_t *lenp, loff_t *ppos); +extern int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, + int write, + void __user *buffer, + size_t *lenp, + loff_t *ppos); int ndisc_ifinfo_sysctl_strategy(struct ctl_table *ctl, void __user *oldval, size_t __user *oldlenp, void __user *newval, size_t newlen); #endif -void inet6_ifinfo_notify(int event, struct inet6_dev *idev); +extern void inet6_ifinfo_notify(int event, + struct inet6_dev *idev); #endif |