diff options
author | Fan Du <fan.du@windriver.com> | 2012-08-14 22:13:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-15 18:13:30 -0400 |
commit | 65e0736bc2ac314bd374e93c24dd0698ac5ee66d (patch) | |
tree | 2cf89c8388186fe15ffb144e07d323fc216aa9f1 /net/key | |
parent | 1f07b62f3205f6ed41759df2892eaf433bc051a1 (diff) |
xfrm: remove redundant parameter "int dir" in struct xfrm_mgr.acquire
Sematically speaking, xfrm_mgr.acquire is called when kernel intends to ask
user space IKE daemon to negotiate SAs with peers. IOW the direction will
*always* be XFRM_POLICY_OUT, so remove int dir for clarity.
Signed-off-by: Fan Du <fan.du@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r-- | net/key/af_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 34e418508a67..ec7d161c129b 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -3024,7 +3024,7 @@ static u32 get_acqseq(void) | |||
3024 | return res; | 3024 | return res; |
3025 | } | 3025 | } |
3026 | 3026 | ||
3027 | static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *xp, int dir) | 3027 | static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *xp) |
3028 | { | 3028 | { |
3029 | struct sk_buff *skb; | 3029 | struct sk_buff *skb; |
3030 | struct sadb_msg *hdr; | 3030 | struct sadb_msg *hdr; |
@@ -3105,7 +3105,7 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct | |||
3105 | pol->sadb_x_policy_len = sizeof(struct sadb_x_policy)/sizeof(uint64_t); | 3105 | pol->sadb_x_policy_len = sizeof(struct sadb_x_policy)/sizeof(uint64_t); |
3106 | pol->sadb_x_policy_exttype = SADB_X_EXT_POLICY; | 3106 | pol->sadb_x_policy_exttype = SADB_X_EXT_POLICY; |
3107 | pol->sadb_x_policy_type = IPSEC_POLICY_IPSEC; | 3107 | pol->sadb_x_policy_type = IPSEC_POLICY_IPSEC; |
3108 | pol->sadb_x_policy_dir = dir+1; | 3108 | pol->sadb_x_policy_dir = XFRM_POLICY_OUT + 1; |
3109 | pol->sadb_x_policy_id = xp->index; | 3109 | pol->sadb_x_policy_id = xp->index; |
3110 | 3110 | ||
3111 | /* Set sadb_comb's. */ | 3111 | /* Set sadb_comb's. */ |