OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 42... Line 42...
42 * @sk_gso_max_segs: Maximum number of GSO segments 42 * @sk_gso_max_segs: Maximum number of GSO segments
43 + * @sk_pacing_shift: scaling factor for TCP Small Queues 43 + * @sk_pacing_shift: scaling factor for TCP Small Queues
44 * @sk_lingertime: %SO_LINGER l_linger setting 44 * @sk_lingertime: %SO_LINGER l_linger setting
45 * @sk_backlog: always used with the per-socket spinlock held 45 * @sk_backlog: always used with the per-socket spinlock held
46 * @sk_callback_lock: used with the callbacks in the end of this struct 46 * @sk_callback_lock: used with the callbacks in the end of this struct
47 @@ -422,6 +423,8 @@ struct sock { 47 @@ -421,6 +422,8 @@ struct sock {
48 kmemcheck_bitfield_end(flags); 48 kmemcheck_bitfield_end(flags);
Line 49... Line 49...
49 49
50 u16 sk_gso_max_segs; 50 u16 sk_gso_max_segs;
51 +#define sk_pacing_shift sk_pacing_shift /* for backport checks */ 51 +#define sk_pacing_shift sk_pacing_shift /* for backport checks */
52 + u8 sk_pacing_shift; 52 + u8 sk_pacing_shift;
53 unsigned long sk_lingertime; 53 unsigned long sk_lingertime;
54 struct proto *sk_prot_creator; 54 struct proto *sk_prot_creator;
55 rwlock_t sk_callback_lock; 55 rwlock_t sk_callback_lock;
56 --- a/net/core/sock.c 56 --- a/net/core/sock.c
57 +++ b/net/core/sock.c 57 +++ b/net/core/sock.c
Line 58... Line 58...
58 @@ -2479,6 +2479,7 @@ void sock_init_data(struct socket *sock, 58 @@ -2475,6 +2475,7 @@ void sock_init_data(struct socket *sock,
59 59
60 sk->sk_max_pacing_rate = ~0U; 60 sk->sk_max_pacing_rate = ~0U;
61 sk->sk_pacing_rate = ~0U; 61 sk->sk_pacing_rate = ~0U;