From 0648ab70afe6c3bf2369a6d779b44a85121c063d Mon Sep 17 00:00:00 2001 From: Willem de Bruijn Date: Tue, 12 May 2015 11:56:46 -0400 Subject: packet: rollover prepare: per-socket state Replace rollover state per fanout group with state per socket. Future patches will add fields to the new structure. Signed-off-by: Willem de Bruijn Signed-off-by: David S. Miller --- net/packet/internal.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'net/packet/internal.h') diff --git a/net/packet/internal.h b/net/packet/internal.h index fe6e20caea1d..a9d33a28a019 100644 --- a/net/packet/internal.h +++ b/net/packet/internal.h @@ -82,12 +82,15 @@ struct packet_fanout { atomic_t rr_cur; struct list_head list; struct sock *arr[PACKET_FANOUT_MAX]; - int next[PACKET_FANOUT_MAX]; spinlock_t lock; atomic_t sk_ref; struct packet_type prot_hook ____cacheline_aligned_in_smp; }; +struct packet_rollover { + int sock; +} ____cacheline_aligned_in_smp; + struct packet_sock { /* struct sock has to be the first member of packet_sock */ struct sock sk; @@ -104,6 +107,7 @@ struct packet_sock { has_vnet_hdr:1; int ifindex; /* bound device */ __be16 num; + struct packet_rollover *rollover; struct packet_mclist *mclist; atomic_t mapped; enum tpacket_versions tp_version; -- cgit v1.2.3