From 1707a0614a5d9fae2b09a765d0e33bbe7d3aee1f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 5 Jul 2011 01:05:48 -0700
Subject: [PATCH] --- yaml --- r: 256127 b: refs/heads/master c:
 595fc71baa1e80420fe89a400ff2d9cc099d22fc h: refs/heads/master i:   256125:
 959b0919fb300da189cb4b133ed7acf3ff6a10b6   256123:
 03b28da790fe15e0b1c37a3db41734911950b29c   256119:
 9d3d6a3abc16e9a3014eff2966b0e0889dda8c06   256111:
 e4a5d90468457aa606f3bee87c629fa40543920a   256095:
 4108992743ad83a2d28a5ba1f985424e1030f935   256063:
 eb2b2bd5f38f0928220262e3b0c34cd43117fdbc   255999:
 8b6a99da2af5793bce7e358301aef57a9138a732 v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/ip.h       | 3 ++-
 trunk/net/ipv4/ip_fragment.c | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a6cefe686beb..e06aa7d00b6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc99f600698dcac69b8f56dda9a8a00d645c5ffc
+refs/heads/master: 595fc71baa1e80420fe89a400ff2d9cc099d22fc
diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h
index 9fa9416d14d7..aa76c7a4d9c3 100644
--- a/trunk/include/net/ip.h
+++ b/trunk/include/net/ip.h
@@ -404,7 +404,8 @@ enum ip_defrag_users {
 	__IP_DEFRAG_CONNTRACK_BRIDGE_IN = IP_DEFRAG_CONNTRACK_BRIDGE_IN + USHRT_MAX,
 	IP_DEFRAG_VS_IN,
 	IP_DEFRAG_VS_OUT,
-	IP_DEFRAG_VS_FWD
+	IP_DEFRAG_VS_FWD,
+	IP_DEFRAG_AF_PACKET,
 };
 
 int ip_defrag(struct sk_buff *skb, u32 user);
diff --git a/trunk/net/ipv4/ip_fragment.c b/trunk/net/ipv4/ip_fragment.c
index 0ad6035f6366..0e0ab98abc6f 100644
--- a/trunk/net/ipv4/ip_fragment.c
+++ b/trunk/net/ipv4/ip_fragment.c
@@ -261,8 +261,9 @@ static void ip_expire(unsigned long arg)
 		 * Only an end host needs to send an ICMP
 		 * "Fragment Reassembly Timeout" message, per RFC792.
 		 */
-		if (qp->user == IP_DEFRAG_CONNTRACK_IN &&
-		    skb_rtable(head)->rt_type != RTN_LOCAL)
+		if (qp->user == IP_DEFRAG_AF_PACKET ||
+		    (qp->user == IP_DEFRAG_CONNTRACK_IN &&
+		     skb_rtable(head)->rt_type != RTN_LOCAL))
 			goto out_rcu_unlock;