aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-24 01:53:13 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-24 02:07:49 -0500
commit1f673c5fe2eca9007e60d82186473aa94090ea4c (patch)
tree6026ca7cd114d0b809ddde5f313d52907fd3f561 /net
parent9aa600889be2f6a6a5fed85a33d4530920662965 (diff)
xfrm: Remove unused 'saddr' and 'daddr' args to xfrm_state_look_at.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_state.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 8a57a1ee538c..9d9ac7ca3dd4 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -754,7 +754,6 @@ static void xfrm_hash_grow_check(struct net *net, int have_hash_collision)
754 754
755static void xfrm_state_look_at(struct xfrm_policy *pol, struct xfrm_state *x, 755static void xfrm_state_look_at(struct xfrm_policy *pol, struct xfrm_state *x,
756 const struct flowi *fl, unsigned short family, 756 const struct flowi *fl, unsigned short family,
757 xfrm_address_t *daddr, xfrm_address_t *saddr,
758 struct xfrm_state **best, int *acq_in_progress, 757 struct xfrm_state **best, int *acq_in_progress,
759 int *error) 758 int *error)
760{ 759{
@@ -820,7 +819,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
820 tmpl->mode == x->props.mode && 819 tmpl->mode == x->props.mode &&
821 tmpl->id.proto == x->id.proto && 820 tmpl->id.proto == x->id.proto &&
822 (tmpl->id.spi == x->id.spi || !tmpl->id.spi)) 821 (tmpl->id.spi == x->id.spi || !tmpl->id.spi))
823 xfrm_state_look_at(pol, x, fl, encap_family, daddr, saddr, 822 xfrm_state_look_at(pol, x, fl, encap_family,
824 &best, &acquire_in_progress, &error); 823 &best, &acquire_in_progress, &error);
825 } 824 }
826 if (best) 825 if (best)
@@ -836,7 +835,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
836 tmpl->mode == x->props.mode && 835 tmpl->mode == x->props.mode &&
837 tmpl->id.proto == x->id.proto && 836 tmpl->id.proto == x->id.proto &&
838 (tmpl->id.spi == x->id.spi || !tmpl->id.spi)) 837 (tmpl->id.spi == x->id.spi || !tmpl->id.spi))
839 xfrm_state_look_at(pol, x, fl, encap_family, daddr, saddr, 838 xfrm_state_look_at(pol, x, fl, encap_family,
840 &best, &acquire_in_progress, &error); 839 &best, &acquire_in_progress, &error);
841 } 840 }
842 841