ndisc: Move ndisc_opt_addr_space() to include/net/ndisc.h.

This also makes ndisc_opt_addr_data() and ndisc_fill_addr_option()
use ndisc_opt_addr_space().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 6 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 49dfc2a73ee0..82ccf0a43063 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -143,17 +143,12 @@ struct neigh_table nd_tbl = {
         .gc_thresh3 =   1024,
 };
 
-static inline int ndisc_opt_addr_space(struct net_device *dev)
-{
-        return NDISC_OPT_SPACE(dev->addr_len + ndisc_addr_option_pad(dev->type));
-}
-
 static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data,
                                   struct net_device *dev)
 {
         int pad   = ndisc_addr_option_pad(dev->type);
         int data_len = dev->addr_len;
-        int space = NDISC_OPT_SPACE(data_len + pad);
+        int space = ndisc_opt_addr_space(dev);
 
         opt[0] = type;
         opt[1] = space>>3;