ipv6: constify dev_addr passing

In preparation for netdev->dev_addr being constant
make all relevant arguments in ndisc constant.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 38e4094960cee8112d19bb3e60e8d8ed7f6fa4b4..04341d86585de95ab816784086cb6093976aecaa 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -137,7 +137,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
                                          u8 *opt, int opt_len,
                                          struct ndisc_options *ndopts);
 
-void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
+void __ndisc_fill_addr_option(struct sk_buff *skb, int type, const void *data,
                              int data_len, int pad);
 
 #define NDISC_OPS_REDIRECT_DATA_SPACE  2

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index c6a90b7bbb70e93503d5984f6964ed69560a3ab6..d4fae16deec457a56911504874d65e33666d4e8b 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2237,12 +2237,12 @@ static int addrconf_ifid_6lowpan(u8 *eui, struct net_device *dev)
 
 static int addrconf_ifid_ieee1394(u8 *eui, struct net_device *dev)
 {
-       union fwnet_hwaddr *ha;
+       const union fwnet_hwaddr *ha;
 
        if (dev->addr_len != FWNET_ALEN)
                return -1;
 
-       ha = (union fwnet_hwaddr *)dev->dev_addr;
+       ha = (const union fwnet_hwaddr *)dev->dev_addr;
 
        memcpy(eui, &ha->uc.uniq_id, sizeof(ha->uc.uniq_id));
        eui[0] ^= 2;

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 4b098521a44cd7a7dc9ff791265d52ea632b0e75..184190b9ea25bc417592355cf2d7d9a0e21a6b5d 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -142,7 +142,7 @@ struct neigh_table nd_tbl = {
 };
 EXPORT_SYMBOL_GPL(nd_tbl);
 
-void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
+void __ndisc_fill_addr_option(struct sk_buff *skb, int type, const void *data,
                              int data_len, int pad)
 {
        int space = __ndisc_opt_addr_space(data_len, pad);
@@ -165,7 +165,7 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
 EXPORT_SYMBOL_GPL(__ndisc_fill_addr_option);
 
 static inline void ndisc_fill_addr_option(struct sk_buff *skb, int type,
-                                         void *data, u8 icmp6_type)
+                                         const void *data, u8 icmp6_type)
 {
        __ndisc_fill_addr_option(skb, type, data, skb->dev->addr_len,
                                 ndisc_addr_option_pad(skb->dev->type));