diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-31 13:24:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-31 13:24:56 -0800 |
| commit | a5e3c2aae23a3719105c1ae662c67ef282f213db (patch) | |
| tree | f951e78782757dfc2d4b7015601f65101ac2ef73 /net/batman-adv/hard-interface.c | |
| parent | 6b28ff3be829a851378551245fd6b3f9bf93b0ad (diff) | |
| parent | 091b948306d2628320e77977eb7ae4a757b12180 (diff) | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/hard-interface.c')
| -rw-r--r-- | net/batman-adv/hard-interface.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 4f95777ce08..f2131f45aa9 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@ -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; |