|
@@ -29,9 +29,10 @@
|
|
|
#include "hard-interface.h"
|
|
|
|
|
|
|
|
|
-static struct sk_buff *frag_merge_packet(struct list_head *head,
|
|
|
- struct frag_packet_list_entry *tfp,
|
|
|
- struct sk_buff *skb)
|
|
|
+static struct sk_buff *
|
|
|
+batadv_frag_merge_packet(struct list_head *head,
|
|
|
+ struct frag_packet_list_entry *tfp,
|
|
|
+ struct sk_buff *skb)
|
|
|
{
|
|
|
struct unicast_frag_packet *up =
|
|
|
(struct unicast_frag_packet *)skb->data;
|
|
@@ -75,7 +76,8 @@ err:
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
-static void frag_create_entry(struct list_head *head, struct sk_buff *skb)
|
|
|
+static void batadv_frag_create_entry(struct list_head *head,
|
|
|
+ struct sk_buff *skb)
|
|
|
{
|
|
|
struct frag_packet_list_entry *tfp;
|
|
|
struct unicast_frag_packet *up =
|
|
@@ -91,7 +93,7 @@ static void frag_create_entry(struct list_head *head, struct sk_buff *skb)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-static int frag_create_buffer(struct list_head *head)
|
|
|
+static int batadv_frag_create_buffer(struct list_head *head)
|
|
|
{
|
|
|
int i;
|
|
|
struct frag_packet_list_entry *tfp;
|
|
@@ -111,8 +113,9 @@ static int frag_create_buffer(struct list_head *head)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
|
|
|
- const struct unicast_frag_packet *up)
|
|
|
+static struct frag_packet_list_entry *
|
|
|
+batadv_frag_search_packet(struct list_head *head,
|
|
|
+ const struct unicast_frag_packet *up)
|
|
|
{
|
|
|
struct frag_packet_list_entry *tfp;
|
|
|
struct unicast_frag_packet *tmp_up = NULL;
|
|
@@ -188,22 +191,22 @@ int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
|
|
|
orig_node->last_frag_packet = jiffies;
|
|
|
|
|
|
if (list_empty(&orig_node->frag_list) &&
|
|
|
- frag_create_buffer(&orig_node->frag_list)) {
|
|
|
+ batadv_frag_create_buffer(&orig_node->frag_list)) {
|
|
|
pr_debug("couldn't create frag buffer\n");
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- tmp_frag_entry = frag_search_packet(&orig_node->frag_list,
|
|
|
- unicast_packet);
|
|
|
+ tmp_frag_entry = batadv_frag_search_packet(&orig_node->frag_list,
|
|
|
+ unicast_packet);
|
|
|
|
|
|
if (!tmp_frag_entry) {
|
|
|
- frag_create_entry(&orig_node->frag_list, skb);
|
|
|
+ batadv_frag_create_entry(&orig_node->frag_list, skb);
|
|
|
ret = NET_RX_SUCCESS;
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- *new_skb = frag_merge_packet(&orig_node->frag_list, tmp_frag_entry,
|
|
|
- skb);
|
|
|
+ *new_skb = batadv_frag_merge_packet(&orig_node->frag_list,
|
|
|
+ tmp_frag_entry, skb);
|
|
|
/* if not, merge failed */
|
|
|
if (*new_skb)
|
|
|
ret = NET_RX_SUCCESS;
|