From: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org
Subject: [PATCH 10/13] batman-adv: Remove declaration of batman_skb_recv
Date: Sat, 29 Jan 2011 22:47:37 +0100 [thread overview]
Message-ID: <1296337660-12376-11-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1296337660-12376-1-git-send-email-sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
batman_skb_recv can be defined in hard-interface.c as static because it is
never used outside of that file.
Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
---
net/batman-adv/hard-interface.c | 11 +++++++++--
net/batman-adv/hard-interface.h | 4 ----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 4f95777..8a9cf7a 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -34,6 +34,12 @@
/* protect update critical side of if_list - but not the content */
static DEFINE_SPINLOCK(if_list_lock);
+
+static int batman_skb_recv(struct sk_buff *skb,
+ struct net_device *dev,
+ struct packet_type *ptype,
+ struct net_device *orig_dev);
+
static void hardif_free_rcu(struct rcu_head *rcu)
{
struct batman_if *batman_if;
@@ -549,8 +555,9 @@ out:
/* receive a packet with the batman ethertype coming on a hard
* interface */
-int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
- struct packet_type *ptype, struct net_device *orig_dev)
+static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
+ struct packet_type *ptype,
+ struct net_device *orig_dev)
{
struct bat_priv *bat_priv;
struct batman_packet *batman_packet;
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index 30ec3b8..a42f5a4 100644
--- a/net/batman-adv/hard-interface.h
+++ b/net/batman-adv/hard-interface.h
@@ -35,10 +35,6 @@ struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev);
int hardif_enable_interface(struct batman_if *batman_if, char *iface_name);
void hardif_disable_interface(struct batman_if *batman_if);
void hardif_remove_interfaces(void);
-int batman_skb_recv(struct sk_buff *skb,
- struct net_device *dev,
- struct packet_type *ptype,
- struct net_device *orig_dev);
int hardif_min_mtu(struct net_device *soft_iface);
void update_min_mtu(struct net_device *soft_iface);
--
1.7.2.3
next prev parent reply other threads:[~2011-01-29 21:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-29 21:47 pull request: batman-adv 2011-01-29 Sven Eckelmann
[not found] ` <1296337660-12376-1-git-send-email-sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
2011-01-29 21:47 ` [PATCH 01/13] batman-adv: Fix kernel panic when fetching vis data on a vis server Sven Eckelmann
2011-01-29 21:47 ` [PATCH 02/13] batman-adv: Create roughly equal sized fragments Sven Eckelmann
2011-01-29 21:47 ` [PATCH 03/13] batman-adv: Calculate correct size for merged packets Sven Eckelmann
2011-01-29 21:47 ` [PATCH 04/13] batman-adv: Remove vis info on hashing errors Sven Eckelmann
2011-01-29 21:47 ` [PATCH 05/13] batman-adv: Remove vis info element in free_info Sven Eckelmann
2011-01-29 21:47 ` [PATCH 06/13] batman-adv: Make vis info stack traversal threadsafe Sven Eckelmann
2011-01-29 21:47 ` [PATCH 07/13] batman-adv: remove unused parameters Sven Eckelmann
2011-01-29 21:47 ` [PATCH 08/13] batman-adv: Remove dangling declaration of hash_remove_element Sven Eckelmann
2011-01-29 21:47 ` [PATCH 09/13] batman-adv: Remove unused definitions Sven Eckelmann
2011-01-29 21:47 ` Sven Eckelmann [this message]
2011-01-29 21:47 ` [PATCH 11/13] batman-adv: Remove unused variables Sven Eckelmann
2011-01-29 21:47 ` [PATCH 12/13] batman-adv: Update copyright years Sven Eckelmann
2011-01-29 21:47 ` [PATCH 13/13] batman-adv: Merge README of v2011.0.0 release Sven Eckelmann
2011-01-30 3:08 ` pull request: batman-adv 2011-01-29 David Miller
[not found] ` <20110129.190815.226768755.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2011-01-30 9:36 ` Sven Eckelmann
2011-01-30 9:38 ` [PATCH 1/4] batman-adv: Fix kernel panic when fetching vis data on a vis server Sven Eckelmann
2011-01-30 9:38 ` [PATCH 2/4] batman-adv: Remove vis info on hashing errors Sven Eckelmann
2011-01-30 9:38 ` [PATCH 3/4] batman-adv: Remove vis info element in free_info Sven Eckelmann
2011-01-30 9:38 ` [PATCH 4/4] batman-adv: Make vis info stack traversal threadsafe Sven Eckelmann
[not found] ` <201101301036.57928.sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
2011-01-30 11:56 ` pull request: batman-adv 2011-01-29 David Miller
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=1296337660-12376-11-git-send-email-sven@narfation.org \
--to=sven-kadoipu9uxwei8dpzvb4nw@public.gmane.org \
--cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).