Commit 1bf20cc62a54 ("neighbour: remove obsolete EXPORT_SYMBOL()") unexported some functions in neighbour.c because IPv6 is no longer built as module. Since it unexported neigh_table_init(), no module can register neigh_table dynamically. Let's unexport a few more functions. Signed-off-by: Kuniyuki Iwashima --- net/core/neighbour.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 13eea09721c6..6fda0052027b 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -131,7 +131,6 @@ unsigned long neigh_rand_reach_time(unsigned long base) { return base ? get_random_u32_below(base) + (base >> 1) : 0; } -EXPORT_SYMBOL(neigh_rand_reach_time); static void neigh_mark_dead(struct neighbour *n) { @@ -1539,7 +1538,6 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, { return __neigh_update(neigh, lladdr, new, flags, nlmsg_pid, NULL); } -EXPORT_SYMBOL(neigh_update); /* Update the neigh to listen temporarily for probe responses, even if it is * in a NUD_FAILED state. The caller has to hold neigh->lock for writing. @@ -1557,7 +1555,6 @@ void __neigh_set_probe_once(struct neighbour *neigh) jiffies + max(NEIGH_VAR(neigh->parms, RETRANS_TIME), HZ/100)); } -EXPORT_SYMBOL(__neigh_set_probe_once); struct neighbour *neigh_event_ns(struct neigh_table *tbl, u8 *lladdr, void *saddr, @@ -1570,7 +1567,6 @@ struct neighbour *neigh_event_ns(struct neigh_table *tbl, NEIGH_UPDATE_F_OVERRIDE, 0); return neigh; } -EXPORT_SYMBOL(neigh_event_ns); /* called with read_lock_bh(&n->lock); */ static void neigh_hh_init(struct neighbour *n) @@ -1623,7 +1619,6 @@ int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb) kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_HH_FILLFAIL); goto out; } -EXPORT_SYMBOL(neigh_resolve_output); /* As fast as possible without hh cache */ @@ -1740,7 +1735,6 @@ void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p, mod_timer(&tbl->proxy_timer, sched_next); spin_unlock(&tbl->proxy_queue.lock); } -EXPORT_SYMBOL(pneigh_enqueue); static inline struct neigh_parms *lookup_neigh_parms(struct neigh_table *tbl, struct net *net, int ifindex) @@ -1788,7 +1782,6 @@ struct neigh_parms *neigh_parms_alloc(struct net_device *dev, } return p; } -EXPORT_SYMBOL(neigh_parms_alloc); static void neigh_rcu_free_parms(struct rcu_head *head) { @@ -1811,7 +1804,6 @@ void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms) netdev_put(parms->dev, &parms->dev_tracker); call_rcu(&parms->rcu_head, neigh_rcu_free_parms); } -EXPORT_SYMBOL(neigh_parms_release); static struct lock_class_key neigh_table_proxy_queue_class; @@ -3398,7 +3390,6 @@ void *neigh_seq_start(struct seq_file *seq, loff_t *pos, struct neigh_table *tbl return *pos ? neigh_get_idx_any(seq, pos) : SEQ_START_TOKEN; } -EXPORT_SYMBOL(neigh_seq_start); void *neigh_seq_next(struct seq_file *seq, void *v, loff_t *pos) { @@ -3425,7 +3416,6 @@ void *neigh_seq_next(struct seq_file *seq, void *v, loff_t *pos) ++(*pos); return rc; } -EXPORT_SYMBOL(neigh_seq_next); void neigh_seq_stop(struct seq_file *seq, void *v) __releases(tbl->lock) @@ -3437,7 +3427,6 @@ void neigh_seq_stop(struct seq_file *seq, void *v) spin_unlock_bh(&tbl->lock); rcu_read_unlock(); } -EXPORT_SYMBOL(neigh_seq_stop); /* statistics via seq_file */ @@ -3561,7 +3550,6 @@ void neigh_app_ns(struct neighbour *n) { neigh_notify(n, RTM_GETNEIGH, NLM_F_REQUEST, 0); } -EXPORT_SYMBOL(neigh_app_ns); #ifdef CONFIG_SYSCTL static int unres_qlen_max = INT_MAX / SKB_TRUESIZE(ETH_FRAME_LEN); @@ -3657,7 +3645,6 @@ int neigh_proc_dointvec(const struct ctl_table *ctl, int write, void *buffer, neigh_proc_update(ctl, write); return ret; } -EXPORT_SYMBOL(neigh_proc_dointvec); int neigh_proc_dointvec_jiffies(const struct ctl_table *ctl, int write, void *buffer, size_t *lenp, loff_t *ppos) @@ -3667,7 +3654,6 @@ int neigh_proc_dointvec_jiffies(const struct ctl_table *ctl, int write, void *bu neigh_proc_update(ctl, write); return ret; } -EXPORT_SYMBOL(neigh_proc_dointvec_jiffies); static int neigh_proc_dointvec_userhz_jiffies(const struct ctl_table *ctl, int write, void *buffer, size_t *lenp, @@ -3687,7 +3673,6 @@ int neigh_proc_dointvec_ms_jiffies(const struct ctl_table *ctl, int write, neigh_proc_update(ctl, write); return ret; } -EXPORT_SYMBOL(neigh_proc_dointvec_ms_jiffies); static int neigh_proc_dointvec_unres_qlen(const struct ctl_table *ctl, int write, void *buffer, size_t *lenp, @@ -3894,7 +3879,6 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, err: return -ENOBUFS; } -EXPORT_SYMBOL(neigh_sysctl_register); void neigh_sysctl_unregister(struct neigh_parms *p) { @@ -3905,7 +3889,6 @@ void neigh_sysctl_unregister(struct neigh_parms *p) kfree(t); } } -EXPORT_SYMBOL(neigh_sysctl_unregister); #endif /* CONFIG_SYSCTL */ -- 2.55.0.679.g6767b8d81c-goog