Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[firefly-linux-kernel-4.4.55.git] / include / net / timewait_sock.h

diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h
index 8d6689cb2c6606821f4a6e0fcd8c2b07358fc561..68f0ecad6c6e211e8f6dac90214fff93c539eb0f 100644 (file)
--- a/include/net/timewait_sock.h
+++ b/include/net/timewait_sock.h
@@ -22,7 +22,6 @@ struct timewait_sock_ops {
        int             (*twsk_unique)(struct sock *sk,
                                       struct sock *sktw, void *twp);
        void            (*twsk_destructor)(struct sock *sk);
-       void            *(*twsk_getpeer)(struct sock *sk);
 };
 
 static inline int twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
@@ -41,11 +40,4 @@ static inline void twsk_destructor(struct sock *sk)
                sk->sk_prot->twsk_prot->twsk_destructor(sk);
 }
 
-static inline void *twsk_getpeer(struct sock *sk)
-{
-       if (sk->sk_prot->twsk_prot->twsk_getpeer)
-               return sk->sk_prot->twsk_prot->twsk_getpeer(sk);
-       return NULL;
-}
-
 #endif /* _TIMEWAIT_SOCK_H */