Re: [PATCH net-next v2 0/3] udp: support SO_PEEK_OFF

2016-04-05 Thread David Miller 
From: Willem de Bruijn 
Date: Tue,  5 Apr 2016 12:41:13 -0400

> From: Willem de Bruijn 
> 
> Support peeking at a non-zero offset for UDP sockets. Match the
> existing behavior on Unix datagram sockets.
> 
> 1/3 makes the sk_peek_offset functions safe to use outside locks
> 2/3 removes udp headers before enqueue, to simplify offset arithmetic
> 3/3 introduces SO_PEEK_OFFSET support, with Unix socket peek semantics.
> 
> Changes
>   v1->v2
> - squash patches 3 and 4

Series applied, thanks Willem.

[PATCH net-next v2 0/3] udp: support SO_PEEK_OFF

2016-04-05 Thread Willem de Bruijn 
From: Willem de Bruijn 

Support peeking at a non-zero offset for UDP sockets. Match the
existing behavior on Unix datagram sockets.

1/3 makes the sk_peek_offset functions safe to use outside locks
2/3 removes udp headers before enqueue, to simplify offset arithmetic
3/3 introduces SO_PEEK_OFFSET support, with Unix socket peek semantics.

Changes
  v1->v2
- squash patches 3 and 4

Willem de Bruijn (1):
  sock: convert sk_peek_offset functions to WRITE_ONCE

samanthakumar (2):
  udp: remove headers from UDP packets before queueing
  udp: enable MSG_PEEK at non-zero offset

 include/linux/skbuff.h |  7 ++-
 include/net/sock.h | 27 ---
 include/net/udp.h  |  9 +
 net/core/datagram.c|  9 ++---
 net/core/sock.c| 28 ++--
 net/ipv4/af_inet.c |  1 +
 net/ipv4/udp.c | 38 --
 net/ipv6/af_inet6.c|  1 +
 net/ipv6/udp.c | 30 --
 9 files changed, 97 insertions(+), 53 deletions(-)

-- 
2.8.0.rc3.226.g39d4020