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

Commit e04de486 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Remove variable deprecated by skb_put_data 



skb_put_data makes it unnecessary to store the skb_put return value to copy
some data to the packet. The returned pointer of skb_put_data should
therefore not stored by functions which previously only used it to copy
some data.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 6a04be8d

net/batman-adv/bat_iv_ogm.c

+1 −3
Original line number Diff line number Diff line
@@ -729,11 +729,9 @@ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, 
				    const unsigned char *packet_buff,

				    int packet_len, bool direct_link)

{

	unsigned char *skb_buff;

	unsigned long new_direct_link_flag;



	skb_buff = skb_put_data(forw_packet_aggr->skb, packet_buff,

				packet_len);

	skb_put_data(forw_packet_aggr->skb, packet_buff, packet_len);

	forw_packet_aggr->packet_len += packet_len;

	forw_packet_aggr->num_packets++;

net/batman-adv/bat_v_ogm.c

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void batadv_v_ogm_send(struct work_struct *work) 
	struct batadv_priv *bat_priv;

	struct batadv_ogm2_packet *ogm_packet;

	struct sk_buff *skb, *skb_tmp;

	unsigned char *ogm_buff, *pkt_buff;

	unsigned char *ogm_buff;

	int ogm_buff_len;

	u16 tvlv_len = 0;

	int ret;
@@ -166,7 +166,7 @@ static void batadv_v_ogm_send(struct work_struct *work) 
		goto reschedule;



	skb_reserve(skb, ETH_HLEN);

	pkt_buff = skb_put_data(skb, ogm_buff, ogm_buff_len);

	skb_put_data(skb, ogm_buff, ogm_buff_len);



	ogm_packet = (struct batadv_ogm2_packet *)skb->data;

	ogm_packet->seqno = htonl(atomic_read(&bat_priv->bat_v.ogm_seqno));