summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/bat_iv_ogm.c
diff options
context:
space:
mode:
authorSven Eckelmann2017-06-18 09:59:28 +0200
committerSimon Wunderlich2017-07-29 09:51:27 +0200
commite04de4861cdebdfaa13507ad3d40e6542aeab857 (patch)
treed341f54072c2be6369312c1c7c9507460de1ebda /net/batman-adv/bat_iv_ogm.c
parentbatman-adv: Remove too short %pM printk field width (diff)
downloadkernel-qcow2-linux-e04de4861cdebdfaa13507ad3d40e6542aeab857.tar.gz
kernel-qcow2-linux-e04de4861cdebdfaa13507ad3d40e6542aeab857.tar.xz
kernel-qcow2-linux-e04de4861cdebdfaa13507ad3d40e6542aeab857.zip
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: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv/bat_iv_ogm.c')
-rw-r--r--net/batman-adv/bat_iv_ogm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index c27001d38574..83ba5483455a 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -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++;