diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 17:59:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 17:59:02 -0400 |
| commit | 7143b7d41218d4fc2ea33e6056c73609527ae687 (patch) | |
| tree | 9a842daee1deb57a2c8084bc5d300f6d8428fe34 /net/ipv6/esp6.c | |
| parent | 90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2 (diff) | |
| parent | 87e9af6cc67d842cd92b52b81f3f14e665e7ab05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
Diffstat (limited to 'net/ipv6/esp6.c')
| -rw-r--r-- | net/ipv6/esp6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index e97b4b7ca2f2..1ac7938dd9ec 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
| @@ -371,7 +371,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) | |||
| 371 | iv = esp_tmp_iv(aead, tmp, seqhilen); | 371 | iv = esp_tmp_iv(aead, tmp, seqhilen); |
| 372 | req = esp_tmp_req(aead, iv); | 372 | req = esp_tmp_req(aead, iv); |
| 373 | asg = esp_req_sg(aead, req); | 373 | asg = esp_req_sg(aead, req); |
| 374 | sg = asg + 1; | 374 | sg = asg + sglists; |
| 375 | 375 | ||
| 376 | skb->ip_summed = CHECKSUM_NONE; | 376 | skb->ip_summed = CHECKSUM_NONE; |
| 377 | 377 | ||