diff options
| author |   Brian Norris <computersforpeace@gmail.com> | 2017-05-15 11:19:19 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-05-15 11:19:19 -0700 |
| commit | c316cf670491def52a396d3bdc5a63ad01f7fefa (patch) | |
| tree | bf22299ce777088d190b532629b1bd647d28fab6 /include/linux/errqueue.h | |
| parent | mtd: physmap_of: Drop unnecessary static (diff) | |
| parent | Linux 4.12-rc1 (diff) | |
Merge 'v4.12-rc1' into MTD
Bring a few queued patches in sync for -next development.
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 |