diff options
| author | Greg Kroah-Hartman <[email protected]> | 2017-03-27 09:11:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2017-03-27 09:11:25 +0200 |
| commit | 1c816bad41fea5470e8077ae4e661f3f9b5ada64 (patch) | |
| tree | 5e923d12b6284a711d66efee822ca48f95ebf1af /include/linux/errqueue.h | |
| parent | b0fe8f7b9b5adea2c85c72bba46e20fb21522769 (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
Merge 4.11-rc4 into staging-next
We need the IIO fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'include/linux/errqueue.h')
| -rw-r--r-- | include/linux/errqueue.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index 9ca23fcfb5d7..6fdfc884fdeb 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h @@ -20,6 +20,8 @@ struct sock_exterr_skb { struct sock_extended_err ee; u16 addr_offset; __be16 port; + u8 opt_stats:1, + unused:7; }; #endif |