diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 02:28:35 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 02:28:35 -0400 |
| commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
| tree | ee9289f0898054474b7e5054abdb3ffb78666436 /include/asm-generic/socket.h | |
| parent | 486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
Merge commit 'v3.4-rc4' into next
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 */ |