diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-06-03 16:19:19 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-07-01 16:47:18 -0400 |
commit | e9a4f295ebe06b00d6af5597c0cea78c315c2ebc (patch) | |
tree | bf1866658a3c111f714173a02a14c253b4b5e1c0 /net/batman-adv/bat_iv_ogm.c | |
parent | cd646ab1e2edde9faeff52bbc1b40e58a5e381fc (diff) |
batman-adv: Prefix hard-interface enum with BATADV_
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/bat_iv_ogm.c')
-rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index d3fc58172c8b..a59e317284ad 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c | |||
@@ -165,7 +165,7 @@ static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet, | |||
165 | struct batman_ogm_packet *batman_ogm_packet; | 165 | struct batman_ogm_packet *batman_ogm_packet; |
166 | struct sk_buff *skb; | 166 | struct sk_buff *skb; |
167 | 167 | ||
168 | if (hard_iface->if_status != IF_ACTIVE) | 168 | if (hard_iface->if_status != BATADV_IF_ACTIVE) |
169 | return; | 169 | return; |
170 | 170 | ||
171 | packet_num = 0; | 171 | packet_num = 0; |
@@ -238,7 +238,7 @@ static void batadv_iv_ogm_emit(struct forw_packet *forw_packet) | |||
238 | soft_iface = forw_packet->if_incoming->soft_iface; | 238 | soft_iface = forw_packet->if_incoming->soft_iface; |
239 | bat_priv = netdev_priv(soft_iface); | 239 | bat_priv = netdev_priv(soft_iface); |
240 | 240 | ||
241 | if (forw_packet->if_incoming->if_status != IF_ACTIVE) | 241 | if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE) |
242 | goto out; | 242 | goto out; |
243 | 243 | ||
244 | primary_if = batadv_primary_if_get_selected(bat_priv); | 244 | primary_if = batadv_primary_if_get_selected(bat_priv); |
@@ -1017,7 +1017,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, | |||
1017 | 1017 | ||
1018 | rcu_read_lock(); | 1018 | rcu_read_lock(); |
1019 | list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { | 1019 | list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { |
1020 | if (hard_iface->if_status != IF_ACTIVE) | 1020 | if (hard_iface->if_status != BATADV_IF_ACTIVE) |
1021 | continue; | 1021 | continue; |
1022 | 1022 | ||
1023 | if (hard_iface->soft_iface != if_incoming->soft_iface) | 1023 | if (hard_iface->soft_iface != if_incoming->soft_iface) |