diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 07:48:54 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-24 12:41:41 -0400 |
commit | e5d89254bf763da35b42a3c65289c9962f7240c2 (patch) | |
tree | 1e981f14fc7d386e4f848e7fbf822f9a773fc2ed /net/batman-adv/soft-interface.c | |
parent | 9b4a1159dff76f938aa64f7000621552e4d9ad18 (diff) |
batman-adv: Prefix hard-interface static inline functions with batadv_
All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
-rw-r--r-- | net/batman-adv/soft-interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 0658781febde..85fe9c1ce5bc 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -199,7 +199,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) | |||
199 | 199 | ||
200 | /* ethernet packet should be broadcasted */ | 200 | /* ethernet packet should be broadcasted */ |
201 | if (do_bcast) { | 201 | if (do_bcast) { |
202 | primary_if = primary_if_get_selected(bat_priv); | 202 | primary_if = batadv_primary_if_get_selected(bat_priv); |
203 | if (!primary_if) | 203 | if (!primary_if) |
204 | goto dropped; | 204 | goto dropped; |
205 | 205 | ||
@@ -253,7 +253,7 @@ dropped_freed: | |||
253 | bat_priv->stats.tx_dropped++; | 253 | bat_priv->stats.tx_dropped++; |
254 | end: | 254 | end: |
255 | if (primary_if) | 255 | if (primary_if) |
256 | hardif_free_ref(primary_if); | 256 | batadv_hardif_free_ref(primary_if); |
257 | return NETDEV_TX_OK; | 257 | return NETDEV_TX_OK; |
258 | } | 258 | } |
259 | 259 | ||