]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'udp-peek'
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Apr 2016 20:29:38 +0000 (16:29 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Apr 2016 20:29:38 +0000 (16:29 -0400)
commit66f87790361c2c33dd7948a618da0cb632eed20d
tree4a4d64af861781920b2b4ef6d0e7b4423b787292
parente43d15c8d3c8680fbf142360e5958f2ddd437047
parent627d2d6b550094d88f9e518e15967e7bf906ebbf
Merge branch 'udp-peek'

Willem de Bruijn says:

====================
udp: support SO_PEEK_OFF

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
====================

Signed-off-by: David S. Miller <davem@davemloft.net>