3 files changed, 24 insertions, 1 deletions

diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
index f5f94ce1692c..94f36e7086a7 100644
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -6,7 +6,6 @@ generic-y += cputime.h
 generic-y += div64.h
 generic-y += emergency-restart.h
 generic-y += exec.h
-generic-y += hash.h
 generic-y += irq_regs.h
 generic-y += irq_work.h
 generic-y += linkage.h
diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h
index d758c8d8f47d..fb124feb363b 100644
--- a/arch/sparc/include/asm/vio.h
+++ b/arch/sparc/include/asm/vio.h
@@ -247,6 +247,25 @@ struct vio_net_desc {
         struct ldc_trans_cookie cookies[0];
 };
 
+struct vio_net_dext {
+        u8              flags;
+#define VNET_PKT_HASH                   0x01
+#define VNET_PKT_HCK_IPV4_HDRCKSUM      0x02
+#define VNET_PKT_HCK_FULLCKSUM          0x04
+#define VNET_PKT_IPV4_LSO               0x08
+#define VNET_PKT_HCK_IPV4_HDRCKSUM_OK   0x10
+#define VNET_PKT_HCK_FULLCKSUM_OK       0x20
+
+        u8              vnet_hashval;
+        u16             ipv4_lso_mss;
+        u32             resv3;
+};
+
+static inline struct vio_net_dext *vio_net_ext(struct vio_net_desc *desc)
+{
+        return (struct vio_net_dext *)&desc->cookies[2];
+}
+
 #define VIO_MAX_RING_COOKIES    24
 
 struct vio_dring_state {
diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h
index 54d9608681b6..e6a16c40be5f 100644
--- a/arch/sparc/include/uapi/asm/socket.h
+++ b/arch/sparc/include/uapi/asm/socket.h
@@ -76,6 +76,11 @@
 
 #define SO_BPF_EXTENSIONS       0x0032
 
+#define SO_INCOMING_CPU         0x0033
+
+#define SO_ATTACH_BPF           0x0034
+#define SO_DETACH_BPF           SO_DETACH_FILTER
+
 /* Security levels - as per NRL IPv6 - don't actually do anything */
 #define SO_SECURITY_AUTHENTICATION              0x5001
 #define SO_SECURITY_ENCRYPTION_TRANSPORT        0x5002