diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-26 01:06:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-26 01:06:45 -0400 |
| commit | 1f57389a38dc1e8be167ec601f39f78f0bed3a96 (patch) | |
| tree | 5f33d00a046597ae33855cee13d17d77048ba712 /net/ipv6 | |
| parent | 077783f87708b24054452e5c07685ead2c28b1eb (diff) | |
| parent | 6693e74a16ef563960764bd963f1048392135c3c (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_flowlabel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index f841bde30c18..bbbe80cdaf72 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
| @@ -483,7 +483,7 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen) | |||
| 483 | goto done; | 483 | goto done; |
| 484 | } | 484 | } |
| 485 | fl1 = sfl->fl; | 485 | fl1 = sfl->fl; |
| 486 | atomic_inc(&fl->users); | 486 | atomic_inc(&fl1->users); |
| 487 | break; | 487 | break; |
| 488 | } | 488 | } |
| 489 | } | 489 | } |