diff options
author | Sven Eckelmann <sven@narfation.org> | 2011-01-27 13:16:08 +0100 |
---|---|---|
committer | Sven Eckelmann <sven@narfation.org> | 2011-01-31 14:57:11 +0100 |
commit | fb86d7648ffdfc8778db2cd70d4bc5c6093e04c5 (patch) | |
tree | e0820a3e8ed8b924a8baca47019f04a0fd373e5f | |
parent | 335f94c981248e9f326986e0ac8d31f187ffeed0 (diff) | |
download | blackbird-op-linux-fb86d7648ffdfc8778db2cd70d4bc5c6093e04c5.tar.gz blackbird-op-linux-fb86d7648ffdfc8778db2cd70d4bc5c6093e04c5.zip |
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.c | 11 | ||||
-rw-r--r-- | 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 4f95777ce080..8a9cf7a81e79 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 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); 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); |