diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
| commit | f58f8be7f65312f602f7970e7da47a6413e692b0 (patch) | |
| tree | f60cc040deebceea1b44082dc713e95687d8527f /net/ipv6/ip6_output.c | |
| parent | c71c18576d0d8aa4db876c737c3c597c724cf02f (diff) | |
| parent | e710245bb0f980adfb1dfe850e43761a8117c6be (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 2f589f24c093..563b442ffab8 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -666,7 +666,7 @@ slow_path: | |||
| 666 | */ | 666 | */ |
| 667 | fh->nexthdr = nexthdr; | 667 | fh->nexthdr = nexthdr; |
| 668 | fh->reserved = 0; | 668 | fh->reserved = 0; |
| 669 | if (frag_id) { | 669 | if (!frag_id) { |
| 670 | ipv6_select_ident(skb, fh); | 670 | ipv6_select_ident(skb, fh); |
| 671 | frag_id = fh->identification; | 671 | frag_id = fh->identification; |
| 672 | } else | 672 | } else |