Commit 6ede746b authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

enic: do vlan cleanup 



- unify vlan and nonvlan rx path
- kill enic->vlan_group and enic_vlan_rx_register

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c74ea2f7

drivers/net/enic/enic.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ struct enic { 
	____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX];

	spinlock_t wq_lock[ENIC_WQ_MAX];

	unsigned int wq_count;

	struct vlan_group *vlan_group;

	u16 loop_enable;

	u16 loop_tag;

drivers/net/enic/enic_main.c

+6 −26
Original line number Diff line number Diff line
@@ -1029,14 +1029,6 @@ static void enic_set_rx_mode(struct net_device *netdev) 
	}

}



/* rtnl lock is held */

static void enic_vlan_rx_register(struct net_device *netdev,

	struct vlan_group *vlan_group)

{

	struct enic *enic = netdev_priv(netdev);

	enic->vlan_group = vlan_group;

}



/* netif_tx_lock held, BHs disabled */

static void enic_tx_timeout(struct net_device *netdev)

{
@@ -1264,23 +1256,13 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq, 


		skb->dev = netdev;



		if (vlan_stripped) {



			if (netdev->features & NETIF_F_GRO)

				vlan_gro_receive(&enic->napi[q_number],

					enic->vlan_group, vlan_tci, skb);

			else

				vlan_hwaccel_receive_skb(skb,

					enic->vlan_group, vlan_tci);



		} else {

		if (vlan_stripped)

			__vlan_hwaccel_put_tag(skb, vlan_tci);



		if (netdev->features & NETIF_F_GRO)

			napi_gro_receive(&enic->napi[q_number], skb);

		else

			netif_receive_skb(skb);



		}

	} else {



		/* Buffer overflow
@@ -2124,7 +2106,6 @@ static const struct net_device_ops enic_netdev_dynamic_ops = { 
	.ndo_set_multicast_list	= enic_set_rx_mode,

	.ndo_set_mac_address	= enic_set_mac_address_dynamic,

	.ndo_change_mtu		= enic_change_mtu,

	.ndo_vlan_rx_register	= enic_vlan_rx_register,

	.ndo_vlan_rx_add_vid	= enic_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= enic_vlan_rx_kill_vid,

	.ndo_tx_timeout		= enic_tx_timeout,
@@ -2146,7 +2127,6 @@ static const struct net_device_ops enic_netdev_ops = { 
	.ndo_set_rx_mode	= enic_set_rx_mode,

	.ndo_set_multicast_list	= enic_set_rx_mode,

	.ndo_change_mtu		= enic_change_mtu,

	.ndo_vlan_rx_register	= enic_vlan_rx_register,

	.ndo_vlan_rx_add_vid	= enic_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= enic_vlan_rx_kill_vid,

	.ndo_tx_timeout		= enic_tx_timeout,