mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

rose: constify dev_addr passing 

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2021-10-12 08:58:36 -07:00
parent c045ad2cc0
commit db95732446
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/net/rose.h
View File

@ -162,8 +162,8 @@ extern int sysctl_rose_link_fail_timeout;
extern int sysctl_rose_maximum_vcs; extern int sysctl_rose_maximum_vcs;
extern int sysctl_rose_window_size; extern int sysctl_rose_window_size;
int rosecmp(rose_address *, rose_address *); int rosecmp(const rose_address *, const rose_address *);
int rosecmpm(rose_address *, rose_address *, unsigned short); int rosecmpm(const rose_address *, const rose_address *, unsigned short);
char *rose2asc(char *buf, const rose_address *); char *rose2asc(char *buf, const rose_address *);
struct sock *rose_find_socket(unsigned int, struct rose_neigh *); struct sock *rose_find_socket(unsigned int, struct rose_neigh *);
void rose_kill_by_neigh(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; extern struct seq_operations rose_route_seqops;
void rose_add_loopback_neigh(void); void rose_add_loopback_neigh(void);
int __must_check rose_add_loopback_node(rose_address *); int __must_check rose_add_loopback_node(const rose_address *);
void rose_del_loopback_node(rose_address *); void rose_del_loopback_node(const rose_address *);
void rose_rt_device_down(struct net_device *); void rose_rt_device_down(struct net_device *);
void rose_link_device_down(struct net_device *); void rose_link_device_down(struct net_device *);
struct net_device *rose_dev_first(void); struct net_device *rose_dev_first(void);

5
net/rose/af_rose.c
View File

@ -109,7 +109,7 @@ char *rose2asc(char *buf, const rose_address *addr)
/* /*
* Compare two ROSE addresses, 0 == equal. * 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; int i;
@ -123,7 +123,8 @@ int rosecmp(rose_address *addr1, rose_address *addr2)
/* /*
* Compare two ROSE addresses for only mask digits, 0 == equal. * 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; unsigned int i, j;

6
net/rose/rose_dev.c
View File

@ -66,7 +66,7 @@ static int rose_set_mac_address(struct net_device *dev, void *addr)
if (err) if (err)
return 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); dev_addr_set(dev, sa->sa_data);
@ -78,7 +78,7 @@ static int rose_open(struct net_device *dev)
{ {
int err; 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) if (err)
return err; return err;
@ -90,7 +90,7 @@ static int rose_open(struct net_device *dev)
static int rose_close(struct net_device *dev) static int rose_close(struct net_device *dev)
{ {
netif_stop_queue(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; return 0;
} }

10
net/rose/rose_route.c
View File

@ -401,7 +401,7 @@ void rose_add_loopback_neigh(void)
/* /*
* Add a loopback node. * 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; struct rose_node *rose_node;
int err = 0; int err = 0;
@ -446,7 +446,7 @@ out:
/* /*
* Delete a loopback node. * 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; struct rose_node *rose_node;
@ -629,7 +629,8 @@ struct net_device *rose_dev_get(rose_address *addr)
rcu_read_lock(); rcu_read_lock();
for_each_netdev_rcu(&init_net, dev) { 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); dev_hold(dev);
goto out; goto out;
} }
@ -646,7 +647,8 @@ static int rose_dev_exists(rose_address *addr)
rcu_read_lock(); rcu_read_lock();
for_each_netdev_rcu(&init_net, dev) { 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; goto out;
} }
dev = NULL; dev = NULL;