diff options
author | Steffen Klassert <steffen.klassert@secunet.com> | 2012-03-21 19:32:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-22 19:29:58 -0400 |
commit | 26b2072e7536e57995b2867d057fbb32ecfe498d (patch) | |
tree | edc4ae4dd3a01a1b2059a723b699f4b8c266db2e /net/xfrm | |
parent | f0229eaaf3f82522e2b16b41b0f45bb84a88d1b0 (diff) |
xfrm: Remove unused xfrm_state from xfrm_state_check_space
The xfrm_state argument is unused in this function, so remove it.
Also the name xfrm_state_check_space does not really match what this
function does. It actually checks if we have enough head and tailroom
on the skb. So we rename the function to xfrm_skb_check_space.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 47bacd8c0250..95a338c89f99 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | static int xfrm_output2(struct sk_buff *skb); | 22 | static int xfrm_output2(struct sk_buff *skb); |
23 | 23 | ||
24 | static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb) | 24 | static int xfrm_skb_check_space(struct sk_buff *skb) |
25 | { | 25 | { |
26 | struct dst_entry *dst = skb_dst(skb); | 26 | struct dst_entry *dst = skb_dst(skb); |
27 | int nhead = dst->header_len + LL_RESERVED_SPACE(dst->dev) | 27 | int nhead = dst->header_len + LL_RESERVED_SPACE(dst->dev) |
@@ -48,7 +48,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err) | |||
48 | goto resume; | 48 | goto resume; |
49 | 49 | ||
50 | do { | 50 | do { |
51 | err = xfrm_state_check_space(x, skb); | 51 | err = xfrm_skb_check_space(skb); |
52 | if (err) { | 52 | if (err) { |
53 | XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTERROR); | 53 | XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTERROR); |
54 | goto error_nolock; | 54 | goto error_nolock; |