Commit c045ad2c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
parent 5f3b8ace

include/net/ax25.h

+7 −6
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ extern spinlock_t ax25_list_lock; 
void ax25_cb_add(ax25_cb *);

struct sock *ax25_find_listener(ax25_address *, int, struct net_device *, int);

struct sock *ax25_get_socket(ax25_address *, ax25_address *, int);

ax25_cb *ax25_find_cb(ax25_address *, ax25_address *, ax25_digi *,

ax25_cb *ax25_find_cb(const ax25_address *, ax25_address *, ax25_digi *,

		      struct net_device *);

void ax25_send_to_raw(ax25_address *, struct sk_buff *, int);

void ax25_destroy_socket(ax25_cb *);
@@ -384,10 +384,11 @@ struct ax25_linkfail { 


void ax25_linkfail_register(struct ax25_linkfail *lf);

void ax25_linkfail_release(struct ax25_linkfail *lf);

int __must_check ax25_listen_register(ax25_address *, struct net_device *);

void ax25_listen_release(ax25_address *, struct net_device *);

int __must_check ax25_listen_register(const ax25_address *,

				      struct net_device *);

void ax25_listen_release(const ax25_address *, struct net_device *);

int(*ax25_protocol_function(unsigned int))(struct sk_buff *, ax25_cb *);

int ax25_listen_mine(ax25_address *, struct net_device *);

int ax25_listen_mine(const ax25_address *, struct net_device *);

void ax25_link_failed(ax25_cb *, int);

int ax25_protocol_is_registered(unsigned int);
@@ -401,8 +402,8 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff *skb); 
extern const struct header_ops ax25_header_ops;



/* ax25_out.c */

ax25_cb *ax25_send_frame(struct sk_buff *, int, ax25_address *, ax25_address *,

			 ax25_digi *, struct net_device *);

ax25_cb *ax25_send_frame(struct sk_buff *, int, const ax25_address *,

			 ax25_address *, ax25_digi *, struct net_device *);

void ax25_output(ax25_cb *, int, struct sk_buff *);

void ax25_kick(ax25_cb *);

void ax25_transmit_buffer(ax25_cb *, struct sk_buff *, int);

net/ax25/af_ax25.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ struct sock *ax25_get_socket(ax25_address *my_addr, ax25_address *dest_addr, 
 *	Find an AX.25 control block given both ends. It will only pick up

 *	floating AX.25 control blocks or non Raw socket bound control blocks.

 */

ax25_cb *ax25_find_cb(ax25_address *src_addr, ax25_address *dest_addr,

ax25_cb *ax25_find_cb(const ax25_address *src_addr, ax25_address *dest_addr,

	ax25_digi *digi, struct net_device *dev)

{

	ax25_cb *s;

net/ax25/ax25_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ ax25_dev *ax25_addr_ax25dev(ax25_address *addr) 


	spin_lock_bh(&ax25_dev_lock);

	for (ax25_dev = ax25_dev_list; ax25_dev != NULL; ax25_dev = ax25_dev->next)

		if (ax25cmp(addr, (ax25_address *)ax25_dev->dev->dev_addr) == 0) {

		if (ax25cmp(addr, (const ax25_address *)ax25_dev->dev->dev_addr) == 0) {

			res = ax25_dev;

		}

	spin_unlock_bh(&ax25_dev_lock);

net/ax25/ax25_iface.c

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ void ax25_linkfail_release(struct ax25_linkfail *lf) 


EXPORT_SYMBOL(ax25_linkfail_release);



int ax25_listen_register(ax25_address *callsign, struct net_device *dev)

int ax25_listen_register(const ax25_address *callsign, struct net_device *dev)

{

	struct listen_struct *listen;
@@ -121,7 +121,7 @@ int ax25_listen_register(ax25_address *callsign, struct net_device *dev) 


EXPORT_SYMBOL(ax25_listen_register);



void ax25_listen_release(ax25_address *callsign, struct net_device *dev)

void ax25_listen_release(const ax25_address *callsign, struct net_device *dev)

{

	struct listen_struct *s, *listen;
@@ -171,7 +171,7 @@ int (*ax25_protocol_function(unsigned int pid))(struct sk_buff *, ax25_cb *) 
	return res;

}



int ax25_listen_mine(ax25_address *callsign, struct net_device *dev)

int ax25_listen_mine(const ax25_address *callsign, struct net_device *dev)

{

	struct listen_struct *listen;

net/ax25/ax25_in.c

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int ax25_process_rx_frame(ax25_cb *ax25, struct sk_buff *skb, int type, i 
}



static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,

	ax25_address *dev_addr, struct packet_type *ptype)

		    const ax25_address *dev_addr, struct packet_type *ptype)

{

	ax25_address src, dest, *next_digi = NULL;

	int type = 0, mine = 0, dama;
@@ -447,5 +447,5 @@ int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev, 


	skb_pull(skb, AX25_KISS_HEADER_LEN);	/* Remove the KISS byte */



	return ax25_rcv(skb, dev, (ax25_address *)dev->dev_addr, ptype);

	return ax25_rcv(skb, dev, (const ax25_address *)dev->dev_addr, ptype);

}