The following commit has been merged in the master branch: commit db69ecfcb0d4df4d6449172186a8dd20836275ed Author: Sven Eckelmann sven@narfation.org Date: Wed Jun 15 15:17:21 2011 +0200

batman-adv: Keep interface_tx as local function

interface_tx is not used outside of soft-interface.c and thus doesn't need to be declared inside soft-interface.h

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index b8d3f248..0fc997e 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -553,7 +553,7 @@ static int interface_change_mtu(struct net_device *dev, int new_mtu) return 0; }

-int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) +static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) { struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct bat_priv *bat_priv = netdev_priv(soft_iface); diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index c24906d..001546f 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -25,7 +25,6 @@ int my_skb_head_push(struct sk_buff *skb, unsigned int len); int softif_neigh_seq_print_text(struct seq_file *seq, void *offset); void softif_neigh_purge(struct bat_priv *bat_priv); -int interface_tx(struct sk_buff *skb, struct net_device *soft_iface); void interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct hard_iface *recv_if, int hdr_size);