diff --git a/[refs] b/[refs]
index 83bfa2d50e87..773dae9f1a84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3fe8558c7fc182972c3d947d88744482111f304
+refs/heads/master: 33c29dde7d04dc0ec0edb649d20ccf1351c13a06
diff --git a/trunk/net/sched/act_nat.c b/trunk/net/sched/act_nat.c
index d885ba311564..570949417f38 100644
--- a/trunk/net/sched/act_nat.c
+++ b/trunk/net/sched/act_nat.c
@@ -159,6 +159,9 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
 			iph->daddr = new_addr;
 
 		csum_replace4(&iph->check, addr, new_addr);
+	} else if ((iph->frag_off & htons(IP_OFFSET)) ||
+		   iph->protocol != IPPROTO_ICMP) {
+		goto out;
 	}
 
 	ihl = iph->ihl * 4;
@@ -247,6 +250,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
 		break;
 	}
 
+out:
 	return action;
 
 drop: