From: David Miller <da...@davemloft.net>
Date: Tue, 19 May 2015 00:09:45 -0400 (EDT)

> From: Jason Baron <jba...@akamai.com>
> Date: Fri, 15 May 2015 21:17:07 +0000 (GMT)
> 
>> From: Jason Baron <jba...@akamai.com>
>> 
>> If we really can't get an skb allocated, make sure that we let
>> userspace know. This at least gives us a chance to re-try or abort.
>> 
>> Signed-off-by: Jason Baron <jba...@akamai.com>
> 
> Applied to net-next, thanks Jason.

Nevermind, reverted, you didn't compile let alone test this:

net/ipv4/tcp.c: In function ‘do_tcp_sendpages’:
net/ipv4/tcp.c:1001:34: error: invalid operands to binary == (have ‘struct 
sk_buff_head’ and ‘int’)
  if (unlikely(sk->sk_write_queue == 0 && err == -EAGAIN))
                                  ^
include/linux/compiler.h:164:42: note: in definition of macro ‘unlikely’
 # define unlikely(x) __builtin_expect(!!(x), 0)
                                          ^
net/ipv4/tcp.c: In function ‘tcp_sendmsg’:
net/ipv4/tcp.c:1292:34: error: invalid operands to binary == (have ‘struct 
sk_buff_head’ and ‘int’)
  if (unlikely(sk->sk_write_queue == 0 && err == -EAGAIN))
                                  ^
include/linux/compiler.h:164:42: note: in definition of macro ‘unlikely’
 # define unlikely(x) __builtin_expect(!!(x), 0)
                                          ^

Reply via email to