Merge branch 'upstream' into bugfix-video

[~andy/linux] / net / compat.c

diff --git a/net/compat.c b/net/compat.c
index e240441a2317376e8af335515630486c5ca12bda..1b96281892de15b61f89c19948eee664bc2ac350 100644 (file)
--- a/net/compat.c
+++ b/net/compat.c
@@ -328,14 +328,6 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
        __scm_destroy(scm);
 }
 
-/*
- * A struct sock_filter is architecture independent.
- */
-struct compat_sock_fprog {
-       u16             len;
-       compat_uptr_t   filter;         /* struct sock_filter * */
-};
-
 static int do_set_attach_filter(struct socket *sock, int level, int optname,
                                char __user *optval, unsigned int optlen)
 {