diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 00:59:01 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 00:59:01 -0400 |
| commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
| tree | a50287c88fdc60a73912d205d7bce41b7af53827 /include/linux/errqueue.h | |
| parent | 92a3fa075d3d2716b9c662814540f1d660cbf2f5 (diff) | |
| parent | 11e63f6d920d6f2dfd3cd421e939a4aec9a58dcd (diff) | |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
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 { | |||
| 20 | struct sock_extended_err ee; | 20 | struct sock_extended_err ee; |
| 21 | u16 addr_offset; | 21 | u16 addr_offset; |
| 22 | __be16 port; | 22 | __be16 port; |
| 23 | u8 opt_stats:1, | ||
| 24 | unused:7; | ||
| 23 | }; | 25 | }; |
| 24 | 26 | ||
| 25 | #endif | 27 | #endif |