diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:48:21 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:48:21 +0000 |
| commit | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (patch) | |
| tree | f3dc5381e660de7685258f75d16c381c4c47694a /net/ipv6 | |
| parent | 57445428488a2862840c4d7c96d7746c11031aaf (diff) | |
Merge with Linux 2.4.0-test6-pre7.
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_flowlabel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index 4dd29b60e..c87c1d447 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -436,8 +436,11 @@ int ipv6_flowlabel_opt(struct sock *sk, char *optval, int optlen) case IPV6_FL_A_RENEW: read_lock_bh(&ip6_sk_fl_lock); for (sfl = np->ipv6_fl_list; sfl; sfl = sfl->next) { - if (sfl->fl->label == freq.flr_label) - return fl6_renew(sfl->fl, freq.flr_linger, freq.flr_expires); + if (sfl->fl->label == freq.flr_label) { + err = fl6_renew(sfl->fl, freq.flr_linger, freq.flr_expires); + read_unlock_bh(&ip6_sk_fl_lock); + return err; + } } read_unlock_bh(&ip6_sk_fl_lock); |