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

Commit 2f6a1b66 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

macvlan: Remove custom recieve and forward handlers 



Since now macvlan and macvtap use the same receive and
forward handlers, we can remove them completely and use
netif_rx and dev_forward_skb() directly.

Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6acf54f1

drivers/net/macvlan.c

+5 −12
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ static int macvlan_broadcast_one(struct sk_buff *skb, 
	struct net_device *dev = vlan->dev;

	struct net_device *dev = vlan->dev;





	if (local)

	if (local)

		return vlan->forward(dev, skb);

		return dev_forward_skb(dev, skb);





	skb->dev = dev;

	skb->dev = dev;

	if (ether_addr_equal_64bits(eth->h_dest, dev->broadcast))

	if (ether_addr_equal_64bits(eth->h_dest, dev->broadcast))
@@ -128,7 +128,7 @@ static int macvlan_broadcast_one(struct sk_buff *skb, 
	else

	else

		skb->pkt_type = PACKET_MULTICAST;

		skb->pkt_type = PACKET_MULTICAST;





	return vlan->receive(skb);

	return netif_rx(skb);

}

}





static u32 macvlan_hash_mix(const struct macvlan_dev *vlan)

static u32 macvlan_hash_mix(const struct macvlan_dev *vlan)
@@ -251,7 +251,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) 
	skb->dev = dev;

	skb->dev = dev;

	skb->pkt_type = PACKET_HOST;

	skb->pkt_type = PACKET_HOST;





	ret = vlan->receive(skb);

	ret = netif_rx(skb);





out:

out:

	macvlan_count_rx(vlan, len, ret == NET_RX_SUCCESS, 0);

	macvlan_count_rx(vlan, len, ret == NET_RX_SUCCESS, 0);
@@ -803,10 +803,7 @@ static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) 
}

}





int macvlan_common_newlink(struct net *src_net, struct net_device *dev,

int macvlan_common_newlink(struct net *src_net, struct net_device *dev,

			   struct nlattr *tb[], struct nlattr *data[],

			   struct nlattr *tb[], struct nlattr *data[])

			   int (*receive)(struct sk_buff *skb),

			   int (*forward)(struct net_device *dev,

					  struct sk_buff *skb))

{

{

	struct macvlan_dev *vlan = netdev_priv(dev);

	struct macvlan_dev *vlan = netdev_priv(dev);

	struct macvlan_port *port;

	struct macvlan_port *port;
@@ -848,8 +845,6 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, 
	vlan->lowerdev = lowerdev;

	vlan->lowerdev = lowerdev;

	vlan->dev      = dev;

	vlan->dev      = dev;

	vlan->port     = port;

	vlan->port     = port;

	vlan->receive  = receive;

	vlan->forward  = forward;

	vlan->set_features = MACVLAN_FEATURES;

	vlan->set_features = MACVLAN_FEATURES;





	vlan->mode     = MACVLAN_MODE_VEPA;

	vlan->mode     = MACVLAN_MODE_VEPA;
@@ -894,9 +889,7 @@ EXPORT_SYMBOL_GPL(macvlan_common_newlink); 
static int macvlan_newlink(struct net *src_net, struct net_device *dev,

static int macvlan_newlink(struct net *src_net, struct net_device *dev,

			   struct nlattr *tb[], struct nlattr *data[])

			   struct nlattr *tb[], struct nlattr *data[])

{

{

	return macvlan_common_newlink(src_net, dev, tb, data,

	return macvlan_common_newlink(src_net, dev, tb, data);

				      netif_rx,

				      dev_forward_skb);

}

}





void macvlan_dellink(struct net_device *dev, struct list_head *head)

void macvlan_dellink(struct net_device *dev, struct list_head *head)

drivers/net/macvtap.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -400,8 +400,7 @@ static int macvtap_newlink(struct net *src_net, 
	/* Don't put anything that may fail after macvlan_common_newlink

	/* Don't put anything that may fail after macvlan_common_newlink

	 * because we can't undo what it does.

	 * because we can't undo what it does.

	 */

	 */

	return macvlan_common_newlink(src_net, dev, tb, data,

	return macvlan_common_newlink(src_net, dev, tb, data);

				      netif_rx, dev_forward_skb);

}

}





static void macvtap_dellink(struct net_device *dev,

static void macvtap_dellink(struct net_device *dev,

include/linux/if_macvlan.h

+1 −6
Original line number Original line Diff line number Diff line
@@ -69,8 +69,6 @@ struct macvlan_dev { 
	netdev_features_t	set_features;

	netdev_features_t	set_features;

	enum macvlan_mode	mode;

	enum macvlan_mode	mode;

	u16			flags;

	u16			flags;

	int (*receive)(struct sk_buff *skb);

	int (*forward)(struct net_device *dev, struct sk_buff *skb);

	/* This array tracks active taps. */

	/* This array tracks active taps. */

	struct macvtap_queue	__rcu *taps[MAX_MACVTAP_QUEUES];

	struct macvtap_queue	__rcu *taps[MAX_MACVTAP_QUEUES];

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

	/* This list tracks all taps (both enabled and disabled) */
@@ -103,10 +101,7 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan, 
extern void macvlan_common_setup(struct net_device *dev);

extern void macvlan_common_setup(struct net_device *dev);





extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev,

extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev,

				  struct nlattr *tb[], struct nlattr *data[],

				  struct nlattr *tb[], struct nlattr *data[]);

				  int (*receive)(struct sk_buff *skb),

				  int (*forward)(struct net_device *dev,

						 struct sk_buff *skb));





extern void macvlan_count_rx(const struct macvlan_dev *vlan,

extern void macvlan_count_rx(const struct macvlan_dev *vlan,

			     unsigned int len, bool success,

			     unsigned int len, bool success,