From 81719a6d17fd69b4f8e9ec8457b16d565582e886 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 27 Nov 2006 17:56:43 -0200 Subject: [PATCH] --- yaml --- r: 41891 b: refs/heads/master c: 850db6b8c53ff12eadee9ef2aa69360c06bce057 h: refs/heads/master i: 41889: e4956338a301aa6bf29b83cc96dfff59e0f20449 41887: 126bb81bdc1b4ce7b4cb2b9dc12f8fafe649d736 v: v3 --- [refs] | 2 +- trunk/include/net/inet_connection_sock.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0c7864116fe5..720036c9ff0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c0a6cb0db19de411c4bf7fcdc79d4c7c4ccafb1 +refs/heads/master: 850db6b8c53ff12eadee9ef2aa69360c06bce057 diff --git a/trunk/include/net/inet_connection_sock.h b/trunk/include/net/inet_connection_sock.h index fd3f1d8cdc4a..cccea051e922 100644 --- a/trunk/include/net/inet_connection_sock.h +++ b/trunk/include/net/inet_connection_sock.h @@ -46,7 +46,8 @@ struct inet_connection_sock_af_ops { struct request_sock *req, struct dst_entry *dst); int (*remember_stamp)(struct sock *sk); - __u16 net_header_len; + u16 net_header_len; + u16 sockaddr_len; int (*setsockopt)(struct sock *sk, int level, int optname, char __user *optval, int optlen); int (*getsockopt)(struct sock *sk, int level, int optname, @@ -58,7 +59,6 @@ struct inet_connection_sock_af_ops { int level, int optname, char __user *optval, int __user *optlen); void (*addr2sockaddr)(struct sock *sk, struct sockaddr *); - int sockaddr_len; }; /** inet_connection_sock - INET connection oriented sock