OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 50... Line 50...
50 include/net/sock.h | 51 +++++++++++++++++++++++++++------------------------ 50 include/net/sock.h | 51 +++++++++++++++++++++++++++------------------------
51 1 file changed, 27 insertions(+), 24 deletions(-) 51 1 file changed, 27 insertions(+), 24 deletions(-)
Line 52... Line 52...
52   52  
53 --- a/include/net/sock.h 53 --- a/include/net/sock.h
54 +++ b/include/net/sock.h 54 +++ b/include/net/sock.h
55 @@ -344,6 +344,9 @@ struct sock { 55 @@ -343,6 +343,9 @@ struct sock {
Line 56... Line 56...
56 #define sk_rxhash __sk_common.skc_rxhash 56 #define sk_rxhash __sk_common.skc_rxhash
57 57
58 socket_lock_t sk_lock; 58 socket_lock_t sk_lock;
59 + atomic_t sk_drops; 59 + atomic_t sk_drops;
60 + int sk_rcvlowat; 60 + int sk_rcvlowat;
61 + struct sk_buff_head sk_error_queue; 61 + struct sk_buff_head sk_error_queue;
62 struct sk_buff_head sk_receive_queue; 62 struct sk_buff_head sk_receive_queue;
63 /* 63 /*
64 * The backlog queue is special, it is always used with 64 * The backlog queue is special, it is always used with
65 @@ -360,14 +363,13 @@ struct sock { 65 @@ -359,14 +362,13 @@ struct sock {
66 struct sk_buff *tail; 66 struct sk_buff *tail;
67 } sk_backlog; 67 } sk_backlog;
Line 78... Line 78...
78 #endif 78 #endif
79 - atomic_t sk_drops; 79 - atomic_t sk_drops;
80 int sk_rcvbuf; 80 int sk_rcvbuf;
Line 81... Line 81...
81 81
82 struct sk_filter __rcu *sk_filter; 82 struct sk_filter __rcu *sk_filter;
83 @@ -380,11 +382,30 @@ struct sock { 83 @@ -379,11 +381,30 @@ struct sock {
84 #endif 84 #endif
85 struct dst_entry *sk_rx_dst; 85 struct dst_entry *sk_rx_dst;
86 struct dst_entry __rcu *sk_dst_cache; 86 struct dst_entry __rcu *sk_dst_cache;
87 - /* Note: 32bit hole on 64bit arches */ 87 - /* Note: 32bit hole on 64bit arches */
Line 111... Line 111...
111 + gfp_t sk_allocation; 111 + gfp_t sk_allocation;
112 + __u32 sk_txhash; 112 + __u32 sk_txhash;
Line 113... Line 113...
113 113
114 /* 114 /*
115 * Because of non atomicity rules, all 115 * Because of non atomicity rules, all
116 @@ -400,31 +421,17 @@ struct sock { 116 @@ -399,41 +420,23 @@ struct sock {
117 #define SK_PROTOCOL_MAX U8_MAX 117 #define SK_PROTOCOL_MAX U8_MAX
Line 118... Line 118...
118 kmemcheck_bitfield_end(flags); 118 kmemcheck_bitfield_end(flags);
119 119
Line 141... Line 141...
141 const struct cred *sk_peer_cred; 141 const struct cred *sk_peer_cred;
142 long sk_rcvtimeo; 142 long sk_rcvtimeo;
143 - long sk_sndtimeo; 143 - long sk_sndtimeo;
144 - struct timer_list sk_timer; 144 - struct timer_list sk_timer;
145 ktime_t sk_stamp; 145 ktime_t sk_stamp;
146 #if BITS_PER_LONG==32 146 u16 sk_tsflags;
147 seqlock_t sk_stamp_seq; 147 u8 sk_shutdown;
148 @@ -434,10 +441,6 @@ struct sock { -  
149 u32 sk_tskey; 148 u32 sk_tskey;
150 struct socket *sk_socket; 149 struct socket *sk_socket;
151 void *sk_user_data; 150 void *sk_user_data;
152 - struct page_frag sk_frag; 151 - struct page_frag sk_frag;
153 - struct sk_buff *sk_send_head; 152 - struct sk_buff *sk_send_head;