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

Commit e204a345 authored by Rami Rosen's avatar Rami Rosen Committed by David S. Miller
Browse files

ipv4: cleanup - remove two unused parameters from fib_semantic_match(). 



Signed-off-by: default avatarRami Rosen <ramirose@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 450c4ea1

net/ipv4/fib_hash.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -263,7 +263,6 @@ fn_hash_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result 




			err = fib_semantic_match(&f->fn_alias,

			err = fib_semantic_match(&f->fn_alias,

						 flp, res,

						 flp, res,

						 f->fn_key, fz->fz_mask,

						 fz->fz_order);

						 fz->fz_order);

			if (err <= 0)

			if (err <= 0)

				goto out;

				goto out;

net/ipv4/fib_lookup.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,7 @@ struct fib_alias { 
/* Exported by fib_semantics.c */

/* Exported by fib_semantics.c */

extern int fib_semantic_match(struct list_head *head,

extern int fib_semantic_match(struct list_head *head,

			      const struct flowi *flp,

			      const struct flowi *flp,

			      struct fib_result *res, __be32 zone, __be32 mask,

			      struct fib_result *res, int prefixlen);

				int prefixlen);

extern void fib_release_info(struct fib_info *);

extern void fib_release_info(struct fib_info *);

extern struct fib_info *fib_create_info(struct fib_config *cfg);

extern struct fib_info *fib_create_info(struct fib_config *cfg);

extern int fib_nh_match(struct fib_config *cfg, struct fib_info *fi);

extern int fib_nh_match(struct fib_config *cfg, struct fib_info *fi);

net/ipv4/fib_semantics.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -866,8 +866,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg) 




/* Note! fib_semantic_match intentionally uses  RCU list functions. */

/* Note! fib_semantic_match intentionally uses  RCU list functions. */

int fib_semantic_match(struct list_head *head, const struct flowi *flp,

int fib_semantic_match(struct list_head *head, const struct flowi *flp,

		       struct fib_result *res, __be32 zone, __be32 mask,

		       struct fib_result *res, int prefixlen)

			int prefixlen)

{

{

	struct fib_alias *fa;

	struct fib_alias *fa;

	int nh_sel = 0;

	int nh_sel = 0;

net/ipv4/fib_trie.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1347,8 +1347,7 @@ static int check_leaf(struct trie *t, struct leaf *l, 
		if (l->key != (key & ntohl(mask)))

		if (l->key != (key & ntohl(mask)))

			continue;

			continue;





		err = fib_semantic_match(&li->falh, flp, res,

		err = fib_semantic_match(&li->falh, flp, res, plen);

					 htonl(l->key), mask, plen);





#ifdef CONFIG_IP_FIB_TRIE_STATS

#ifdef CONFIG_IP_FIB_TRIE_STATS

		if (err <= 0)

		if (err <= 0)