ixgbevf: do vlan cleanup (dadcd65f) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/ixgbevf/ixgbevf.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -29,9 +29,11 @@
	#define _IXGBEVF_H_		#define _IXGBEVF_H_

	#include <linux/types.h>		#include <linux/types.h>
			#include <linux/bitops.h>
	#include <linux/timer.h>		#include <linux/timer.h>
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>
			#include <linux/if_vlan.h>

	#include "vf.h"		#include "vf.h"

	@@ -185,9 +187,7 @@ struct ixgbevf_q_vector {
	/* board specific private data structure */		/* board specific private data structure */
	struct ixgbevf_adapter {		struct ixgbevf_adapter {
	struct timer_list watchdog_timer;		struct timer_list watchdog_timer;
	#ifdef NETIF_F_HW_VLAN_TX		unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
	struct vlan_group *vlgrp;
	#endif
	u16 bd_number;		u16 bd_number;
	struct work_struct reset_task;		struct work_struct reset_task;
	struct ixgbevf_q_vector *q_vector[MAX_MSIX_Q_VECTORS];		struct ixgbevf_q_vector *q_vector[MAX_MSIX_Q_VECTORS];

drivers/net/ixgbevf/ixgbevf_main.c

+15 −49

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@
	Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code		Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code
	******************************************************************************/		******************************************************************************/
	#include <linux/types.h>		#include <linux/types.h>
			#include <linux/bitops.h>
	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/pci.h>		#include <linux/pci.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>
	@@ -288,22 +289,18 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
	{		{
	struct ixgbevf_adapter *adapter = q_vector->adapter;		struct ixgbevf_adapter *adapter = q_vector->adapter;
	bool is_vlan = (status & IXGBE_RXD_STAT_VP);		bool is_vlan = (status & IXGBE_RXD_STAT_VP);

			if (is_vlan) {
	u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);		u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);

	if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) {		__vlan_hwaccel_put_tag(skb, tag);
	if (adapter->vlgrp && is_vlan)		}
	vlan_gro_receive(&q_vector->napi,
	adapter->vlgrp,		if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))
	tag, skb);
	else
	napi_gro_receive(&q_vector->napi, skb);		napi_gro_receive(&q_vector->napi, skb);
	} else {
	if (adapter->vlgrp && is_vlan)
	vlan_hwaccel_rx(skb, adapter->vlgrp, tag);
	else		else
	netif_rx(skb);		netif_rx(skb);
	}		}
	}

	/**		/**
	* ixgbevf_rx_checksum - indicate in skb if hw indicated a good cksum		* ixgbevf_rx_checksum - indicate in skb if hw indicated a good cksum
	@@ -1401,24 +1398,6 @@ static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)
	}		}
	}		}

	static void ixgbevf_vlan_rx_register(struct net_device *netdev,
	struct vlan_group *grp)
	{
	struct ixgbevf_adapter *adapter = netdev_priv(netdev);
	struct ixgbe_hw *hw = &adapter->hw;
	int i, j;
	u32 ctrl;

	adapter->vlgrp = grp;

	for (i = 0; i < adapter->num_rx_queues; i++) {
	j = adapter->rx_ring[i].reg_idx;
	ctrl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(j));
	ctrl \|= IXGBE_RXDCTL_VME;
	IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(j), ctrl);
	}
	}

	static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)		static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
	{		{
	struct ixgbevf_adapter *adapter = netdev_priv(netdev);		struct ixgbevf_adapter *adapter = netdev_priv(netdev);
	@@ -1427,6 +1406,7 @@ static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
	/* add VID to filter table */		/* add VID to filter table */
	if (hw->mac.ops.set_vfta)		if (hw->mac.ops.set_vfta)
	hw->mac.ops.set_vfta(hw, vid, 0, true);		hw->mac.ops.set_vfta(hw, vid, 0, true);
			set_bit(vid, adapter->active_vlans);
	}		}

	static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)		static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
	@@ -1434,32 +1414,19 @@ static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
	struct ixgbevf_adapter *adapter = netdev_priv(netdev);		struct ixgbevf_adapter *adapter = netdev_priv(netdev);
	struct ixgbe_hw *hw = &adapter->hw;		struct ixgbe_hw *hw = &adapter->hw;

	if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
	ixgbevf_irq_disable(adapter);

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

	if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
	ixgbevf_irq_enable(adapter, true, true);

	/* remove VID from filter table */		/* remove VID from filter table */
	if (hw->mac.ops.set_vfta)		if (hw->mac.ops.set_vfta)
	hw->mac.ops.set_vfta(hw, vid, 0, false);		hw->mac.ops.set_vfta(hw, vid, 0, false);
			clear_bit(vid, adapter->active_vlans);
	}		}

	static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter)		static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter)
	{		{
	ixgbevf_vlan_rx_register(adapter->netdev, adapter->vlgrp);

	if (adapter->vlgrp) {
	u16 vid;		u16 vid;
	for (vid = 0; vid < VLAN_N_VID; vid++) {
	if (!vlan_group_get_device(adapter->vlgrp, vid))		for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
	continue;
	ixgbevf_vlan_rx_add_vid(adapter->netdev, vid);		ixgbevf_vlan_rx_add_vid(adapter->netdev, vid);
	}		}
	}
	}

	static int ixgbevf_write_uc_addr_list(struct net_device *netdev)		static int ixgbevf_write_uc_addr_list(struct net_device *netdev)
	{		{
	@@ -1648,7 +1615,7 @@ static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
	for (i = 0; i < num_rx_rings; i++) {		for (i = 0; i < num_rx_rings; i++) {
	j = adapter->rx_ring[i].reg_idx;		j = adapter->rx_ring[i].reg_idx;
	rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(j));		rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(j));
	rxdctl \|= IXGBE_RXDCTL_ENABLE;		rxdctl \|= IXGBE_RXDCTL_ENABLE \| IXGBE_RXDCTL_VME;
	if (hw->mac.type == ixgbe_mac_X540_vf) {		if (hw->mac.type == ixgbe_mac_X540_vf) {
	rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;		rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;
	rxdctl \|= ((netdev->mtu + ETH_HLEN + ETH_FCS_LEN) \|		rxdctl \|= ((netdev->mtu + ETH_HLEN + ETH_FCS_LEN) \|
	@@ -3258,7 +3225,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
	.ndo_set_mac_address = ixgbevf_set_mac,		.ndo_set_mac_address = ixgbevf_set_mac,
	.ndo_change_mtu = ixgbevf_change_mtu,		.ndo_change_mtu = ixgbevf_change_mtu,
	.ndo_tx_timeout = ixgbevf_tx_timeout,		.ndo_tx_timeout = ixgbevf_tx_timeout,
	.ndo_vlan_rx_register = ixgbevf_vlan_rx_register,
	.ndo_vlan_rx_add_vid = ixgbevf_vlan_rx_add_vid,		.ndo_vlan_rx_add_vid = ixgbevf_vlan_rx_add_vid,
	.ndo_vlan_rx_kill_vid = ixgbevf_vlan_rx_kill_vid,		.ndo_vlan_rx_kill_vid = ixgbevf_vlan_rx_kill_vid,
	};		};