From: Steffen Klassert Date: Wed, 21 Mar 2012 23:32:39 +0000 (+0000) Subject: xfrm: Remove unused xfrm_state from xfrm_state_check_space X-Git-Tag: firefly_0821_release~3680^2~3245^2~15 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=26b2072e7536e57995b2867d057fbb32ecfe498d;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: David S. Miller --- 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 @@ static int xfrm_output2(struct sk_buff *skb); -static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb) +static int xfrm_skb_check_space(struct sk_buff *skb) { struct dst_entry *dst = skb_dst(skb); 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) goto resume; do { - err = xfrm_state_check_space(x, skb); + err = xfrm_skb_check_space(skb); if (err) { XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTERROR); goto error_nolock;