net: shrink struct sock and request_sock by 8 bytes
One 32bit hole is following skc_refcnt, use it. skc_incoming_cpu can also be an union for request_sock rcv_wnd. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
8e5eb54d30
commit
ed53d0ab76
@@ -226,11 +226,18 @@ struct sock_common {
|
||||
struct hlist_nulls_node skc_nulls_node;
|
||||
};
|
||||
int skc_tx_queue_mapping;
|
||||
int skc_incoming_cpu;
|
||||
union {
|
||||
int skc_incoming_cpu;
|
||||
u32 skc_rcv_wnd;
|
||||
};
|
||||
|
||||
atomic_t skc_refcnt;
|
||||
/* private: */
|
||||
int skc_dontcopy_end[0];
|
||||
union {
|
||||
u32 skc_rxhash;
|
||||
u32 skc_window_clamp;
|
||||
};
|
||||
/* public: */
|
||||
};
|
||||
|
||||
@@ -287,7 +294,6 @@ struct cg_proto;
|
||||
* @sk_rcvlowat: %SO_RCVLOWAT setting
|
||||
* @sk_rcvtimeo: %SO_RCVTIMEO setting
|
||||
* @sk_sndtimeo: %SO_SNDTIMEO setting
|
||||
* @sk_rxhash: flow hash received from netif layer
|
||||
* @sk_txhash: computed flow hash for use on transmit
|
||||
* @sk_filter: socket filtering instructions
|
||||
* @sk_timer: sock cleanup timer
|
||||
@@ -346,6 +352,7 @@ struct sock {
|
||||
#define sk_cookie __sk_common.skc_cookie
|
||||
#define sk_incoming_cpu __sk_common.skc_incoming_cpu
|
||||
#define sk_flags __sk_common.skc_flags
|
||||
#define sk_rxhash __sk_common.skc_rxhash
|
||||
|
||||
socket_lock_t sk_lock;
|
||||
struct sk_buff_head sk_receive_queue;
|
||||
@@ -365,9 +372,6 @@ struct sock {
|
||||
} sk_backlog;
|
||||
#define sk_rmem_alloc sk_backlog.rmem_alloc
|
||||
int sk_forward_alloc;
|
||||
#ifdef CONFIG_RPS
|
||||
__u32 sk_rxhash;
|
||||
#endif
|
||||
|
||||
__u32 sk_txhash;
|
||||
#ifdef CONFIG_NET_RX_BUSY_POLL
|
||||
|
Reference in New Issue
Block a user