tipc: constify dev_addr passing

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

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

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 443f8e5b94777ecdb79d8a00f592ac750488ea6d..60bc74b76adc5909fdb5294f205229682a09d031 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -462,7 +462,7 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b,
        b->bcast_addr.media_id = b->media->type_id;
        b->bcast_addr.broadcast = TIPC_BROADCAST_SUPPORT;
        b->mtu = dev->mtu;
-       b->media->raw2addr(b, &b->addr, (char *)dev->dev_addr);
+       b->media->raw2addr(b, &b->addr, (const char *)dev->dev_addr);
        rcu_assign_pointer(dev->tipc_ptr, b);
        return 0;
 }
@@ -703,7 +703,7 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt,
                break;
        case NETDEV_CHANGEADDR:
                b->media->raw2addr(b, &b->addr,
-                                  (char *)dev->dev_addr);
+                                  (const char *)dev->dev_addr);
                tipc_reset_bearer(net, b);
                break;
        case NETDEV_UNREGISTER:

diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 57c6a1a719e243157f91d2b6aa1f9e9e63298a3a..490ad6e5f7a3c8d0fed649f65cea92b7948c3e69 100644 (file)
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -117,7 +117,7 @@ struct tipc_media {
                        char *msg);
        int (*raw2addr)(struct tipc_bearer *b,
                        struct tipc_media_addr *addr,
-                       char *raw);
+                       const char *raw);
        u32 priority;
        u32 tolerance;
        u32 min_win;

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index c68019697cfe1d55e252dc318a1eb0597f9f46a0..cb0d185e06afd4fd8578b398ccf544457fe9a164 100644 (file)
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -60,7 +60,7 @@ static int tipc_eth_addr2msg(char *msg, struct tipc_media_addr *addr)
 /* Convert raw mac address format to media addr format */
 static int tipc_eth_raw2addr(struct tipc_bearer *b,
                             struct tipc_media_addr *addr,
-                            char *msg)
+                            const char *msg)
 {
        memset(addr, 0, sizeof(*addr));
        ether_addr_copy(addr->value, msg);

diff --git a/net/tipc/ib_media.c b/net/tipc/ib_media.c
index 7aa9ff88458d6463134503512008ea5368f420eb..b9ad0434c3cdca511ee6acc716e299c738258df6 100644 (file)
--- a/net/tipc/ib_media.c
+++ b/net/tipc/ib_media.c
@@ -67,7 +67,7 @@ static int tipc_ib_addr2msg(char *msg, struct tipc_media_addr *addr)
 /* Convert raw InfiniBand address format to media addr format */
 static int tipc_ib_raw2addr(struct tipc_bearer *b,
                            struct tipc_media_addr *addr,
-                           char *msg)
+                           const char *msg)
 {
        memset(addr, 0, sizeof(*addr));
        memcpy(addr->value, msg, INFINIBAND_ALEN);