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

Commit 41ab6c48 authored by Antonio Quartulli's avatar Antonio Quartulli
Browse files

batman-adv: don't deal with NET_IP_ALIGN manually 



Instead of dealing with NET_IP_ALIGN during allocation and
headroom reservation, it is possible to use
netdev_alloc_skb_ip_align() which transparently allocate
and reserve the correct amount of data

Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent 3abe4adb

net/batman-adv/bat_iv_ogm.c

+3 −3
Original line number Diff line number Diff line
@@ -453,16 +453,16 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, 
	else

		skb_size = packet_len;



	skb_size += ETH_HLEN + NET_IP_ALIGN;

	skb_size += ETH_HLEN;



	forw_packet_aggr->skb = dev_alloc_skb(skb_size);

	forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size);

	if (!forw_packet_aggr->skb) {

		if (!own_packet)

			atomic_inc(&bat_priv->batman_queue_left);

		kfree(forw_packet_aggr);

		goto out;

	}

	skb_reserve(forw_packet_aggr->skb, ETH_HLEN + NET_IP_ALIGN);

	skb_reserve(forw_packet_aggr->skb, ETH_HLEN);



	INIT_HLIST_NODE(&forw_packet_aggr->list);

net/batman-adv/icmp_socket.c

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

		packet_len = sizeof(struct batadv_icmp_packet_rr);



	skb = dev_alloc_skb(packet_len + ETH_HLEN + NET_IP_ALIGN);

	skb = netdev_alloc_skb_ip_align(NULL, packet_len + ETH_HLEN);

	if (!skb) {

		len = -ENOMEM;

		goto out;

	}



	skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);

	skb_reserve(skb, ETH_HLEN);

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



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

net/batman-adv/translation-table.c

+10 −10
Original line number Diff line number Diff line
@@ -1607,11 +1607,11 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, 
	tt_tot = tt_len / sizeof(struct batadv_tt_change);



	len = tt_query_size + tt_len;

	skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);

	skb = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);

	if (!skb)

		goto out;



	skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);

	skb_reserve(skb, ETH_HLEN);

	tt_response = (struct batadv_tt_query_packet *)skb_put(skb, len);

	tt_response->ttvn = ttvn;
@@ -1672,11 +1672,11 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv, 
	if (!tt_req_node)

		goto out;



	skb = dev_alloc_skb(sizeof(*tt_request) + ETH_HLEN + NET_IP_ALIGN);

	skb = netdev_alloc_skb_ip_align(NULL, sizeof(*tt_request) + ETH_HLEN);

	if (!skb)

		goto out;



	skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);

	skb_reserve(skb, ETH_HLEN);



	tt_req_len = sizeof(*tt_request);

	tt_request = (struct batadv_tt_query_packet *)skb_put(skb, tt_req_len);
@@ -1769,11 +1769,11 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, 
		tt_tot = tt_len / sizeof(struct batadv_tt_change);



		len = sizeof(*tt_response) + tt_len;

		skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);

		skb = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);

		if (!skb)

			goto unlock;



		skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);

		skb_reserve(skb, ETH_HLEN);

		packet_pos = skb_put(skb, len);

		tt_response = (struct batadv_tt_query_packet *)packet_pos;

		tt_response->ttvn = req_ttvn;
@@ -1885,11 +1885,11 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv, 
		tt_tot = tt_len / sizeof(struct batadv_tt_change);



		len = sizeof(*tt_response) + tt_len;

		skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);

		skb = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);

		if (!skb)

			goto unlock;



		skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);

		skb_reserve(skb, ETH_HLEN);

		packet_pos = skb_put(skb, len);

		tt_response = (struct batadv_tt_query_packet *)packet_pos;

		tt_response->ttvn = req_ttvn;
@@ -2219,11 +2219,11 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, 
	if (!batadv_tt_check_roam_count(bat_priv, client))

		goto out;



	skb = dev_alloc_skb(sizeof(*roam_adv_packet) + ETH_HLEN + NET_IP_ALIGN);

	skb = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);

	if (!skb)

		goto out;



	skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);

	skb_reserve(skb, ETH_HLEN);



	roam_adv_packet = (struct batadv_roam_adv_packet *)skb_put(skb, len);

net/batman-adv/vis.c

+6 −6
Original line number Diff line number Diff line
@@ -392,12 +392,12 @@ batadv_add_packet(struct batadv_priv *bat_priv, 
		return NULL;



	len = sizeof(*packet) + vis_info_len;

	info->skb_packet = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);

	info->skb_packet = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);

	if (!info->skb_packet) {

		kfree(info);

		return NULL;

	}

	skb_reserve(info->skb_packet, ETH_HLEN + NET_IP_ALIGN);

	skb_reserve(info->skb_packet, ETH_HLEN);

	packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len);



	kref_init(&info->refcount);
@@ -854,13 +854,13 @@ int batadv_vis_init(struct batadv_priv *bat_priv) 
	if (!bat_priv->vis.my_info)

		goto err;



	len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE;

	len += ETH_HLEN + NET_IP_ALIGN;

	bat_priv->vis.my_info->skb_packet = dev_alloc_skb(len);

	len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE + ETH_HLEN;

	bat_priv->vis.my_info->skb_packet = netdev_alloc_skb_ip_align(NULL,

								      len);

	if (!bat_priv->vis.my_info->skb_packet)

		goto free_info;



	skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN + NET_IP_ALIGN);

	skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN);

	tmp_skb = bat_priv->vis.my_info->skb_packet;

	packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet));