diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 07:48:58 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-25 02:21:30 -0400 |
commit | 1eda58bfc56c43e73a0cf2bfb6e4d620ab866109 (patch) | |
tree | d71ba63d988193126831e49bdce03a1131d28ea4 /net/batman-adv/main.c | |
parent | f0530ee5fb9e73465ac844ada2c96a2bea85a18f (diff) |
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 d56d6b2e1924..e4564306453c 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) | |||
180 | if (hard_iface->if_status != IF_ACTIVE) | 180 | if (hard_iface->if_status != IF_ACTIVE) |
181 | continue; | 181 | continue; |
182 | 182 | ||
183 | if (compare_eth(hard_iface->net_dev->dev_addr, addr)) { | 183 | if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) { |
184 | rcu_read_unlock(); | 184 | rcu_read_unlock(); |
185 | return 1; | 185 | return 1; |
186 | } | 186 | } |
@@ -238,9 +238,9 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, | |||
238 | batman_ogm_packet = (struct batman_ogm_packet *)skb->data; | 238 | batman_ogm_packet = (struct batman_ogm_packet *)skb->data; |
239 | 239 | ||
240 | if (batman_ogm_packet->header.version != COMPAT_VERSION) { | 240 | if (batman_ogm_packet->header.version != COMPAT_VERSION) { |
241 | bat_dbg(DBG_BATMAN, bat_priv, | 241 | batadv_dbg(DBG_BATMAN, bat_priv, |
242 | "Drop packet: incompatible batman version (%i)\n", | 242 | "Drop packet: incompatible batman version (%i)\n", |
243 | batman_ogm_packet->header.version); | 243 | batman_ogm_packet->header.version); |
244 | goto err_free; | 244 | goto err_free; |
245 | } | 245 | } |
246 | 246 | ||