Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e11c259f authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

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
parents 8d26784c b4487c2d

arch/alpha/include/asm/socket.h

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ 


#define SO_RXQ_OVFL             40



#define SO_WIFI_STATUS		41

#define SCM_WIFI_STATUS		SO_WIFI_STATUS



/* O_NONBLOCK clashes with the bits used for socket types.  Therefore we

 * have to define SOCK_NONBLOCK to a different value here.

 */

arch/arm/include/asm/socket.h

+3 −0
Original line number Diff line number Diff line
@@ -62,4 +62,7 @@ 


#define SO_RXQ_OVFL             40



#define SO_WIFI_STATUS		41

#define SCM_WIFI_STATUS		SO_WIFI_STATUS



#endif /* _ASM_SOCKET_H */

arch/avr32/include/asm/socket.h

+3 −0
Original line number Diff line number Diff line
@@ -62,4 +62,7 @@ 


#define SO_RXQ_OVFL             40



#define SO_WIFI_STATUS		41

#define SCM_WIFI_STATUS		SO_WIFI_STATUS



#endif /* __ASM_AVR32_SOCKET_H */

arch/cris/include/asm/socket.h

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ 


#define SO_RXQ_OVFL             40



#define SO_WIFI_STATUS		41

#define SCM_WIFI_STATUS		SO_WIFI_STATUS



#endif /* _ASM_SOCKET_H */

arch/frv/include/asm/socket.h

+3 −0
Original line number Diff line number Diff line
@@ -62,5 +62,8 @@ 


#define SO_RXQ_OVFL             40



#define SO_WIFI_STATUS		41

#define SCM_WIFI_STATUS		SO_WIFI_STATUS



#endif /* _ASM_SOCKET_H */