From: Andreas Langer <an.langer@gmx.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: add frag_ prefix to all fragmentation related functions
Date: Fri, 17 Sep 2010 00:00:06 +0200 [thread overview]
Message-ID: <1284674410-15477-2-git-send-email-an.langer@gmx.de> (raw)
In-Reply-To: <20100916235908.51ab3bfc@rechenknecht>
Signed-off-by: Andreas Langer <an.langer at gmx.de>
---
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);
--
1.7.0.4
next prev parent reply other threads:[~2010-09-16 22:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-16 21:59 [B.A.T.M.A.N.] batman-adv: unicast fragmentation enhancements Andreas Langer
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: restructure fragmentation to handle batman unicast packets Andreas Langer
2010-09-16 22:00 ` Andreas Langer [this message]
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: move skb reassembly of fragmented packets into dedicated function Andreas Langer
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 4/6] batman-adv:remove redundant is_my_mac() check in route_unicast_packet - callers deal with it Andreas Langer
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: fragment forwarded packets Andreas Langer
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: reassemble fragmented skb if mtu allows it Andreas Langer
2010-09-16 22:43 ` Andreas Langer
2010-09-16 22:27 ` [B.A.T.M.A.N.] batman-adv: unicast fragmentation enhancements Sven Eckelmann
2010-09-17 14:48 ` Andy Whitcroft
2010-09-17 14:54 ` Sven Eckelmann
2010-09-25 10:13 ` Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284674410-15477-2-git-send-email-an.langer@gmx.de \
--to=an.langer@gmx.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).