diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 13:48:58 +0200 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-25 08:21:30 +0200 |
| commit | 1eda58bfc56c43e73a0cf2bfb6e4d620ab866109 (patch) | |
| tree | d71ba63d988193126831e49bdce03a1131d28ea4 /net/batman-adv/main.c | |
| parent | f0530ee5fb9e73465ac844ada2c96a2bea85a18f (diff) | |
| download | linux-3.10-1eda58bfc56c43e73a0cf2bfb6e4d620ab866109.tar.gz linux-3.10-1eda58bfc56c43e73a0cf2bfb6e4d620ab866109.tar.bz2 linux-3.10-1eda58bfc56c43e73a0cf2bfb6e4d620ab866109.zip | |
batman-adv: Prefix main 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/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index d56d6b2e192..e4564306453 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -180,7 +180,7 @@ int batadv_is_my_mac(const uint8_t *addr) if (hard_iface->if_status != IF_ACTIVE) continue; - if (compare_eth(hard_iface->net_dev->dev_addr, addr)) { + if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) { rcu_read_unlock(); return 1; } @@ -238,9 +238,9 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, batman_ogm_packet = (struct batman_ogm_packet *)skb->data; if (batman_ogm_packet->header.version != COMPAT_VERSION) { - bat_dbg(DBG_BATMAN, bat_priv, - "Drop packet: incompatible batman version (%i)\n", - batman_ogm_packet->header.version); + batadv_dbg(DBG_BATMAN, bat_priv, + "Drop packet: incompatible batman version (%i)\n", + batman_ogm_packet->header.version); goto err_free; } |