Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e071c79 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix packet defines with BATADV_ 



Reported-by: default avatarMartin Hundebøll <martin@hundeboll.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent 64346643

net/batman-adv/bat_iv_ogm.c

+10 −10
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int batadv_iv_ogm_iface_enable(struct hard_iface *hard_iface) 
	get_random_bytes(&random_seqno, sizeof(random_seqno));

	atomic_set(&hard_iface->seqno, random_seqno);



	hard_iface->packet_len = BATMAN_OGM_HLEN;

	hard_iface->packet_len = BATADV_OGM_HLEN;

	hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC);



	if (!hard_iface->packet_buff)
@@ -72,7 +72,7 @@ static int batadv_iv_ogm_iface_enable(struct hard_iface *hard_iface) 


	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;

	batman_ogm_packet->header.packet_type = BAT_IV_OGM;

	batman_ogm_packet->header.version = COMPAT_VERSION;

	batman_ogm_packet->header.version = BATADV_COMPAT_VERSION;

	batman_ogm_packet->header.ttl = 2;

	batman_ogm_packet->flags = NO_FLAGS;

	batman_ogm_packet->tq = TQ_MAX_VALUE;
@@ -139,7 +139,7 @@ static int batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len, 
{

	int next_buff_pos = 0;



	next_buff_pos += buff_pos + BATMAN_OGM_HLEN;

	next_buff_pos += buff_pos + BATADV_OGM_HLEN;

	next_buff_pos += batadv_tt_len(tt_num_changes);



	return (next_buff_pos <= packet_len) &&
@@ -191,7 +191,7 @@ static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet, 
			   batman_ogm_packet->ttvn, hard_iface->net_dev->name,

			   hard_iface->net_dev->dev_addr);



		buff_pos += BATMAN_OGM_HLEN;

		buff_pos += BATADV_OGM_HLEN;

		buff_pos += batadv_tt_len(batman_ogm_packet->tt_num_changes);

		packet_num++;

		batman_ogm_packet = (struct batman_ogm_packet *)
@@ -561,7 +561,7 @@ static void batadv_iv_ogm_forward(struct orig_node *orig_node, 
		batman_ogm_packet->flags &= ~DIRECTLINK;



	batadv_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet,

				BATMAN_OGM_HLEN + batadv_tt_len(tt_num_changes),

				BATADV_OGM_HLEN + batadv_tt_len(tt_num_changes),

				if_incoming, 0, batadv_iv_ogm_fwd_send_time());

}
@@ -579,7 +579,7 @@ static void batadv_iv_ogm_schedule(struct hard_iface *hard_iface) 
		tt_num_changes = batadv_tt_append_diff(bat_priv,

						       &hard_iface->packet_buff,

						       &hard_iface->packet_len,

						       BATMAN_OGM_HLEN);

						       BATADV_OGM_HLEN);



	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;
