Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c17860a0 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[IPV4]: no need pass pointer to a default into fib_detect_death 



ipv4: no need pass pointer to a default into fib_detect_death

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Acked-by: default avatarAlexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e5449c2

net/ipv4/fib_hash.c

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib 
				if (next_fi != res->fi)

					break;

			} else if (!fib_detect_death(fi, order, &last_resort,

						     &last_idx, &fn_hash_last_dflt)) {

						     &last_idx, fn_hash_last_dflt)) {

				if (res->fi)

					fib_info_put(res->fi);

				res->fi = fi;
@@ -332,7 +332,7 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib 
		goto out;

	}



	if (!fib_detect_death(fi, order, &last_resort, &last_idx, &fn_hash_last_dflt)) {

	if (!fib_detect_death(fi, order, &last_resort, &last_idx, fn_hash_last_dflt)) {

		if (res->fi)

			fib_info_put(res->fi);

		res->fi = fi;

net/ipv4/fib_lookup.h

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,6 @@ extern struct fib_alias *fib_find_alias(struct list_head *fah, 
					u8 tos, u32 prio);

extern int fib_detect_death(struct fib_info *fi, int order,

			    struct fib_info **last_resort,

			    int *last_idx, int *dflt);

			    int *last_idx, int dflt);



#endif /* _FIB_LOOKUP_H */

net/ipv4/fib_semantics.c

+3 −3
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ struct fib_alias *fib_find_alias(struct list_head *fah, u8 tos, u32 prio) 
}



int fib_detect_death(struct fib_info *fi, int order,

		     struct fib_info **last_resort, int *last_idx, int *dflt)

		     struct fib_info **last_resort, int *last_idx, int dflt)

{

	struct neighbour *n;

	int state = NUD_NONE;
@@ -358,10 +358,10 @@ int fib_detect_death(struct fib_info *fi, int order, 
	}

	if (state==NUD_REACHABLE)

		return 0;

	if ((state&NUD_VALID) && order != *dflt)

	if ((state&NUD_VALID) && order != dflt)

		return 0;

	if ((state&NUD_VALID) ||

	    (*last_idx<0 && order > *dflt)) {

	    (*last_idx<0 && order > dflt)) {

		*last_resort = fi;

		*last_idx = order;

	}

net/ipv4/fib_trie.c

+2 −2
Original line number Diff line number Diff line
@@ -1830,7 +1830,7 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib 
			if (next_fi != res->fi)

				break;

		} else if (!fib_detect_death(fi, order, &last_resort,

					     &last_idx, &trie_last_dflt)) {

					     &last_idx, trie_last_dflt)) {

			if (res->fi)

				fib_info_put(res->fi);

			res->fi = fi;
@@ -1846,7 +1846,7 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib 
		goto out;

	}



	if (!fib_detect_death(fi, order, &last_resort, &last_idx, &trie_last_dflt)) {

	if (!fib_detect_death(fi, order, &last_resort, &last_idx, trie_last_dflt)) {

		if (res->fi)

			fib_info_put(res->fi);

		res->fi = fi;