summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-02-12 18:58:28 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-12 18:58:28 -0500
commit9f6d98c298d48eec29a32ae8ed6f4d896eb4f634 (patch)
tree24a21ecbd80cd737ce0a4a21591340e6d7f51964 /net/core
parentdb98f081888cbdd995c7c4cfd407781da35e33ba (diff)
parent9c10f4115cc3722635d6e277385ec96003281784 (diff)
downloadop-kernel-dev-9f6d98c298d48eec29a32ae8ed6f4d896eb4f634.zip
op-kernel-dev-9f6d98c298d48eec29a32ae8ed6f4d896eb4f634.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c The bnx2x gso_type setting bug fix in 'net' conflicted with changes in 'net-next' that broke the gso_* setting logic out into a seperate function, which also fixes the bug in question. Thus, use the 'net-next' version. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/datagram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 0337e2b..368f9c3 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -187,7 +187,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
skb_queue_walk(queue, skb) {
*peeked = skb->peeked;
if (flags & MSG_PEEK) {
- if (*off >= skb->len) {
+ if (*off >= skb->len && skb->len) {
*off -= skb->len;
continue;
}
OpenPOWER on IntegriCloud