From 6d8d0d184a7de58d6a72733bf2f26e54e1d1665e Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 23 May 2005 13:11:07 -0700
Subject: [PATCH] --- yaml --- r: 1332 b: refs/heads/master c:
 180e42503300629692b513daeb55a6bb0b51500c h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/ipv6/xfrm6_output.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0603530eb327..e3b44da47edc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 205902ecc7bcb2a007ed27bb3518e8f70e5d113e
+refs/heads/master: 180e42503300629692b513daeb55a6bb0b51500c
diff --git a/trunk/net/ipv6/xfrm6_output.c b/trunk/net/ipv6/xfrm6_output.c
index 601a148f60f3..6b9867717d11 100644
--- a/trunk/net/ipv6/xfrm6_output.c
+++ b/trunk/net/ipv6/xfrm6_output.c
@@ -84,6 +84,7 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb)
 		mtu = IPV6_MIN_MTU;
 
 	if (skb->len > mtu) {
+		skb->dev = dst->dev;
 		icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, skb->dev);
 		ret = -EMSGSIZE;
 	}