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/vis.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/vis.c')
| -rw-r--r-- | net/batman-adv/vis.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index 20eef04645bd..619f0a5a8484 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c | |||
| @@ -208,7 +208,7 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset) | |||
| 208 | size_t buff_pos, buf_size; | 208 | size_t buff_pos, buf_size; |
| 209 | char *buff; | 209 | char *buff; |
| 210 | 210 | ||
| 211 | primary_if = primary_if_get_selected(bat_priv); | 211 | primary_if = batadv_primary_if_get_selected(bat_priv); |
| 212 | if (!primary_if) | 212 | if (!primary_if) |
| 213 | goto out; | 213 | goto out; |
| 214 | 214 | ||
| @@ -329,7 +329,7 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset) | |||
| 329 | 329 | ||
| 330 | out: | 330 | out: |
| 331 | if (primary_if) | 331 | if (primary_if) |
| 332 | hardif_free_ref(primary_if); | 332 | batadv_hardif_free_ref(primary_if); |
| 333 | return ret; | 333 | return ret; |
| 334 | } | 334 | } |
| 335 | 335 | ||
| @@ -828,7 +828,7 @@ static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info) | |||
| 828 | struct hard_iface *primary_if; | 828 | struct hard_iface *primary_if; |
| 829 | struct vis_packet *packet; | 829 | struct vis_packet *packet; |
| 830 | 830 | ||
| 831 | primary_if = primary_if_get_selected(bat_priv); | 831 | primary_if = batadv_primary_if_get_selected(bat_priv); |
| 832 | if (!primary_if) | 832 | if (!primary_if) |
| 833 | goto out; | 833 | goto out; |
| 834 | 834 | ||
| @@ -849,7 +849,7 @@ static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info) | |||
| 849 | 849 | ||
| 850 | out: | 850 | out: |
| 851 | if (primary_if) | 851 | if (primary_if) |
| 852 | hardif_free_ref(primary_if); | 852 | batadv_hardif_free_ref(primary_if); |
| 853 | } | 853 | } |
| 854 | 854 | ||
| 855 | /* called from timer; send (and maybe generate) vis packet. */ | 855 | /* called from timer; send (and maybe generate) vis packet. */ |