@@ -1025,7 +1025,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
	}

	rcu_read_unlock();



	if (batman_ogm_packet->header.version != COMPAT_VERSION) {

	if (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION) {

		batadv_dbg(DBG_BATMAN, bat_priv,

			   "Drop packet: incompatible batman version (%i)\n",

			   batman_ogm_packet->header.version);
@@ -1227,7 +1227,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 
	unsigned char *tt_buff, *packet_buff;

	bool ret;



	ret = batadv_check_management_packet(skb, if_incoming, BATMAN_OGM_HLEN);

	ret = batadv_check_management_packet(skb, if_incoming, BATADV_OGM_HLEN);

	if (!ret)

		return NET_RX_DROP;
@@ -1248,12 +1248,12 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 


	/* unpack the aggregated packets and process them one by one */

	do {

		tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN;

		tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN;



		batadv_iv_ogm_process(ethhdr, batman_ogm_packet, tt_buff,

				      if_incoming);



		buff_pos += BATMAN_OGM_HLEN;

		buff_pos += BATADV_OGM_HLEN;

		buff_pos += batadv_tt_len(batman_ogm_packet->tt_num_changes);



		batman_ogm_packet = (struct batman_ogm_packet *)

net/batman-adv/hard-interface.c

+2 −1
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ int batadv_hardif_enable_interface(struct hard_iface *hard_iface, 
{

	struct bat_priv *bat_priv;

	struct net_device *soft_iface;

	__be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);

	int ret;



	if (hard_iface->if_status != IF_NOT_IN_USE)
@@ -309,7 +310,7 @@ int batadv_hardif_enable_interface(struct hard_iface *hard_iface, 
	hard_iface->if_status = IF_INACTIVE;

	batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces);



	hard_iface->batman_adv_ptype.type = __constant_htons(ETH_P_BATMAN);

	hard_iface->batman_adv_ptype.type = ethertype;

	hard_iface->batman_adv_ptype.func = batadv_batman_skb_recv;

	hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;

	dev_add_pack(&hard_iface->batman_adv_ptype);

net/batman-adv/icmp_socket.c

+2 −2
Original line number Diff line number Diff line
@@ -203,9 +203,9 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, 


	icmp_packet->uid = socket_client->index;



	if (icmp_packet->header.version != COMPAT_VERSION) {

	if (icmp_packet->header.version != BATADV_COMPAT_VERSION) {

		icmp_packet->msg_type = PARAMETER_PROBLEM;

		icmp_packet->header.version = COMPAT_VERSION;

		icmp_packet->header.version = BATADV_COMPAT_VERSION;

		batadv_socket_add_packet(socket_client, icmp_packet,

					 packet_len);

		goto free_skb;

net/batman-adv/main.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int __init batadv_init(void) 
	register_netdevice_notifier(&batadv_hard_if_notifier);



	pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n",

		SOURCE_VERSION, COMPAT_VERSION);

		SOURCE_VERSION, BATADV_COMPAT_VERSION);



	return 0;

}
@@ -238,7 +238,7 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, 


	batman_ogm_packet = (struct batman_ogm_packet *)skb->data;



	if (batman_ogm_packet->header.version != COMPAT_VERSION) {

	if (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION) {

		batadv_dbg(DBG_BATMAN, bat_priv,

			   "Drop packet: incompatible batman version (%i)\n",

			   batman_ogm_packet->header.version);

net/batman-adv/packet.h

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#ifndef _NET_BATMAN_ADV_PACKET_H_

#define _NET_BATMAN_ADV_PACKET_H_



#define ETH_P_BATMAN  0x4305	/* unofficial/not registered Ethertype */

#define BATADV_ETH_P_BATMAN  0x4305 /* unofficial/not registered Ethertype */



enum bat_packettype {

	BAT_IV_OGM	 = 0x01,
@@ -34,7 +34,7 @@ enum bat_packettype { 
};



/* this file is included by batctl which needs these defines */

#define COMPAT_VERSION 14

#define BATADV_COMPAT_VERSION 14



enum batman_iv_flags {

	NOT_BEST_NEXT_HOP   = 1 << 3,
@@ -65,7 +65,7 @@ enum unicast_frag_flags { 
};



/* TT_QUERY subtypes */

#define TT_QUERY_TYPE_MASK 0x3

#define BATADV_TT_QUERY_TYPE_MASK 0x3



enum tt_query_packettype {

	TT_REQUEST    = 0,
@@ -126,7 +126,7 @@ struct batman_ogm_packet { 
	__be16   tt_crc;

} __packed;



#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet)

#define BATADV_OGM_HLEN sizeof(struct batman_ogm_packet)



struct icmp_packet {

	struct batman_header header;
@@ -138,7 +138,7 @@ struct icmp_packet { 
	uint8_t  reserved;

} __packed;



#define BAT_RR_LEN 16

#define BATADV_RR_LEN 16



/* icmp_packet_rr must start with all fields from imcp_packet

 * as this is assumed by code that handles ICMP packets
@@ -151,7 +151,7 @@ struct icmp_packet_rr { 
	__be16   seqno;

	uint8_t  uid;

	uint8_t  rr_cur;

	uint8_t  rr[BAT_RR_LEN][ETH_ALEN];

	uint8_t  rr[BATADV_RR_LEN][ETH_ALEN];

} __packed;



struct unicast_packet {