aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2011-01-27 07:16:08 -0500
committerSven Eckelmann <sven@narfation.org>2011-01-31 08:57:11 -0500
commitfb86d7648ffdfc8778db2cd70d4bc5c6093e04c5 (patch)
treee0820a3e8ed8b924a8baca47019f04a0fd373e5f
parent335f94c981248e9f326986e0ac8d31f187ffeed0 (diff)
batman-adv: Remove declaration of batman_skb_recv
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@narfation.org>
-rw-r--r--net/batman-adv/hard-interface.c11
-rw-r--r--net/batman-adv/hard-interface.h4
2 files changed, 9 insertions, 6 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 4f95777ce080..8a9cf7a81e79 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -34,6 +34,12 @@
34/* protect update critical side of if_list - but not the content */ 34/* protect update critical side of if_list - but not the content */
35static DEFINE_SPINLOCK(if_list_lock); 35static DEFINE_SPINLOCK(if_list_lock);
36 36
37
38static int batman_skb_recv(struct sk_buff *skb,
39 struct net_device *dev,
40 struct packet_type *ptype,
41 struct net_device *orig_dev);
42
37static void hardif_free_rcu(struct rcu_head *rcu) 43static void hardif_free_rcu(struct rcu_head *rcu)
38{ 44{
39 struct batman_if *batman_if; 45 struct batman_if *batman_if;
@@ -549,8 +555,9 @@ out:
549 555
550/* receive a packet with the batman ethertype coming on a hard 556/* receive a packet with the batman ethertype coming on a hard
551 * interface */ 557 * interface */
552int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, 558static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
553 struct packet_type *ptype, struct net_device *orig_dev) 559 struct packet_type *ptype,
560 struct net_device *orig_dev)
554{ 561{
555 struct bat_priv *bat_priv; 562 struct bat_priv *bat_priv;
556 struct batman_packet *batman_packet; 563 struct batman_packet *batman_packet;
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index 30ec3b8db459..a42f5a461d9f 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);
35int hardif_enable_interface(struct batman_if *batman_if, char *iface_name); 35int hardif_enable_interface(struct batman_if *batman_if, char *iface_name);
36void hardif_disable_interface(struct batman_if *batman_if); 36void hardif_disable_interface(struct batman_if *batman_if);
37void hardif_remove_interfaces(void); 37void hardif_remove_interfaces(void);
38int batman_skb_recv(struct sk_buff *skb,
39 struct net_device *dev,
40 struct packet_type *ptype,
41 struct net_device *orig_dev);
42int hardif_min_mtu(struct net_device *soft_iface); 38int hardif_min_mtu(struct net_device *soft_iface);
43void update_min_mtu(struct net_device *soft_iface); 39void update_min_mtu(struct net_device *soft_iface);
44 40