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

Commit 0d125074 authored by Antonio Quartulli's avatar Antonio Quartulli
Browse files

batman-adv: use ETH_HLEN instead of sizeof(struct ethhdr) 



Instead of using sizeof(struct ethhdr) it is strongly recommended to use the
kernel macro ETH_HLEN. This patch substitute each occurrence of the former
expressione with the latter one.

Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent 1eeb479f

net/batman-adv/bat_iv_ogm.c

+3 −4
Original line number Diff line number Diff line
@@ -355,10 +355,9 @@ static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff, 
	if ((atomic_read(&bat_priv->aggregated_ogms)) &&

	    (packet_len < MAX_AGGREGATION_BYTES))

		forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES +

						      sizeof(struct ethhdr));

						      ETH_HLEN);

	else

		forw_packet_aggr->skb = dev_alloc_skb(packet_len +

						      sizeof(struct ethhdr));

		forw_packet_aggr->skb = dev_alloc_skb(packet_len + ETH_HLEN);



	if (!forw_packet_aggr->skb) {

		if (!own_packet)
@@ -366,7 +365,7 @@ static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff, 
		kfree(forw_packet_aggr);

		goto out;

	}

	skb_reserve(forw_packet_aggr->skb, sizeof(struct ethhdr));

	skb_reserve(forw_packet_aggr->skb, ETH_HLEN);



	INIT_HLIST_NODE(&forw_packet_aggr->list);

net/batman-adv/bridge_loop_avoidance.c

+4 −6
Original line number Diff line number Diff line
@@ -290,9 +290,7 @@ static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac, 
		goto out;



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

	hw_src = (uint8_t *)ethhdr +

		 sizeof(struct ethhdr) +

		 sizeof(struct arphdr);

	hw_src = (uint8_t *)ethhdr + ETH_HLEN + sizeof(struct arphdr);



	/* now we pretend that the client would have sent this ... */

	switch (claimtype) {
@@ -340,7 +338,7 @@ static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac, 
	skb_reset_mac_header(skb);

	skb->protocol = eth_type_trans(skb, soft_iface);

	bat_priv->stats.rx_packets++;

	bat_priv->stats.rx_bytes += skb->len + sizeof(struct ethhdr);

	bat_priv->stats.rx_bytes += skb->len + ETH_HLEN;

	soft_iface->last_rx = jiffies;



	netif_rx(skb);
@@ -844,7 +842,7 @@ static int bla_process_claim(struct bat_priv *bat_priv, 
		headlen = sizeof(*vhdr);

	} else {

		proto = ntohs(ethhdr->h_proto);

		headlen = sizeof(*ethhdr);

		headlen = ETH_HLEN;

	}



	if (proto != ETH_P_ARP)
@@ -1302,7 +1300,7 @@ int bla_is_backbone_gw(struct sk_buff *skb, 
		return 0;



	/* first, find out the vid. */

	if (!pskb_may_pull(skb, hdr_size + sizeof(struct ethhdr)))

	if (!pskb_may_pull(skb, hdr_size + ETH_HLEN))

		return 0;



	ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size);

net/batman-adv/hard-interface.c

+1 −2
Original line number Diff line number Diff line
@@ -574,8 +574,7 @@ static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, 
		goto err_free;



	/* expect a valid ethernet header here. */

	if (unlikely(skb->mac_len != sizeof(struct ethhdr) ||

		     !skb_mac_header(skb)))

	if (unlikely(skb->mac_len != ETH_HLEN || !skb_mac_header(skb)))

		goto err_free;



	if (!hard_iface->soft_iface)

net/batman-adv/icmp_socket.c

+2 −2
Original line number Diff line number Diff line
@@ -175,13 +175,13 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, 
	if (len >= sizeof(struct icmp_packet_rr))

		packet_len = sizeof(struct icmp_packet_rr);



	skb = dev_alloc_skb(packet_len + sizeof(struct ethhdr));

	skb = dev_alloc_skb(packet_len + ETH_HLEN);

	if (!skb) {

		len = -ENOMEM;

		goto out;

	}



	skb_reserve(skb, sizeof(struct ethhdr));

	skb_reserve(skb, ETH_HLEN);

	icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len);



	if (copy_from_user(icmp_packet, buff, packet_len)) {

net/batman-adv/routing.c

+4 −4
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, 
		goto out;



	/* create a copy of the skb, if needed, to modify it. */

	if (skb_cow(skb, sizeof(struct ethhdr)) < 0)

	if (skb_cow(skb, ETH_HLEN) < 0)

		goto out;



	icmp_packet = (struct icmp_packet_rr *)skb->data;
@@ -368,7 +368,7 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, 
		goto out;



	/* create a copy of the skb, if needed, to modify it. */

	if (skb_cow(skb, sizeof(struct ethhdr)) < 0)

	if (skb_cow(skb, ETH_HLEN) < 0)

		goto out;



	icmp_packet = (struct icmp_packet *)skb->data;
@@ -454,7 +454,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if) 
		goto out;



	/* create a copy of the skb, if needed, to modify it. */

	if (skb_cow(skb, sizeof(struct ethhdr)) < 0)

	if (skb_cow(skb, ETH_HLEN) < 0)

		goto out;



	icmp_packet = (struct icmp_packet_rr *)skb->data;
@@ -841,7 +841,7 @@ static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) 
		goto out;



	/* create a copy of the skb, if needed, to modify it. */

	if (skb_cow(skb, sizeof(struct ethhdr)) < 0)

	if (skb_cow(skb, ETH_HLEN) < 0)

		goto out;



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