diff --git a/[refs] b/[refs] index 58a8878baf80..6b7f8250d816 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eab2e0b2ec150aec8887d0cf178f7c989296266f +refs/heads/master: 3cccd6078413e9707f0ef3652b4e6e9cb84e9fa0 diff --git a/trunk/include/net/ndisc.h b/trunk/include/net/ndisc.h index 9f2bae68d28c..16424236fe2f 100644 --- a/trunk/include/net/ndisc.h +++ b/trunk/include/net/ndisc.h @@ -102,9 +102,6 @@ extern void ndisc_send_rs(struct net_device *dev, struct in6_addr *saddr, struct in6_addr *daddr); -extern void ndisc_forwarding_on(void); -extern void ndisc_forwarding_off(void); - extern void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, struct in6_addr *target); @@ -124,7 +121,6 @@ extern int igmp6_event_query(struct sk_buff *skb); extern int igmp6_event_report(struct sk_buff *skb); -extern void igmp6_cleanup(void); #ifdef CONFIG_SYSCTL extern int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl,