Commit 47ce5f1e authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

batman-adv: prepare for const netdev->dev_addr 



netdev->dev_addr will be constant soon, make sure
the qualifier is propagated thru batman-adv.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 818a76a5

net/batman-adv/bridge_loop_avoidance.c

+7 −7
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ batadv_claim_hash_find(struct batadv_priv *bat_priv, 
 * Return: backbone gateway if found or NULL otherwise

 */

static struct batadv_bla_backbone_gw *

batadv_backbone_hash_find(struct batadv_priv *bat_priv, u8 *addr,

batadv_backbone_hash_find(struct batadv_priv *bat_priv, const u8 *addr,

			  unsigned short vid)

{

	struct batadv_hashtable *hash = bat_priv->bla.backbone_hash;
@@ -336,7 +336,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) 
 * @vid: the VLAN ID

 * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)

 */

static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,

static void batadv_bla_send_claim(struct batadv_priv *bat_priv, const u8 *mac,

				  unsigned short vid, int claimtype)

{

	struct sk_buff *skb;
@@ -488,7 +488,7 @@ static void batadv_bla_loopdetect_report(struct work_struct *work) 
 * Return: the (possibly created) backbone gateway or NULL on error

 */

static struct batadv_bla_backbone_gw *

batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig,

batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, const u8 *orig,

			   unsigned short vid, bool own_backbone)

{

	struct batadv_bla_backbone_gw *entry;
@@ -926,7 +926,7 @@ static bool batadv_handle_request(struct batadv_priv *bat_priv, 
 */

static bool batadv_handle_unclaim(struct batadv_priv *bat_priv,

				  struct batadv_hard_iface *primary_if,

				  u8 *backbone_addr, u8 *claim_addr,

				  const u8 *backbone_addr, const u8 *claim_addr,

				  unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;
@@ -964,7 +964,7 @@ static bool batadv_handle_unclaim(struct batadv_priv *bat_priv, 
 */

static bool batadv_handle_claim(struct batadv_priv *bat_priv,

				struct batadv_hard_iface *primary_if,

				u8 *backbone_addr, u8 *claim_addr,

				const u8 *backbone_addr, const u8 *claim_addr,

				unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;
@@ -2126,7 +2126,7 @@ batadv_bla_claim_dump_entry(struct sk_buff *msg, u32 portid, 
			    struct batadv_hard_iface *primary_if,

			    struct batadv_bla_claim *claim)

{

	u8 *primary_addr = primary_if->net_dev->dev_addr;

	const u8 *primary_addr = primary_if->net_dev->dev_addr;

	u16 backbone_crc;

	bool is_own;

	void *hdr;
@@ -2294,7 +2294,7 @@ batadv_bla_backbone_dump_entry(struct sk_buff *msg, u32 portid, 
			       struct batadv_hard_iface *primary_if,

			       struct batadv_bla_backbone_gw *backbone_gw)

{

	u8 *primary_addr = primary_if->net_dev->dev_addr;

	const u8 *primary_addr = primary_if->net_dev->dev_addr;

	u16 backbone_crc;

	bool is_own;

	int msecs;

net/batman-adv/routing.c

+2 −1
Original line number Diff line number Diff line
@@ -747,7 +747,8 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, 
	struct batadv_orig_node *orig_node = NULL;

	struct batadv_hard_iface *primary_if = NULL;

	bool ret = false;

	u8 *orig_addr, orig_ttvn;

	const u8 *orig_addr;

	u8 orig_ttvn;



	if (batadv_is_my_client(bat_priv, dst_addr, vid)) {

		primary_if = batadv_primary_if_get_selected(bat_priv);

net/batman-adv/tp_meter.c

+1 −1
Original line number Diff line number Diff line
@@ -631,9 +631,9 @@ static void batadv_tp_recv_ack(struct batadv_priv *bat_priv, 
	struct batadv_orig_node *orig_node = NULL;

	const struct batadv_icmp_tp_packet *icmp;

	struct batadv_tp_vars *tp_vars;

	const unsigned char *dev_addr;

	size_t packet_len, mss;

	u32 rtt, recv_ack, cwnd;

	unsigned char *dev_addr;



	packet_len = BATADV_TP_PLEN;

	mss = BATADV_TP_PLEN;

net/batman-adv/tvlv.c

+2 −2
Original line number Diff line number Diff line
@@ -587,8 +587,8 @@ void batadv_tvlv_handler_unregister(struct batadv_priv *bat_priv, 
 * @tvlv_value: tvlv content

 * @tvlv_value_len: tvlv content length

 */

void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src,

			      u8 *dst, u8 type, u8 version,

void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, const u8 *src,

			      const u8 *dst, u8 type, u8 version,

			      void *tvlv_value, u16 tvlv_value_len)

{

	struct batadv_unicast_tvlv_packet *unicast_tvlv_packet;

net/batman-adv/tvlv.h

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, 
				   struct batadv_orig_node *orig_node,

				   u8 *src, u8 *dst,

				   void *tvlv_buff, u16 tvlv_buff_len);

void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src,

			      u8 *dst, u8 type, u8 version,

void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, const u8 *src,

			      const u8 *dst, u8 type, u8 version,

			      void *tvlv_value, u16 tvlv_value_len);



#endif /* _NET_BATMAN_ADV_TVLV_H_ */