From d667f58c335a3048ffba874181b044c8fe75778e Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 15 Jun 2011 15:17:21 +0200 Subject: [PATCH] --- yaml --- r: 255604 b: refs/heads/master c: db69ecfcb0d4df4d6449172186a8dd20836275ed h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/batman-adv/soft-interface.c | 2 +- trunk/net/batman-adv/soft-interface.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 924e208fb73d..7ac962f33645 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8e2dd135c3d8b06a4bc6d52b69317bdcccf4605 +refs/heads/master: db69ecfcb0d4df4d6449172186a8dd20836275ed diff --git a/trunk/net/batman-adv/soft-interface.c b/trunk/net/batman-adv/soft-interface.c index b8d3f248efdc..0fc997e13251 100644 --- a/trunk/net/batman-adv/soft-interface.c +++ b/trunk/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/trunk/net/batman-adv/soft-interface.h b/trunk/net/batman-adv/soft-interface.h index c24906dd1d6a..001546fc96f1 100644 --- a/trunk/net/batman-adv/soft-interface.h +++ b/trunk/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);