OSDN Git Service

tipc: constify dev_addr passing
authorJakub Kicinski <kuba@kernel.org>
Tue, 12 Oct 2021 15:58:39 +0000 (08:58 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 13 Oct 2021 16:40:46 +0000 (09:40 -0700)
In preparation for netdev->dev_addr being constant
make all relevant arguments in tipc constant.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/tipc/bearer.c
net/tipc/bearer.h
net/tipc/eth_media.c
net/tipc/ib_media.c

index 443f8e5..60bc74b 100644 (file)
@@ -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:
index 57c6a1a..490ad6e 100644 (file)
@@ -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;
index c680196..cb0d185 100644 (file)
@@ -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);
index 7aa9ff8..b9ad043 100644 (file)
@@ -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);