From patchwork Thu Sep 16 22:00:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Langer X-Patchwork-Id: 384 Return-Path: Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by open-mesh.org (Postfix) with SMTP id 64D72154473 for ; Fri, 17 Sep 2010 00:00:42 +0200 (CEST) Received: (qmail invoked by alias); 16 Sep 2010 22:00:42 -0000 Received: from 91-65-48-151-dynip.superkabel.de (EHLO localhost) [91.65.48.151] by mail.gmx.net (mp072) with SMTP; 17 Sep 2010 00:00:42 +0200 X-Authenticated: #9260637 X-Provags-ID: V01U2FsdGVkX19hPZghcdBheeHt4VtZv4NKALE78tE329NCs1VvjD lxvgqsdOffs1en From: Andreas Langer To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 17 Sep 2010 00:00:06 +0200 Message-Id: <1284674410-15477-2-git-send-email-an.langer@gmx.de> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <20100916235908.51ab3bfc@rechenknecht> References: <20100916235908.51ab3bfc@rechenknecht> X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: add frag_ prefix to all fragmentation related functions X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 22:00:48 -0000 Signed-off-by: Andreas Langer --- batman-adv/routing.c | 8 ++++---- batman-adv/unicast.c | 12 ++++++------ batman-adv/unicast.h | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/batman-adv/routing.c b/batman-adv/routing.c index 603a932..a0936ca 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -1245,24 +1245,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) diff --git a/batman-adv/unicast.c b/batman-adv/unicast.c index 750f10e..23a9373 100644 --- a/batman-adv/unicast.c +++ b/batman-adv/unicast.c @@ -30,9 +30,9 @@ #include "hard-interface.h" -struct sk_buff *merge_frag_packet(struct list_head *head, - struct frag_packet_list_entry *tfp, - struct sk_buff *skb) +static struct sk_buff *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; @@ -63,7 +63,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 = @@ -79,7 +79,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; @@ -100,7 +100,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; diff --git a/batman-adv/unicast.h b/batman-adv/unicast.h index 7973697..b50d61b 100644 --- a/batman-adv/unicast.h +++ b/batman-adv/unicast.h @@ -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);