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

rose: constify dev_addr passing 



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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c045ad2c

include/net/rose.h

+4 −4
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ extern int sysctl_rose_link_fail_timeout; 
extern int  sysctl_rose_maximum_vcs;

extern int  sysctl_rose_window_size;



int rosecmp(rose_address *, rose_address *);

int rosecmpm(rose_address *, rose_address *, unsigned short);

int rosecmp(const rose_address *, const rose_address *);

int rosecmpm(const rose_address *, const rose_address *, unsigned short);

char *rose2asc(char *buf, const rose_address *);

struct sock *rose_find_socket(unsigned int, struct rose_neigh *);

void rose_kill_by_neigh(struct rose_neigh *);
@@ -205,8 +205,8 @@ extern const struct seq_operations rose_node_seqops; 
extern struct seq_operations rose_route_seqops;



void rose_add_loopback_neigh(void);

int __must_check rose_add_loopback_node(rose_address *);

void rose_del_loopback_node(rose_address *);

int __must_check rose_add_loopback_node(const rose_address *);

void rose_del_loopback_node(const rose_address *);

void rose_rt_device_down(struct net_device *);

void rose_link_device_down(struct net_device *);

struct net_device *rose_dev_first(void);

net/rose/af_rose.c

+3 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ char *rose2asc(char *buf, const rose_address *addr) 
/*

 *	Compare two ROSE addresses, 0 == equal.

 */

int rosecmp(rose_address *addr1, rose_address *addr2)

int rosecmp(const rose_address *addr1, const rose_address *addr2)

{

	int i;
@@ -123,7 +123,8 @@ int rosecmp(rose_address *addr1, rose_address *addr2) 
/*

 *	Compare two ROSE addresses for only mask digits, 0 == equal.

 */

int rosecmpm(rose_address *addr1, rose_address *addr2, unsigned short mask)

int rosecmpm(const rose_address *addr1, const rose_address *addr2,

	     unsigned short mask)

{

	unsigned int i, j;

net/rose/rose_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int rose_set_mac_address(struct net_device *dev, void *addr) 
		if (err)

			return err;



		rose_del_loopback_node((rose_address *)dev->dev_addr);

		rose_del_loopback_node((const rose_address *)dev->dev_addr);

	}



	dev_addr_set(dev, sa->sa_data);
@@ -78,7 +78,7 @@ static int rose_open(struct net_device *dev) 
{

	int err;



	err = rose_add_loopback_node((rose_address *)dev->dev_addr);

	err = rose_add_loopback_node((const rose_address *)dev->dev_addr);

	if (err)

		return err;
@@ -90,7 +90,7 @@ static int rose_open(struct net_device *dev) 
static int rose_close(struct net_device *dev)

{

	netif_stop_queue(dev);

	rose_del_loopback_node((rose_address *)dev->dev_addr);

	rose_del_loopback_node((const rose_address *)dev->dev_addr);

	return 0;

}

net/rose/rose_route.c

+6 −4
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ void rose_add_loopback_neigh(void) 
/*

 *	Add a loopback node.

 */

int rose_add_loopback_node(rose_address *address)

int rose_add_loopback_node(const rose_address *address)

{

	struct rose_node *rose_node;

	int err = 0;
@@ -446,7 +446,7 @@ int rose_add_loopback_node(rose_address *address) 
/*

 *	Delete a loopback node.

 */

void rose_del_loopback_node(rose_address *address)

void rose_del_loopback_node(const rose_address *address)

{

	struct rose_node *rose_node;
@@ -629,7 +629,8 @@ struct net_device *rose_dev_get(rose_address *addr) 


	rcu_read_lock();

	for_each_netdev_rcu(&init_net, dev) {

		if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE && rosecmp(addr, (rose_address *)dev->dev_addr) == 0) {

		if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE &&

		    rosecmp(addr, (const rose_address *)dev->dev_addr) == 0) {

			dev_hold(dev);

			goto out;

		}
@@ -646,7 +647,8 @@ static int rose_dev_exists(rose_address *addr) 


	rcu_read_lock();

	for_each_netdev_rcu(&init_net, dev) {

		if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE && rosecmp(addr, (rose_address *)dev->dev_addr) == 0)

		if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE &&

		    rosecmp(addr, (const rose_address *)dev->dev_addr) == 0)

			goto out;

	}

	dev = NULL;