[PATCHv4 net-next 06/12] ndisc: add __ndisc_fill_addr_option function

[Alexander Aring]

This patch adds __ndisc_fill_addr_option as low-level function for
ndisc_fill_addr_option which doesn't depend on net_device parameter.

Cc: David S. Miller <da...@davemloft.net>
Cc: Alexey Kuznetsov <kuz...@ms2.inr.ac.ru>
Cc: James Morris <jmor...@namei.org>
Cc: Hideaki YOSHIFUJI <yoshf...@linux-ipv6.org>
Cc: Patrick McHardy <ka...@trash.net>
Acked-by: YOSHIFUJI Hideaki <yoshf...@linux-ipv6.org>
Reviewed-by: Stefan Schmidt <ste...@osg.samsung.com>
Signed-off-by: Alexander Aring <a...@pengutronix.de>
---
 net/ipv6/ndisc.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index c245895..a7b9468 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -150,11 +150,10 @@ struct neigh_table nd_tbl = {
 };
 EXPORT_SYMBOL_GPL(nd_tbl);
 
-static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data)
+static void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
+                                    int data_len, int pad)
 {
-       int pad   = ndisc_addr_option_pad(skb->dev->type);
-       int data_len = skb->dev->addr_len;
-       int space = ndisc_opt_addr_space(skb->dev);
+       int space = __ndisc_opt_addr_space(data_len, pad);
        u8 *opt = skb_put(skb, space);
 
        opt[0] = type;
@@ -172,6 +171,13 @@ static void ndisc_fill_addr_option(struct sk_buff *skb, 
int type, void *data)
                memset(opt, 0, space);
 }
 
+static inline void ndisc_fill_addr_option(struct sk_buff *skb, int type,
+                                         void *data)
+{
+       __ndisc_fill_addr_option(skb, type, data, skb->dev->addr_len,
+                                ndisc_addr_option_pad(skb->dev->type));
+}
+
 static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,
                                            struct nd_opt_hdr *end)
 {
-- 
2.8.3