From 3ff53b35245e179b8070c9c6e1f23285589ebda5 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 8 Oct 2009 22:50:25 +0000 Subject: [PATCH] --- yaml --- r: 167531 b: refs/heads/master c: 5fdb9973c10c2d2e046da0976782ece25e78dc8b h: refs/heads/master i: 167529: 72ddbd69a3a32ec2dbf9d95eb7cd6a47719382c6 167527: 61c996052c8e9c8dcc92a4c26be449757b1ef0f7 v: v3 --- [refs] | 2 +- trunk/include/net/sock.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d53131d919f2..1e0575a720dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53f7e35f8b7fc2f5620a863ac613bcf3080cb6ba +refs/heads/master: 5fdb9973c10c2d2e046da0976782ece25e78dc8b diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 1621935aad5b..9f96394f694e 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -226,12 +226,12 @@ struct sock { #define sk_prot __sk_common.skc_prot #define sk_net __sk_common.skc_net kmemcheck_bitfield_begin(flags); - unsigned char sk_shutdown : 2, - sk_no_check : 2, - sk_userlocks : 4; + unsigned int sk_shutdown : 2, + sk_no_check : 2, + sk_userlocks : 4, + sk_protocol : 8, + sk_type : 16; kmemcheck_bitfield_end(flags); - unsigned char sk_protocol; - unsigned short sk_type; int sk_rcvbuf; socket_lock_t sk_lock; /*