Commit bdf123b4 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: bridge: constify variables in the replay helpers 



Some of the arguments and local variables for the newly added switchdev
replay helpers can be const, so let's make them so.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d2cfbd4

include/linux/if_bridge.h

+7 −7
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ static inline bool br_multicast_router(const struct net_device *dev) 
{

	return false;

}

static inline int br_mdb_replay(struct net_device *br_dev,

				struct net_device *dev, const void *ctx,

static inline int br_mdb_replay(const struct net_device *br_dev,

				const struct net_device *dev, const void *ctx,

				struct notifier_block *nb,

				struct netlink_ext_ack *extack)

{
@@ -166,8 +166,8 @@ struct net_device *br_fdb_find_port(const struct net_device *br_dev, 
void br_fdb_clear_offload(const struct net_device *dev, u16 vid);

bool br_port_flag_is_set(const struct net_device *dev, unsigned long flag);

u8 br_port_get_stp_state(const struct net_device *dev);

clock_t br_get_ageing_time(struct net_device *br_dev);

int br_fdb_replay(struct net_device *br_dev, struct net_device *dev,

clock_t br_get_ageing_time(const struct net_device *br_dev);

int br_fdb_replay(const struct net_device *br_dev, const struct net_device *dev,

		  const void *ctx, struct notifier_block *nb);

#else

static inline struct net_device *
@@ -193,13 +193,13 @@ static inline u8 br_port_get_stp_state(const struct net_device *dev) 
	return BR_STATE_DISABLED;

}



static inline clock_t br_get_ageing_time(struct net_device *br_dev)

static inline clock_t br_get_ageing_time(const struct net_device *br_dev)

{

	return 0;

}



static inline int br_fdb_replay(struct net_device *br_dev,

				struct net_device *dev, const void *ctx,

static inline int br_fdb_replay(const struct net_device *br_dev,

				const struct net_device *dev, const void *ctx,

				struct notifier_block *nb)

{

	return -EOPNOTSUPP;

net/bridge/br_fdb.c

+3 −3
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ static inline size_t fdb_nlmsg_size(void) 
}



static int br_fdb_replay_one(struct notifier_block *nb,

			     struct net_bridge_fdb_entry *fdb,

			     const struct net_bridge_fdb_entry *fdb,

			     struct net_device *dev, const void *ctx)

{

	struct switchdev_notifier_fdb_info item;
@@ -745,7 +745,7 @@ static int br_fdb_replay_one(struct notifier_block *nb, 
	return notifier_to_errno(err);

}



int br_fdb_replay(struct net_device *br_dev, struct net_device *dev,

int br_fdb_replay(const struct net_device *br_dev, const struct net_device *dev,

		  const void *ctx, struct notifier_block *nb)

{

	struct net_bridge_fdb_entry *fdb;
@@ -760,7 +760,7 @@ int br_fdb_replay(struct net_device *br_dev, struct net_device *dev, 
	rcu_read_lock();



	hlist_for_each_entry_rcu(fdb, &br->fdb_list, fdb_node) {

		struct net_bridge_port *dst = READ_ONCE(fdb->dst);

		const struct net_bridge_port *dst = READ_ONCE(fdb->dst);

		struct net_device *dst_dev;



		dst_dev = dst ? dst->dev : br->dev;

net/bridge/br_mdb.c

+4 −4
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static void br_switchdev_mdb_populate(struct switchdev_obj_port_mdb *mdb, 
}



static int br_mdb_replay_one(struct notifier_block *nb, struct net_device *dev,

			     struct switchdev_obj_port_mdb *mdb,

			     const struct switchdev_obj_port_mdb *mdb,

			     const void *ctx, struct netlink_ext_ack *extack)

{

	struct switchdev_notifier_port_obj_info obj_info = {
@@ -607,7 +607,7 @@ int br_mdb_replay(struct net_device *br_dev, struct net_device *dev, 
		  const void *ctx, struct notifier_block *nb,

		  struct netlink_ext_ack *extack)

{

	struct net_bridge_mdb_entry *mp;

	const struct net_bridge_mdb_entry *mp;

	struct switchdev_obj *obj, *tmp;

	struct net_bridge *br;

	LIST_HEAD(mdb_list);
@@ -634,8 +634,8 @@ int br_mdb_replay(struct net_device *br_dev, struct net_device *dev, 
	rcu_read_lock();



	hlist_for_each_entry_rcu(mp, &br->mdb_list, mdb_node) {

		struct net_bridge_port_group __rcu **pp;

		struct net_bridge_port_group *p;

		struct net_bridge_port_group __rcu * const *pp;

		const struct net_bridge_port_group *p;



		if (mp->host_joined) {

			err = br_mdb_queue_one(&mdb_list,

net/bridge/br_stp.c

+2 −2
Original line number Diff line number Diff line
@@ -639,9 +639,9 @@ int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time) 
	return 0;

}



clock_t br_get_ageing_time(struct net_device *br_dev)

clock_t br_get_ageing_time(const struct net_device *br_dev)

{

	struct net_bridge *br;

	const struct net_bridge *br;



	if (!netif_is_bridge_master(br_dev))

		return 0;