Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88ca59d1 authored by Girish Moodalbail's avatar Girish Moodalbail Committed by David S. Miller
Browse files

macvlan: remove unused fields in struct macvlan_dev 



commit 635b8c8e ("tap: Renaming tap related APIs, data structures,
macros") captured all the tap related fields into a new struct tap_dev.
However, it failed to remove those fields from struct macvlan_dev.
Those fields are currently unused and must be removed. While there
I moved the comment for MAX_TAP_QUEUES to the right place.

Fixes: 635b8c8e (tap: Renaming tap related APIs, data structures, macros)
Signed-off-by: default avatarGirish Moodalbail <girish.moodalbail@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1769af43

include/linux/if_macvlan.h

+0 −15
Original line number Diff line number Diff line
@@ -10,13 +10,6 @@ 
#include <linux/u64_stats_sync.h>



struct macvlan_port;

struct macvtap_queue;



/*

 * Maximum times a macvtap device can be opened. This can be used to

 * configure the number of receive queue, e.g. for multiqueue virtio.

 */

#define MAX_TAP_QUEUES	256



#define MACVLAN_MC_FILTER_BITS	8

#define MACVLAN_MC_FILTER_SZ	(1 << MACVLAN_MC_FILTER_BITS)
@@ -35,14 +28,6 @@ struct macvlan_dev { 
	netdev_features_t	set_features;

	enum macvlan_mode	mode;

	u16			flags;

	/* This array tracks active taps. */

	struct tap_queue	__rcu *taps[MAX_TAP_QUEUES];

	/* This list tracks all taps (both enabled and disabled) */

	struct list_head	queue_list;

	int			numvtaps;

	int			numqueues;

	netdev_features_t	tap_features;

	int			minor;

	int			nest_level;

#ifdef CONFIG_NET_POLL_CONTROLLER

	struct netpoll		*netpoll;

include/linux/if_tap.h

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ static inline struct skb_array *tap_get_skb_array(struct file *f) 
#include <net/sock.h>

#include <linux/skb_array.h>



/*

 * Maximum times a tap device can be opened. This can be used to

 * configure the number of receive queue, e.g. for multiqueue virtio.

 */

#define MAX_TAP_QUEUES 256



struct tap_queue;