diff options
author | David S. Miller <davem@davemloft.net> | 2015-09-29 13:47:08 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-29 13:47:08 -0700 |
commit | 3504bb639ec793c181de6e33a205fc8ca6cf32bf (patch) | |
tree | ba19241592c69f4336f1429cd9d2a1933722f015 /drivers/net/hamradio/hdlcdrv.c | |
parent | 2103d6b818fcdae15ffa04cf385f770e6c3892c3 (diff) | |
parent | 9f389e35674f5b086edd70ed524ca0f287259725 (diff) |
Merge branch 'af_unix_MSG_PEEK'
Aaron Conole says:
====================
af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag
This patch set implements a bugfix for kernel.org bugzilla #12323, allowing
MSG_PEEK to return all queued data on the unix domain socket, not just the
data contained in a single SKB.
This is the v3 version of this patch, which includes a suggested modification
by Eric Dumazet to convert the unix_sk() conversion macro to a static inline
function. These patches are independent and can be applied separately.
This set was tested over a 24-hour period, utilizing a loop continually
executing the bugzilla issue attached python code. It was instrumented with
a pr_err_once() ([ 13.798683] unix: went there at least one time).
v2->v3:
- Added Eric Dumazet's suggestion for #define to static inline
- Fixed an issue calling unix_state_lock() with an invalid argument
v3->v4:
- Eliminated an XXX comment
- Changed from goto unlock to explicit unix_state_unlock() and break
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio/hdlcdrv.c')
0 files changed, 0 insertions, 0 deletions