Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / avr32 / include / uapi / asm / socket.h

diff --git a/arch/avr32/include/uapi/asm/socket.h b/arch/avr32/include/uapi/asm/socket.h
index 37401f535126695e22af87b35739aba1242dd219..2b65ed6b277cada8728d70f26f3df76c40af078b 100644 (file)
--- a/arch/avr32/include/uapi/asm/socket.h
+++ b/arch/avr32/include/uapi/asm/socket.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_AVR32_SOCKET_H
-#define __ASM_AVR32_SOCKET_H
+#ifndef _UAPI__ASM_AVR32_SOCKET_H
+#define _UAPI__ASM_AVR32_SOCKET_H
 
 #include <asm/sockios.h>
 
@@ -74,4 +74,15 @@
 
 #define SO_SELECT_ERR_QUEUE    45
 
-#endif /* __ASM_AVR32_SOCKET_H */
+#define SO_BUSY_POLL           46
+
+#define SO_MAX_PACING_RATE     47
+
+#define SO_BPF_EXTENSIONS      48
+
+#define SO_INCOMING_CPU                49
+
+#define SO_ATTACH_BPF          50
+#define SO_DETACH_BPF          SO_DETACH_FILTER
+
+#endif /* _UAPI__ASM_AVR32_SOCKET_H */