diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
| commit | 56dbed129df3fdd4caf9018b6e7599ee258a5420 (patch) | |
| tree | b902491aef3a99efe0d9d49edd0f6e414dba654f /net/sctp/socket.c | |
| parent | 2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c (diff) | |
| parent | f878133bf022717b880d0e0995b8f91436fd605c (diff) | |
Merge branch 'linus' into idle-test
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index fff0926b1111..a09b0dd25f50 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -6055,7 +6055,7 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags, | |||
| 6055 | * will suddenly eat the receive_queue. | 6055 | * will suddenly eat the receive_queue. |
| 6056 | * | 6056 | * |
| 6057 | * Look at current nfs client by the way... | 6057 | * Look at current nfs client by the way... |
| 6058 | * However, this function was corrent in any case. 8) | 6058 | * However, this function was correct in any case. 8) |
| 6059 | */ | 6059 | */ |
| 6060 | if (flags & MSG_PEEK) { | 6060 | if (flags & MSG_PEEK) { |
| 6061 | spin_lock_bh(&sk->sk_receive_queue.lock); | 6061 | spin_lock_bh(&sk->sk_receive_queue.lock); |