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

igbvf: do vlan cleanup 



- unify vlan and nonvlan rx path
- kill adapter->vlgrp and igbvf_vlan_rx_register

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

drivers/net/igbvf/igbvf.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <linux/timer.h>

#include <linux/io.h>

#include <linux/netdevice.h>



#include <linux/if_vlan.h>



#include "vf.h"
@@ -173,7 +173,7 @@ struct igbvf_adapter { 


	const struct igbvf_info *ei;



	struct vlan_group *vlgrp;

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	u32 bd_number;

	u32 rx_buffer_len;

	u32 polling_interval;

drivers/net/igbvf/netdev.c

+14 −30
Original line number Diff line number Diff line
@@ -100,11 +100,11 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter, 
                              struct sk_buff *skb,

                              u32 status, u16 vlan)

{

	if (adapter->vlgrp && (status & E1000_RXD_STAT_VP))

		vlan_hwaccel_receive_skb(skb, adapter->vlgrp,

		                         le16_to_cpu(vlan) &

		                         E1000_RXD_SPC_VLAN_MASK);

	else

	if (status & E1000_RXD_STAT_VP) {

		u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;



		__vlan_hwaccel_put_tag(skb, vid);

	}

	netif_receive_skb(skb);

}
@@ -1167,12 +1167,10 @@ static int igbvf_poll(struct napi_struct *napi, int budget) 
 */

static void igbvf_set_rlpml(struct igbvf_adapter *adapter)

{

	int max_frame_size = adapter->max_frame_size;

	int max_frame_size;

	struct e1000_hw *hw = &adapter->hw;



	if (adapter->vlgrp)

		max_frame_size += VLAN_TAG_SIZE;



	max_frame_size = adapter->max_frame_size + VLAN_TAG_SIZE;

	e1000_rlpml_set_vf(hw, max_frame_size);

}
@@ -1183,6 +1181,8 @@ static void igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid) 


	if (hw->mac.ops.set_vfta(hw, vid, true))

		dev_err(&adapter->pdev->dev, "Failed to add vlan id %d\n", vid);

	else

		set_bit(vid, adapter->active_vlans);

}



static void igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
@@ -1191,7 +1191,6 @@ static void igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) 
	struct e1000_hw *hw = &adapter->hw;



	igbvf_irq_disable(adapter);

	vlan_group_set_device(adapter->vlgrp, vid, NULL);



	if (!test_bit(__IGBVF_DOWN, &adapter->state))

		igbvf_irq_enable(adapter);
@@ -1199,32 +1198,18 @@ static void igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) 
	if (hw->mac.ops.set_vfta(hw, vid, false))

		dev_err(&adapter->pdev->dev,

		        "Failed to remove vlan id %d\n", vid);

}



static void igbvf_vlan_rx_register(struct net_device *netdev,

                                   struct vlan_group *grp)

{

	struct igbvf_adapter *adapter = netdev_priv(netdev);



	adapter->vlgrp = grp;

	else

		clear_bit(vid, adapter->active_vlans);

}



static void igbvf_restore_vlan(struct igbvf_adapter *adapter)

{

	u16 vid;



	if (!adapter->vlgrp)

		return;



	for (vid = 0; vid < VLAN_N_VID; vid++) {

		if (!vlan_group_get_device(adapter->vlgrp, vid))

			continue;

	for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)

		igbvf_vlan_rx_add_vid(adapter->netdev, vid);

}



	igbvf_set_rlpml(adapter);

}



/**

 * igbvf_configure_tx - Configure Transmit Unit after Reset

 * @adapter: board private structure
@@ -2203,7 +2188,7 @@ static netdev_tx_t igbvf_xmit_frame_ring_adv(struct sk_buff *skb, 
		return NETDEV_TX_BUSY;

	}



	if (adapter->vlgrp && vlan_tx_tag_present(skb)) {

	if (vlan_tx_tag_present(skb)) {

		tx_flags |= IGBVF_TX_FLAGS_VLAN;

		tx_flags |= (vlan_tx_tag_get(skb) << IGBVF_TX_FLAGS_VLAN_SHIFT);

	}
@@ -2556,7 +2541,6 @@ static const struct net_device_ops igbvf_netdev_ops = { 
	.ndo_change_mtu                 = igbvf_change_mtu,

	.ndo_do_ioctl                   = igbvf_ioctl,

	.ndo_tx_timeout                 = igbvf_tx_timeout,

	.ndo_vlan_rx_register           = igbvf_vlan_rx_register,

	.ndo_vlan_rx_add_vid            = igbvf_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid           = igbvf_vlan_rx_kill_vid,

#ifdef CONFIG_NET_POLL_CONTROLLER