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

Commit 4d5d2db8 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix unicast defines with BATADV_ 



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

net/batman-adv/originator.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static void _batadv_purge_orig(struct bat_priv *bat_priv) 
			}



			if (batadv_has_timed_out(orig_node->last_frag_packet,

						 FRAG_TIMEOUT))

						 BATADV_FRAG_TIMEOUT))

				batadv_frag_list_free(&orig_node->frag_list);

		}

		spin_unlock_bh(list_lock);

net/batman-adv/unicast.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int batadv_frag_create_buffer(struct list_head *head) 
	int i;

	struct frag_packet_list_entry *tfp;



	for (i = 0; i < FRAG_BUFFER_SIZE; i++) {

	for (i = 0; i < BATADV_FRAG_BUFFER_SIZE; i++) {

		tfp = kmalloc(sizeof(*tfp), GFP_ATOMIC);

		if (!tfp) {

			batadv_frag_list_free(head);

net/batman-adv/unicast.h

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 


#include "packet.h"



#define FRAG_TIMEOUT 10000	/* purge frag list entries after time in ms */

#define FRAG_BUFFER_SIZE 6	/* number of list elements in buffer */

#define BATADV_FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */

#define BATADV_FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */



int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,

			       struct sk_buff **new_skb);