Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/e1000e/hw.h
	net/bridge/br_device.c
	net/bridge/br_input.c

1 files changed, 2 insertions, 1 deletions

diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index 24e614c495f2..d0386a413e8d 100644
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -218,6 +218,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
                 if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + sizeof(*iph)))
                         goto drop;
 
+                icmph = (void *)(skb_network_header(skb) + ihl);
                 iph = (void *)(icmph + 1);
                 if (egress)
                         addr = iph->daddr;
@@ -246,7 +247,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
                         iph->saddr = new_addr;
 
                 inet_proto_csum_replace4(&icmph->checksum, skb, addr, new_addr,
-                                         1);
+                                         0);
                 break;
         }
         default: