diff options
| author | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
| commit | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch) | |
| tree | 369b9c91a6d808944f07d2290fec6f9fe2731904 /include/asm-generic/socket.h | |
| parent | ee01e663373343c63e0e3d364d09f6155378dbcc (diff) | |
| parent | aaef292acf3a78d9c0bb6fb72226077d286b45d7 (diff) | |
Merge branches 'idle-fix' and 'misc' into release
Diffstat (limited to 'include/asm-generic/socket.h')
| -rw-r--r-- | include/asm-generic/socket.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-generic/socket.h b/include/asm-generic/socket.h index 49c1704173e7..b1bea03274d5 100644 --- a/include/asm-generic/socket.h +++ b/include/asm-generic/socket.h | |||
| @@ -67,4 +67,9 @@ | |||
| 67 | 67 | ||
| 68 | #define SO_WIFI_STATUS 41 | 68 | #define SO_WIFI_STATUS 41 |
| 69 | #define SCM_WIFI_STATUS SO_WIFI_STATUS | 69 | #define SCM_WIFI_STATUS SO_WIFI_STATUS |
| 70 | #define SO_PEEK_OFF 42 | ||
| 71 | |||
| 72 | /* Instruct lower device to use last 4-bytes of skb data as FCS */ | ||
| 73 | #define SO_NOFCS 43 | ||
| 74 | |||
| 70 | #endif /* __ASM_GENERIC_SOCKET_H */ | 75 | #endif /* __ASM_GENERIC_SOCKET_H */ |