diff options
author | David S. Miller <davem@davemloft.net> | 2010-08-03 05:22:46 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-03 05:22:46 (GMT) |
commit | 00dad5e479531e379aba7358600cc768725d4f1f (patch) | |
tree | 652199eacee32c2cf317f5a54da8265973d29978 /net/sched | |
parent | c477d0447db08068a497e7beb892b2b2a7bff64b (diff) | |
parent | 3a3dfb062c2e086c202d34f09ce29634515ad256 (diff) | |
download | linux-00dad5e479531e379aba7358600cc768725d4f1f.tar.xz |
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
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/act_nat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c index 24e614c..d0386a4 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: |