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

Commit 8bbde32c authored by Andreas Langer's avatar Andreas Langer Committed by Greg Kroah-Hartman
Browse files

Staging: batman-adv: add frag_ prefix to all fragmentation related functions

parent 49b588e7
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -1231,24 +1231,24 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
		orig_node->last_frag_packet = jiffies;

		if (list_empty(&orig_node->frag_list) &&
			create_frag_buffer(&orig_node->frag_list)) {
			frag_create_buffer(&orig_node->frag_list)) {
			spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
					       flags);
			return NET_RX_DROP;
		}

		tmp_frag_entry =
			search_frag_packet(&orig_node->frag_list,
			frag_search_packet(&orig_node->frag_list,
					   unicast_packet);

		if (!tmp_frag_entry) {
			create_frag_entry(&orig_node->frag_list, skb);
			frag_create_entry(&orig_node->frag_list, skb);
			spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
					       flags);
			return NET_RX_SUCCESS;
		}

		skb = merge_frag_packet(&orig_node->frag_list,
		skb = frag_merge_packet(&orig_node->frag_list,
					tmp_frag_entry, skb);
		spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
		if (!skb)
+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@
#include "hard-interface.h"


struct sk_buff *merge_frag_packet(struct list_head *head,
struct sk_buff *frag_merge_packet(struct list_head *head,
				  struct frag_packet_list_entry *tfp,
				  struct sk_buff *skb)
{
@@ -62,7 +62,7 @@ struct sk_buff *merge_frag_packet(struct list_head *head,
	return skb;
}

void create_frag_entry(struct list_head *head, struct sk_buff *skb)
void frag_create_entry(struct list_head *head, struct sk_buff *skb)
{
	struct frag_packet_list_entry *tfp;
	struct unicast_frag_packet *up =
@@ -78,7 +78,7 @@ void create_frag_entry(struct list_head *head, struct sk_buff *skb)
	return;
}

int create_frag_buffer(struct list_head *head)
int frag_create_buffer(struct list_head *head)
{
	int i;
	struct frag_packet_list_entry *tfp;
@@ -99,7 +99,7 @@ int create_frag_buffer(struct list_head *head)
	return 0;
}

struct frag_packet_list_entry *search_frag_packet(struct list_head *head,
struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
						 struct unicast_frag_packet *up)
{
	struct frag_packet_list_entry *tfp;
+4 −4
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@
#define FRAG_TIMEOUT 10000	/* purge frag list entrys after time in ms */
#define FRAG_BUFFER_SIZE 6	/* number of list elements in buffer */

struct sk_buff *merge_frag_packet(struct list_head *head,
struct sk_buff *frag_merge_packet(struct list_head *head,
	struct frag_packet_list_entry *tfp,
	struct sk_buff *skb);

void create_frag_entry(struct list_head *head, struct sk_buff *skb);
int create_frag_buffer(struct list_head *head);
struct frag_packet_list_entry *search_frag_packet(struct list_head *head,
void frag_create_entry(struct list_head *head, struct sk_buff *skb);
int frag_create_buffer(struct list_head *head);
struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
	struct unicast_frag_packet *up);
void frag_list_free(struct list_head *head);
int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);