* [PATCH] xfrm: Remove unused xfrm_state from xfrm_state_check_space
@ 2012-03-22 9:32 Steffen Klassert
2012-03-22 23:30 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Steffen Klassert @ 2012-03-22 9:32 UTC (permalink / raw)
To: David Miller; +Cc: Herbert Xu, netdev
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>
---
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 47bacd8..95a338c 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;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] xfrm: Remove unused xfrm_state from xfrm_state_check_space
2012-03-22 9:32 [PATCH] xfrm: Remove unused xfrm_state from xfrm_state_check_space Steffen Klassert
@ 2012-03-22 23:30 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-03-22 23:30 UTC (permalink / raw)
To: steffen.klassert; +Cc: herbert, netdev
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 22 Mar 2012 10:32:39 +0100
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-22 23:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-22 9:32 [PATCH] xfrm: Remove unused xfrm_state from xfrm_state_check_space Steffen Klassert
2012-03-22 23:30 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).