diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-16 14:23:22 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-28 02:44:48 -0400 |
commit | 3e34819e0eafaa6c873e9704bb478c0cdd6bb481 (patch) | |
tree | b8f8d24ca23a92bd235ae06342e33ddab7811508 /net/batman-adv/hard-interface.c | |
parent | ee11ad61f232c201ba62990aa490264220f834cd (diff) |
batman-adv: Prefix remaining function like macros with batadv_
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/hard-interface.c')
-rw-r--r-- | net/batman-adv/hard-interface.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index c22c145d8224..c1ba6e28a96c 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c | |||
@@ -234,8 +234,8 @@ static void batadv_hardif_activate_interface(struct hard_iface *hard_iface) | |||
234 | if (!primary_if) | 234 | if (!primary_if) |
235 | batadv_primary_if_select(bat_priv, hard_iface); | 235 | batadv_primary_if_select(bat_priv, hard_iface); |
236 | 236 | ||
237 | bat_info(hard_iface->soft_iface, "Interface activated: %s\n", | 237 | batadv_info(hard_iface->soft_iface, "Interface activated: %s\n", |
238 | hard_iface->net_dev->name); | 238 | hard_iface->net_dev->name); |
239 | 239 | ||
240 | batadv_update_min_mtu(hard_iface->soft_iface); | 240 | batadv_update_min_mtu(hard_iface->soft_iface); |
241 | 241 | ||
@@ -252,8 +252,8 @@ static void batadv_hardif_deactivate_interface(struct hard_iface *hard_iface) | |||
252 | 252 | ||
253 | hard_iface->if_status = IF_INACTIVE; | 253 | hard_iface->if_status = IF_INACTIVE; |
254 | 254 | ||
255 | bat_info(hard_iface->soft_iface, "Interface deactivated: %s\n", | 255 | batadv_info(hard_iface->soft_iface, "Interface deactivated: %s\n", |
256 | hard_iface->net_dev->name); | 256 | hard_iface->net_dev->name); |
257 | 257 | ||
258 | batadv_update_min_mtu(hard_iface->soft_iface); | 258 | batadv_update_min_mtu(hard_iface->soft_iface); |
259 | } | 259 | } |
@@ -315,29 +315,29 @@ int batadv_hardif_enable_interface(struct hard_iface *hard_iface, | |||
315 | dev_add_pack(&hard_iface->batman_adv_ptype); | 315 | dev_add_pack(&hard_iface->batman_adv_ptype); |
316 | 316 | ||
317 | atomic_set(&hard_iface->frag_seqno, 1); | 317 | atomic_set(&hard_iface->frag_seqno, 1); |
318 | bat_info(hard_iface->soft_iface, "Adding interface: %s\n", | 318 | batadv_info(hard_iface->soft_iface, "Adding interface: %s\n", |
319 | hard_iface->net_dev->name); | 319 | hard_iface->net_dev->name); |
320 | 320 | ||
321 | if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < | 321 | if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < |
322 | ETH_DATA_LEN + BAT_HEADER_LEN) | 322 | ETH_DATA_LEN + BAT_HEADER_LEN) |
323 | bat_info(hard_iface->soft_iface, | 323 | batadv_info(hard_iface->soft_iface, |
324 | "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to %zi would solve the problem.\n", | 324 | "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to %zi would solve the problem.\n", |
325 | hard_iface->net_dev->name, hard_iface->net_dev->mtu, | 325 | hard_iface->net_dev->name, hard_iface->net_dev->mtu, |
326 | ETH_DATA_LEN + BAT_HEADER_LEN); | 326 | ETH_DATA_LEN + BAT_HEADER_LEN); |
327 | 327 | ||
328 | if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < | 328 | if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < |
329 | ETH_DATA_LEN + BAT_HEADER_LEN) | 329 | ETH_DATA_LEN + BAT_HEADER_LEN) |
330 | bat_info(hard_iface->soft_iface, | 330 | batadv_info(hard_iface->soft_iface, |
331 | "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. If you experience problems getting traffic through try increasing the MTU to %zi.\n", | 331 | "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. If you experience problems getting traffic through try increasing the MTU to %zi.\n", |
332 | hard_iface->net_dev->name, hard_iface->net_dev->mtu, | 332 | hard_iface->net_dev->name, hard_iface->net_dev->mtu, |
333 | ETH_DATA_LEN + BAT_HEADER_LEN); | 333 | ETH_DATA_LEN + BAT_HEADER_LEN); |
334 | 334 | ||
335 | if (batadv_hardif_is_iface_up(hard_iface)) | 335 | if (batadv_hardif_is_iface_up(hard_iface)) |
336 | batadv_hardif_activate_interface(hard_iface); | 336 | batadv_hardif_activate_interface(hard_iface); |
337 | else | 337 | else |
338 | bat_err(hard_iface->soft_iface, | 338 | batadv_err(hard_iface->soft_iface, |
339 | "Not using interface %s (retrying later): interface not active\n", | 339 | "Not using interface %s (retrying later): interface not active\n", |
340 | hard_iface->net_dev->name); | 340 | hard_iface->net_dev->name); |
341 | 341 | ||
342 | /* begin scheduling originator messages on that interface */ | 342 | /* begin scheduling originator messages on that interface */ |
343 | batadv_schedule_bat_ogm(hard_iface); | 343 | batadv_schedule_bat_ogm(hard_iface); |
@@ -363,8 +363,8 @@ void batadv_hardif_disable_interface(struct hard_iface *hard_iface) | |||
363 | if (hard_iface->if_status != IF_INACTIVE) | 363 | if (hard_iface->if_status != IF_INACTIVE) |
364 | goto out; | 364 | goto out; |
365 | 365 | ||
366 | bat_info(hard_iface->soft_iface, "Removing interface: %s\n", | 366 | batadv_info(hard_iface->soft_iface, "Removing interface: %s\n", |
367 | hard_iface->net_dev->name); | 367 | hard_iface->net_dev->name); |
368 | dev_remove_pack(&hard_iface->batman_adv_ptype); | 368 | dev_remove_pack(&hard_iface->batman_adv_ptype); |
369 | 369 | ||
370 | bat_priv->num_ifaces--; | 370 | bat_priv->num_ifaces--; |