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/routing.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/routing.c')
-rw-r--r-- | net/batman-adv/routing.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index e7ee40d6d609..1b8f67744e23 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
@@ -922,6 +922,7 @@ static int batadv_check_unicast_ttvn(struct bat_priv *bat_priv, | |||
922 | struct hard_iface *primary_if; | 922 | struct hard_iface *primary_if; |
923 | struct unicast_packet *unicast_packet; | 923 | struct unicast_packet *unicast_packet; |
924 | bool tt_poss_change; | 924 | bool tt_poss_change; |
925 | int is_old_ttvn; | ||
925 | 926 | ||
926 | /* I could need to modify it */ | 927 | /* I could need to modify it */ |
927 | if (skb_cow(skb, sizeof(struct unicast_packet)) < 0) | 928 | if (skb_cow(skb, sizeof(struct unicast_packet)) < 0) |
@@ -945,7 +946,8 @@ static int batadv_check_unicast_ttvn(struct bat_priv *bat_priv, | |||
945 | } | 946 | } |
946 | 947 | ||
947 | /* Check whether I have to reroute the packet */ | 948 | /* Check whether I have to reroute the packet */ |
948 | if (seq_before(unicast_packet->ttvn, curr_ttvn) || tt_poss_change) { | 949 | is_old_ttvn = batadv_seq_before(unicast_packet->ttvn, curr_ttvn); |
950 | if (is_old_ttvn || tt_poss_change) { | ||
949 | /* check if there is enough data before accessing it */ | 951 | /* check if there is enough data before accessing it */ |
950 | if (pskb_may_pull(skb, sizeof(struct unicast_packet) + | 952 | if (pskb_may_pull(skb, sizeof(struct unicast_packet) + |
951 | ETH_HLEN) < 0) | 953 | ETH_HLEN) < 0) |