diff options
Diffstat (limited to 'net/batman-adv')
-rw-r--r-- | net/batman-adv/originator.c | 2 | ||||
-rw-r--r-- | net/batman-adv/unicast.c | 2 | ||||
-rw-r--r-- | net/batman-adv/unicast.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index bf9ec39a8349..1980696a7fd7 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c | |||
@@ -370,7 +370,7 @@ static void _batadv_purge_orig(struct bat_priv *bat_priv) | |||
370 | } | 370 | } |
371 | 371 | ||
372 | if (batadv_has_timed_out(orig_node->last_frag_packet, | 372 | if (batadv_has_timed_out(orig_node->last_frag_packet, |
373 | FRAG_TIMEOUT)) | 373 | BATADV_FRAG_TIMEOUT)) |
374 | batadv_frag_list_free(&orig_node->frag_list); | 374 | batadv_frag_list_free(&orig_node->frag_list); |
375 | } | 375 | } |
376 | spin_unlock_bh(list_lock); | 376 | spin_unlock_bh(list_lock); |
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c index c8da6b0acc38..809832026370 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c | |||
@@ -98,7 +98,7 @@ static int batadv_frag_create_buffer(struct list_head *head) | |||
98 | int i; | 98 | int i; |
99 | struct frag_packet_list_entry *tfp; | 99 | struct frag_packet_list_entry *tfp; |
100 | 100 | ||
101 | for (i = 0; i < FRAG_BUFFER_SIZE; i++) { | 101 | for (i = 0; i < BATADV_FRAG_BUFFER_SIZE; i++) { |
102 | tfp = kmalloc(sizeof(*tfp), GFP_ATOMIC); | 102 | tfp = kmalloc(sizeof(*tfp), GFP_ATOMIC); |
103 | if (!tfp) { | 103 | if (!tfp) { |
104 | batadv_frag_list_free(head); | 104 | batadv_frag_list_free(head); |
diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h index 9257b83534fd..936287f552ee 100644 --- a/net/batman-adv/unicast.h +++ b/net/batman-adv/unicast.h | |||
@@ -22,8 +22,8 @@ | |||
22 | 22 | ||
23 | #include "packet.h" | 23 | #include "packet.h" |
24 | 24 | ||
25 | #define FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */ | 25 | #define BATADV_FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */ |
26 | #define FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */ | 26 | #define BATADV_FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */ |
27 | 27 | ||
28 | int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv, | 28 | int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv, |
29 | struct sk_buff **new_skb); | 29 | struct sk_buff **new_skb); |