Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ax25: constify dev_addr passing

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

Modify callers as well (netrom, rose).

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

+26 -25
+7 -6
include/net/ax25.h
··· 304 304 void ax25_cb_add(ax25_cb *); 305 305 struct sock *ax25_find_listener(ax25_address *, int, struct net_device *, int); 306 306 struct sock *ax25_get_socket(ax25_address *, ax25_address *, int); 307 - ax25_cb *ax25_find_cb(ax25_address *, ax25_address *, ax25_digi *, 307 + ax25_cb *ax25_find_cb(const ax25_address *, ax25_address *, ax25_digi *, 308 308 struct net_device *); 309 309 void ax25_send_to_raw(ax25_address *, struct sk_buff *, int); 310 310 void ax25_destroy_socket(ax25_cb *); ··· 384 384 385 385 void ax25_linkfail_register(struct ax25_linkfail *lf); 386 386 void ax25_linkfail_release(struct ax25_linkfail *lf); 387 - int __must_check ax25_listen_register(ax25_address *, struct net_device *); 388 - void ax25_listen_release(ax25_address *, struct net_device *); 387 + int __must_check ax25_listen_register(const ax25_address *, 388 + struct net_device *); 389 + void ax25_listen_release(const ax25_address *, struct net_device *); 389 390 int(*ax25_protocol_function(unsigned int))(struct sk_buff *, ax25_cb *); 390 - int ax25_listen_mine(ax25_address *, struct net_device *); 391 + int ax25_listen_mine(const ax25_address *, struct net_device *); 391 392 void ax25_link_failed(ax25_cb *, int); 392 393 int ax25_protocol_is_registered(unsigned int); 393 394 ··· 402 401 extern const struct header_ops ax25_header_ops; 403 402 404 403 /* ax25_out.c */ 405 - ax25_cb *ax25_send_frame(struct sk_buff *, int, ax25_address *, ax25_address *, 406 - ax25_digi *, struct net_device *); 404 + ax25_cb *ax25_send_frame(struct sk_buff *, int, const ax25_address *, 405 + ax25_address *, ax25_digi *, struct net_device *); 407 406 void ax25_output(ax25_cb *, int, struct sk_buff *); 408 407 void ax25_kick(ax25_cb *); 409 408 void ax25_transmit_buffer(ax25_cb *, struct sk_buff *, int);
+1 -1
net/ax25/af_ax25.c
··· 202 202 * Find an AX.25 control block given both ends. It will only pick up 203 203 * floating AX.25 control blocks or non Raw socket bound control blocks. 204 204 */ 205 - ax25_cb *ax25_find_cb(ax25_address *src_addr, ax25_address *dest_addr, 205 + ax25_cb *ax25_find_cb(const ax25_address *src_addr, ax25_address *dest_addr, 206 206 ax25_digi *digi, struct net_device *dev) 207 207 { 208 208 ax25_cb *s;
+1 -1
net/ax25/ax25_dev.c
··· 35 35 36 36 spin_lock_bh(&ax25_dev_lock); 37 37 for (ax25_dev = ax25_dev_list; ax25_dev != NULL; ax25_dev = ax25_dev->next) 38 - if (ax25cmp(addr, (ax25_address *)ax25_dev->dev->dev_addr) == 0) { 38 + if (ax25cmp(addr, (const ax25_address *)ax25_dev->dev->dev_addr) == 0) { 39 39 res = ax25_dev; 40 40 } 41 41 spin_unlock_bh(&ax25_dev_lock);
+3 -3
net/ax25/ax25_iface.c
··· 98 98 99 99 EXPORT_SYMBOL(ax25_linkfail_release); 100 100 101 - int ax25_listen_register(ax25_address *callsign, struct net_device *dev) 101 + int ax25_listen_register(const ax25_address *callsign, struct net_device *dev) 102 102 { 103 103 struct listen_struct *listen; 104 104 ··· 121 121 122 122 EXPORT_SYMBOL(ax25_listen_register); 123 123 124 - void ax25_listen_release(ax25_address *callsign, struct net_device *dev) 124 + void ax25_listen_release(const ax25_address *callsign, struct net_device *dev) 125 125 { 126 126 struct listen_struct *s, *listen; 127 127 ··· 171 171 return res; 172 172 } 173 173 174 - int ax25_listen_mine(ax25_address *callsign, struct net_device *dev) 174 + int ax25_listen_mine(const ax25_address *callsign, struct net_device *dev) 175 175 { 176 176 struct listen_struct *listen; 177 177
+2 -2
net/ax25/ax25_in.c
··· 181 181 } 182 182 183 183 static int ax25_rcv(struct sk_buff *skb, struct net_device *dev, 184 - ax25_address *dev_addr, struct packet_type *ptype) 184 + const ax25_address *dev_addr, struct packet_type *ptype) 185 185 { 186 186 ax25_address src, dest, *next_digi = NULL; 187 187 int type = 0, mine = 0, dama; ··· 447 447 448 448 skb_pull(skb, AX25_KISS_HEADER_LEN); /* Remove the KISS byte */ 449 449 450 - return ax25_rcv(skb, dev, (ax25_address *)dev->dev_addr, ptype); 450 + return ax25_rcv(skb, dev, (const ax25_address *)dev->dev_addr, ptype); 451 451 }
+1 -1
net/ax25/ax25_out.c
··· 29 29 30 30 static DEFINE_SPINLOCK(ax25_frag_lock); 31 31 32 - ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, ax25_address *src, ax25_address *dest, ax25_digi *digi, struct net_device *dev) 32 + ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, const ax25_address *src, ax25_address *dest, ax25_digi *digi, struct net_device *dev) 33 33 { 34 34 ax25_dev *ax25_dev; 35 35 ax25_cb *ax25;
+2 -2
net/netrom/af_netrom.c
··· 633 633 struct sock *sk = sock->sk; 634 634 struct nr_sock *nr = nr_sk(sk); 635 635 struct sockaddr_ax25 *addr = (struct sockaddr_ax25 *)uaddr; 636 - ax25_address *source = NULL; 636 + const ax25_address *source = NULL; 637 637 ax25_uid_assoc *user; 638 638 struct net_device *dev; 639 639 int err = 0; ··· 673 673 err = -ENETUNREACH; 674 674 goto out_release; 675 675 } 676 - source = (ax25_address *)dev->dev_addr; 676 + source = (const ax25_address *)dev->dev_addr; 677 677 678 678 user = ax25_findbyuid(current_euid()); 679 679 if (user) {
+3 -3
net/netrom/nr_dev.c
··· 108 108 if (err) 109 109 return err; 110 110 111 - ax25_listen_release((ax25_address *)dev->dev_addr, NULL); 111 + ax25_listen_release((const ax25_address *)dev->dev_addr, NULL); 112 112 } 113 113 114 114 dev_addr_set(dev, sa->sa_data); ··· 120 120 { 121 121 int err; 122 122 123 - err = ax25_listen_register((ax25_address *)dev->dev_addr, NULL); 123 + err = ax25_listen_register((const ax25_address *)dev->dev_addr, NULL); 124 124 if (err) 125 125 return err; 126 126 ··· 131 131 132 132 static int nr_close(struct net_device *dev) 133 133 { 134 - ax25_listen_release((ax25_address *)dev->dev_addr, NULL); 134 + ax25_listen_release((const ax25_address *)dev->dev_addr, NULL); 135 135 netif_stop_queue(dev); 136 136 return 0; 137 137 }
+2 -2
net/netrom/nr_route.c
··· 598 598 rcu_read_lock(); 599 599 for_each_netdev_rcu(&init_net, dev) { 600 600 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM && 601 - ax25cmp(addr, (ax25_address *)dev->dev_addr) == 0) { 601 + ax25cmp(addr, (const ax25_address *)dev->dev_addr) == 0) { 602 602 dev_hold(dev); 603 603 goto out; 604 604 } ··· 825 825 826 826 ax25s = nr_neigh->ax25; 827 827 nr_neigh->ax25 = ax25_send_frame(skb, 256, 828 - (ax25_address *)dev->dev_addr, 828 + (const ax25_address *)dev->dev_addr, 829 829 &nr_neigh->callsign, 830 830 nr_neigh->digipeat, nr_neigh->dev); 831 831 if (ax25s)
+4 -4
net/rose/rose_link.c
··· 94 94 */ 95 95 static int rose_send_frame(struct sk_buff *skb, struct rose_neigh *neigh) 96 96 { 97 - ax25_address *rose_call; 97 + const ax25_address *rose_call; 98 98 ax25_cb *ax25s; 99 99 100 100 if (ax25cmp(&rose_callsign, &null_ax25_address) == 0) 101 - rose_call = (ax25_address *)neigh->dev->dev_addr; 101 + rose_call = (const ax25_address *)neigh->dev->dev_addr; 102 102 else 103 103 rose_call = &rose_callsign; 104 104 ··· 117 117 */ 118 118 static int rose_link_up(struct rose_neigh *neigh) 119 119 { 120 - ax25_address *rose_call; 120 + const ax25_address *rose_call; 121 121 ax25_cb *ax25s; 122 122 123 123 if (ax25cmp(&rose_callsign, &null_ax25_address) == 0) 124 - rose_call = (ax25_address *)neigh->dev->dev_addr; 124 + rose_call = (const ax25_address *)neigh->dev->dev_addr; 125 125 else 126 126 rose_call = &rose_callsign; 127 127