diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-17 13:11:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-17 13:11:43 -0500 |
| commit | e11c259f745889b55bc5596ca78271f2f5cf08d2 (patch) | |
| tree | 5025f0bf9093e84d0643beb9097249c176dbbea7 /arch/alpha | |
| parent | 8d26784cf0d04c1238e906efdd5de76439cb0a1e (diff) | |
| parent | b4487c2d0edaf1332d7a9f11b5661044955ef5e2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
include/net/bluetooth/bluetooth.h
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/include/asm/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/socket.h b/arch/alpha/include/asm/socket.h index 06edfefc3373..082355f159e6 100644 --- a/arch/alpha/include/asm/socket.h +++ b/arch/alpha/include/asm/socket.h | |||
| @@ -69,6 +69,9 @@ | |||
| 69 | 69 | ||
| 70 | #define SO_RXQ_OVFL 40 | 70 | #define SO_RXQ_OVFL 40 |
| 71 | 71 | ||
| 72 | #define SO_WIFI_STATUS 41 | ||
| 73 | #define SCM_WIFI_STATUS SO_WIFI_STATUS | ||
| 74 | |||
| 72 | /* O_NONBLOCK clashes with the bits used for socket types. Therefore we | 75 | /* O_NONBLOCK clashes with the bits used for socket types. Therefore we |
| 73 | * have to define SOCK_NONBLOCK to a different value here. | 76 | * have to define SOCK_NONBLOCK to a different value here. |
| 74 | */ | 77 | */ |