diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
| commit | 4b5a5096bb834102b2e821f5f34274f041862d67 (patch) | |
| tree | fe55f4f11111e34d503a6a01aeb4bfc2eae5e88a /net/core/sock.c | |
| parent | 19570d747795f0ecff79403698b868dc5ad7fa86 (diff) | |
| parent | 150116bcfbd9004f01e682535baddaca2b90d3b2 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index ab20ed9b0f3..5393b4b719d 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -882,7 +882,7 @@ set_rcvbuf: case SO_PEEK_OFF: if (sock->ops->set_peek_off) - sock->ops->set_peek_off(sk, val); + ret = sock->ops->set_peek_off(sk, val); else ret = -EOPNOTSUPP; break; |