From 6b8d50a0ade9c8c88d876d22e308b14f615a3c93 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 21 Mar 2012 23:32:39 +0000
Subject: [PATCH] --- yaml --- r: 294677 b: refs/heads/master c:
 26b2072e7536e57995b2867d057fbb32ecfe498d h: refs/heads/master i:   294675:
 5248320e182705709fdce0ace31d9d15948052c0 v: v3

---
 [refs]                       | 2 +-
 trunk/net/xfrm/xfrm_output.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5798a7e2fbc4..8cd2857f00c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0229eaaf3f82522e2b16b41b0f45bb84a88d1b0
+refs/heads/master: 26b2072e7536e57995b2867d057fbb32ecfe498d
diff --git a/trunk/net/xfrm/xfrm_output.c b/trunk/net/xfrm/xfrm_output.c
index 47bacd8c0250..95a338c89f99 100644
--- a/trunk/net/xfrm/xfrm_output.c
+++ b/trunk/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;