forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: vlan: prepare for 802.1ad VLAN filtering offload

Browse source 
Change the rx_{add,kill}_vid callbacks to take a protocol argument in
preparation of 802.1ad support. The protocol argument used so far is
always htons(ETH_P_8021Q).

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2013-04-19 02:04:28 +00:00 • committed by David S. Miller
commit 80d5c3689b
34 changed files with 184 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/net/bonding/bond_main.c
View file

@ -428,14 +428,15 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
* @bond_dev: bonding net device that got called * @bond_dev: bonding net device that got called
* @vid: vlan id being added * @vid: vlan id being added
*/ */
static int bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid) static int bond_vlan_rx_add_vid(struct net_device *bond_dev,
__be16 proto, u16 vid)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave, *stop_at; struct slave *slave, *stop_at;
int i, res; int i, res;
bond_for_each_slave(bond, slave, i) { bond_for_each_slave(bond, slave, i) {
res = vlan_vid_add(slave->dev, vid); res = vlan_vid_add(slave->dev, proto, vid);
if (res) if (res)
goto unwind; goto unwind;
} }
@ -453,7 +454,7 @@ unwind:
/* unwind from head to the slave that failed */ /* unwind from head to the slave that failed */
stop_at = slave; stop_at = slave;
bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at) bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at)
vlan_vid_del(slave->dev, vid); vlan_vid_del(slave->dev, proto, vid);
return res; return res;
} }
@ -463,14 +464,15 @@ unwind:
* @bond_dev: bonding net device that got called * @bond_dev: bonding net device that got called
* @vid: vlan id being removed * @vid: vlan id being removed
*/ */
static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid) static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,
__be16 proto, u16 vid)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave; struct slave *slave;
int i, res; int i, res;
bond_for_each_slave(bond, slave, i) bond_for_each_slave(bond, slave, i)
vlan_vid_del(slave->dev, vid); vlan_vid_del(slave->dev, proto, vid);
res = bond_del_vlan(bond, vid); res = bond_del_vlan(bond, vid);
if (res) { if (res) {
@ -488,7 +490,8 @@ static void bond_add_vlans_on_slave(struct bonding *bond, struct net_device *sla
int res; int res;
list_for_each_entry(vlan, &bond->vlan_list, vlan_list) { list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
res = vlan_vid_add(slave_dev, vlan->vlan_id); res = vlan_vid_add(slave_dev, htons(ETH_P_8021Q),
vlan->vlan_id);
if (res) if (res)
pr_warning("%s: Failed to add vlan id %d to device %s\n", pr_warning("%s: Failed to add vlan id %d to device %s\n",
bond->dev->name, vlan->vlan_id, bond->dev->name, vlan->vlan_id,
@ -504,7 +507,7 @@ static void bond_del_vlans_from_slave(struct bonding *bond,
list_for_each_entry(vlan, &bond->vlan_list, vlan_list) { list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
if (!vlan->vlan_id) if (!vlan->vlan_id)
continue; continue;
vlan_vid_del(slave_dev, vlan->vlan_id); vlan_vid_del(slave_dev, htons(ETH_P_8021Q), vlan->vlan_id);
} }
} }

6
drivers/net/ethernet/adaptec/starfire.c
View file

@ -594,7 +594,8 @@ static const struct ethtool_ops ethtool_ops;
#ifdef VLAN_SUPPORT #ifdef VLAN_SUPPORT
static int netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) static int netdev_vlan_rx_add_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct netdev_private *np = netdev_priv(dev); struct netdev_private *np = netdev_priv(dev);
@ -608,7 +609,8 @@ static int netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
return 0; return 0;
} }
static int netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) static int netdev_vlan_rx_kill_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct netdev_private *np = netdev_priv(dev); struct netdev_private *np = netdev_priv(dev);

6
drivers/net/ethernet/brocade/bna/bnad.c
View file

@ -3068,8 +3068,7 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu)
} }
static int static int
bnad_vlan_rx_add_vid(struct net_device *netdev, bnad_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
unsigned short vid)
{ {
struct bnad *bnad = netdev_priv(netdev); struct bnad *bnad = netdev_priv(netdev);
unsigned long flags; unsigned long flags;
@ -3090,8 +3089,7 @@ bnad_vlan_rx_add_vid(struct net_device *netdev,
} }
static int static int
bnad_vlan_rx_kill_vid(struct net_device *netdev, bnad_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
unsigned short vid)
{ {
struct bnad *bnad = netdev_priv(netdev); struct bnad *bnad = netdev_priv(netdev);
unsigned long flags; unsigned long flags;

4
drivers/net/ethernet/cisco/enic/enic_dev.c
View file

@ -212,7 +212,7 @@ int enic_dev_deinit_done(struct enic *enic, int *status)
} }
/* rtnl lock is held */ /* rtnl lock is held */
int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid) int enic_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct enic *enic = netdev_priv(netdev); struct enic *enic = netdev_priv(netdev);
int err; int err;
@ -225,7 +225,7 @@ int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
} }
/* rtnl lock is held */ /* rtnl lock is held */
int enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) int enic_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct enic *enic = netdev_priv(netdev); struct enic *enic = netdev_priv(netdev);
int err; int err;

4
drivers/net/ethernet/cisco/enic/enic_dev.h
View file

@ -46,8 +46,8 @@ int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
int broadcast, int promisc, int allmulti); int broadcast, int promisc, int allmulti);
int enic_dev_add_addr(struct enic *enic, u8 *addr); int enic_dev_add_addr(struct enic *enic, u8 *addr);
int enic_dev_del_addr(struct enic *enic, u8 *addr); int enic_dev_del_addr(struct enic *enic, u8 *addr);
int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid); int enic_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid);
int enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid); int enic_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid);
int enic_dev_notify_unset(struct enic *enic); int enic_dev_notify_unset(struct enic *enic);
int enic_dev_hang_notify(struct enic *enic); int enic_dev_hang_notify(struct enic *enic);
int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic); int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);

4
drivers/net/ethernet/emulex/benet/be_main.c
View file

@ -902,7 +902,7 @@ set_vlan_promisc:
return status; return status;
} }
static int be_vlan_add_vid(struct net_device *netdev, u16 vid) static int be_vlan_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct be_adapter *adapter = netdev_priv(netdev); struct be_adapter *adapter = netdev_priv(netdev);
int status = 0; int status = 0;
@ -928,7 +928,7 @@ ret:
return status; return status;
} }
static int be_vlan_rem_vid(struct net_device *netdev, u16 vid) static int be_vlan_rem_vid(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct be_adapter *adapter = netdev_priv(netdev); struct be_adapter *adapter = netdev_priv(netdev);
int status = 0; int status = 0;

4
drivers/net/ethernet/ibm/ehea/ehea_main.c
View file

@ -2110,7 +2110,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
static int ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) static int ehea_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct ehea_port *port = netdev_priv(dev); struct ehea_port *port = netdev_priv(dev);
struct ehea_adapter *adapter = port->adapter; struct ehea_adapter *adapter = port->adapter;
@ -2148,7 +2148,7 @@ out:
return err; return err;
} }
static int ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) static int ehea_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct ehea_port *port = netdev_priv(dev); struct ehea_port *port = netdev_priv(dev);
struct ehea_adapter *adapter = port->adapter; struct ehea_adapter *adapter = port->adapter;

22
drivers/net/ethernet/intel/e1000/e1000_main.c
View file

@ -166,8 +166,10 @@ static void e1000_vlan_mode(struct net_device *netdev,
netdev_features_t features); netdev_features_t features);
static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter, static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
bool filter_on); bool filter_on);
static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid); static int e1000_vlan_rx_add_vid(struct net_device *netdev,
static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid); __be16 proto, u16 vid);
static int e1000_vlan_rx_kill_vid(struct net_device *netdev,
__be16 proto, u16 vid);
static void e1000_restore_vlan(struct e1000_adapter *adapter); static void e1000_restore_vlan(struct e1000_adapter *adapter);
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -333,7 +335,7 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
if (!test_bit(vid, adapter->active_vlans)) { if (!test_bit(vid, adapter->active_vlans)) {
if (hw->mng_cookie.status & if (hw->mng_cookie.status &
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) { E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
e1000_vlan_rx_add_vid(netdev, vid); e1000_vlan_rx_add_vid(netdev, htons(ETH_P_8021Q), vid);
adapter->mng_vlan_id = vid; adapter->mng_vlan_id = vid;
} else { } else {
adapter->mng_vlan_id = E1000_MNG_VLAN_NONE; adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
@ -341,7 +343,8 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
if ((old_vid != (u16)E1000_MNG_VLAN_NONE) && if ((old_vid != (u16)E1000_MNG_VLAN_NONE) &&
(vid != old_vid) && (vid != old_vid) &&
!test_bit(old_vid, adapter->active_vlans)) !test_bit(old_vid, adapter->active_vlans))
e1000_vlan_rx_kill_vid(netdev, old_vid); e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
old_vid);
} else { } else {
adapter->mng_vlan_id = vid; adapter->mng_vlan_id = vid;
} }
@ -1457,7 +1460,8 @@ static int e1000_close(struct net_device *netdev)
if ((hw->mng_cookie.status & if ((hw->mng_cookie.status &
E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
!test_bit(adapter->mng_vlan_id, adapter->active_vlans)) { !test_bit(adapter->mng_vlan_id, adapter->active_vlans)) {
e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id); e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
adapter->mng_vlan_id);
} }
return 0; return 0;
@ -4837,7 +4841,8 @@ static void e1000_vlan_mode(struct net_device *netdev,
e1000_irq_enable(adapter); e1000_irq_enable(adapter);
} }
static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid) static int e1000_vlan_rx_add_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -4862,7 +4867,8 @@ static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
return 0; return 0;
} }
static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) static int e1000_vlan_rx_kill_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -4896,7 +4902,7 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter)
e1000_vlan_filter_on_off(adapter, true); e1000_vlan_filter_on_off(adapter, true);
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
e1000_vlan_rx_add_vid(adapter->netdev, vid); e1000_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
} }
int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx) int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)

20
drivers/net/ethernet/intel/e1000e/netdev.c
View file

@ -2672,7 +2672,8 @@ static int e1000e_poll(struct napi_struct *napi, int weight)
return work_done; return work_done;
} }
static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid) static int e1000_vlan_rx_add_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -2697,7 +2698,8 @@ static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
return 0; return 0;
} }
static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) static int e1000_vlan_rx_kill_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -2741,7 +2743,8 @@ static void e1000e_vlan_filter_disable(struct e1000_adapter *adapter)
ew32(RCTL, rctl); ew32(RCTL, rctl);
if (adapter->mng_vlan_id != (u16)E1000_MNG_VLAN_NONE) { if (adapter->mng_vlan_id != (u16)E1000_MNG_VLAN_NONE) {
e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id); e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
adapter->mng_vlan_id);
adapter->mng_vlan_id = E1000_MNG_VLAN_NONE; adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
} }
} }
@ -2802,22 +2805,22 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
u16 old_vid = adapter->mng_vlan_id; u16 old_vid = adapter->mng_vlan_id;
if (adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN) { if (adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN) {
e1000_vlan_rx_add_vid(netdev, vid); e1000_vlan_rx_add_vid(netdev, htons(ETH_P_8021Q), vid);
adapter->mng_vlan_id = vid; adapter->mng_vlan_id = vid;
} }
if ((old_vid != (u16)E1000_MNG_VLAN_NONE) && (vid != old_vid)) if ((old_vid != (u16)E1000_MNG_VLAN_NONE) && (vid != old_vid))
e1000_vlan_rx_kill_vid(netdev, old_vid); e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q), old_vid);
} }
static void e1000_restore_vlan(struct e1000_adapter *adapter) static void e1000_restore_vlan(struct e1000_adapter *adapter)
{ {
u16 vid; u16 vid;
e1000_vlan_rx_add_vid(adapter->netdev, 0); e1000_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), 0);
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
e1000_vlan_rx_add_vid(adapter->netdev, vid); e1000_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
} }
static void e1000_init_manageability_pt(struct e1000_adapter *adapter) static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
@ -4384,7 +4387,8 @@ static int e1000_close(struct net_device *netdev)
* the same ID is registered on the host OS (let 8021q kill it) * the same ID is registered on the host OS (let 8021q kill it)
*/ */
if (adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN) if (adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN)
e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id); e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
adapter->mng_vlan_id);
/* If AMT is enabled, let the firmware know that the network /* If AMT is enabled, let the firmware know that the network
* interface is now closed * interface is now closed

12
drivers/net/ethernet/intel/igb/igb_main.c
View file

@ -159,8 +159,8 @@ static int igb_ioctl(struct net_device *, struct ifreq *, int cmd);
static void igb_tx_timeout(struct net_device *); static void igb_tx_timeout(struct net_device *);
static void igb_reset_task(struct work_struct *); static void igb_reset_task(struct work_struct *);
static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features); static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features);
static int igb_vlan_rx_add_vid(struct net_device *, u16); static int igb_vlan_rx_add_vid(struct net_device *, __be16, u16);
static int igb_vlan_rx_kill_vid(struct net_device *, u16); static int igb_vlan_rx_kill_vid(struct net_device *, __be16, u16);
static void igb_restore_vlan(struct igb_adapter *); static void igb_restore_vlan(struct igb_adapter *);
static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8); static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
static void igb_ping_all_vfs(struct igb_adapter *); static void igb_ping_all_vfs(struct igb_adapter *);
@ -6976,7 +6976,8 @@ static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features)
igb_rlpml_set(adapter); igb_rlpml_set(adapter);
} }
static int igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid) static int igb_vlan_rx_add_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct igb_adapter *adapter = netdev_priv(netdev); struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -6993,7 +6994,8 @@ static int igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
return 0; return 0;
} }
static int igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) static int igb_vlan_rx_kill_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct igb_adapter *adapter = netdev_priv(netdev); struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -7019,7 +7021,7 @@ static void igb_restore_vlan(struct igb_adapter *adapter)
igb_vlan_mode(adapter->netdev, adapter->netdev->features); igb_vlan_mode(adapter->netdev, adapter->netdev->features);
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
igb_vlan_rx_add_vid(adapter->netdev, vid); igb_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
} }
int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx) int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx)

8
drivers/net/ethernet/intel/igbvf/netdev.c
View file

@ -1230,7 +1230,8 @@ static void igbvf_set_rlpml(struct igbvf_adapter *adapter)
e1000_rlpml_set_vf(hw, max_frame_size); e1000_rlpml_set_vf(hw, max_frame_size);
} }
static int igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid) static int igbvf_vlan_rx_add_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct igbvf_adapter *adapter = netdev_priv(netdev); struct igbvf_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -1243,7 +1244,8 @@ static int igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
return 0; return 0;
} }
static int igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) static int igbvf_vlan_rx_kill_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct igbvf_adapter *adapter = netdev_priv(netdev); struct igbvf_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -1262,7 +1264,7 @@ static void igbvf_restore_vlan(struct igbvf_adapter *adapter)
u16 vid; u16 vid;
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
igbvf_vlan_rx_add_vid(adapter->netdev, vid); igbvf_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
} }
/** /**

12
drivers/net/ethernet/intel/ixgb/ixgb_main.c
View file

@ -101,8 +101,10 @@ static void ixgb_tx_timeout_task(struct work_struct *work);
static void ixgb_vlan_strip_enable(struct ixgb_adapter *adapter); static void ixgb_vlan_strip_enable(struct ixgb_adapter *adapter);
static void ixgb_vlan_strip_disable(struct ixgb_adapter *adapter); static void ixgb_vlan_strip_disable(struct ixgb_adapter *adapter);
static int ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid); static int ixgb_vlan_rx_add_vid(struct net_device *netdev,
static int ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid); __be16 proto, u16 vid);
static int ixgb_vlan_rx_kill_vid(struct net_device *netdev,
__be16 proto, u16 vid);
static void ixgb_restore_vlan(struct ixgb_adapter *adapter); static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
@ -2209,7 +2211,7 @@ ixgb_vlan_strip_disable(struct ixgb_adapter *adapter)
} }
static int static int
ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid) ixgb_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct ixgb_adapter *adapter = netdev_priv(netdev); struct ixgb_adapter *adapter = netdev_priv(netdev);
u32 vfta, index; u32 vfta, index;
@ -2226,7 +2228,7 @@ ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
} }
static int static int
ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) ixgb_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct ixgb_adapter *adapter = netdev_priv(netdev); struct ixgb_adapter *adapter = netdev_priv(netdev);
u32 vfta, index; u32 vfta, index;
@ -2248,7 +2250,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter)
u16 vid; u16 vid;
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
ixgb_vlan_rx_add_vid(adapter->netdev, vid); ixgb_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
} }
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER

10
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View file

@ -3467,7 +3467,8 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
hw->mac.ops.enable_rx_dma(hw, rxctrl); hw->mac.ops.enable_rx_dma(hw, rxctrl);
} }
static int ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid) static int ixgbe_vlan_rx_add_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_adapter *adapter = netdev_priv(netdev);
struct ixgbe_hw *hw = &adapter->hw; struct ixgbe_hw *hw = &adapter->hw;
@ -3479,7 +3480,8 @@ static int ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
return 0; return 0;
} }
static int ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) static int ixgbe_vlan_rx_kill_vid(struct net_device *netdev,
__be16 proto, u16 vid)
{ {
struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_adapter *adapter = netdev_priv(netdev);
struct ixgbe_hw *hw = &adapter->hw; struct ixgbe_hw *hw = &adapter->hw;
@ -3584,10 +3586,10 @@ static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
{ {
u16 vid; u16 vid;
ixgbe_vlan_rx_add_vid(adapter->netdev, 0); ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), 0);
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
ixgbe_vlan_rx_add_vid(adapter->netdev, vid); ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
} }
/** /**

9
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
View file

@ -1179,7 +1179,8 @@ static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)
} }
} }
static int ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid) static int ixgbevf_vlan_rx_add_vid(struct net_device *netdev,
__be16 proto, 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;
@ -1204,7 +1205,8 @@ static int ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
return err; return err;
} }
static int ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) static int ixgbevf_vlan_rx_kill_vid(struct net_device *netdev,
__be16 proto, 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;
@ -1227,7 +1229,8 @@ static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter)
u16 vid; u16 vid;
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID) for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
ixgbevf_vlan_rx_add_vid(adapter->netdev, vid); ixgbevf_vlan_rx_add_vid(adapter->netdev,
htons(ETH_P_8021Q), vid);
} }
static int ixgbevf_write_uc_addr_list(struct net_device *netdev) static int ixgbevf_write_uc_addr_list(struct net_device *netdev)

6
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
View file

@ -356,7 +356,8 @@ static void mlx4_en_filter_rfs_expire(struct mlx4_en_priv *priv)
} }
#endif #endif
static int mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) static int mlx4_en_vlan_rx_add_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_priv *priv = netdev_priv(dev);
struct mlx4_en_dev *mdev = priv->mdev; struct mlx4_en_dev *mdev = priv->mdev;
@ -381,7 +382,8 @@ static int mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
return 0; return 0;
} }
static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_priv *priv = netdev_priv(dev);
struct mlx4_en_dev *mdev = priv->mdev; struct mlx4_en_dev *mdev = priv->mdev;

8
drivers/net/ethernet/neterion/vxge/vxge-main.c
View file

@ -3300,12 +3300,13 @@ static void vxge_tx_watchdog(struct net_device *dev)
/** /**
* vxge_vlan_rx_add_vid * vxge_vlan_rx_add_vid
* @dev: net device pointer. * @dev: net device pointer.
* @proto: vlan protocol
* @vid: vid * @vid: vid
* *
* Add the vlan id to the devices vlan id table * Add the vlan id to the devices vlan id table
*/ */
static int static int
vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) vxge_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct vxgedev *vdev = netdev_priv(dev); struct vxgedev *vdev = netdev_priv(dev);
struct vxge_vpath *vpath; struct vxge_vpath *vpath;
@ -3323,14 +3324,15 @@ vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
} }
/** /**
* vxge_vlan_rx_add_vid * vxge_vlan_rx_kill_vid
* @dev: net device pointer. * @dev: net device pointer.
* @proto: vlan protocol
* @vid: vid * @vid: vid
* *
* Remove the vlan id from the device's vlan id table * Remove the vlan id from the device's vlan id table
*/ */
static int static int
vxge_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) vxge_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct vxgedev *vdev = netdev_priv(dev); struct vxgedev *vdev = netdev_priv(dev);
struct vxge_vpath *vpath; struct vxge_vpath *vpath;

8
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
View file

@ -86,8 +86,8 @@ static void qlcnic_dev_set_npar_ready(struct qlcnic_adapter *);
static int qlcnicvf_start_firmware(struct qlcnic_adapter *); static int qlcnicvf_start_firmware(struct qlcnic_adapter *);
static void qlcnic_set_netdev_features(struct qlcnic_adapter *, static void qlcnic_set_netdev_features(struct qlcnic_adapter *,
struct qlcnic_esw_func_cfg *); struct qlcnic_esw_func_cfg *);
static int qlcnic_vlan_rx_add(struct net_device *, u16); static int qlcnic_vlan_rx_add(struct net_device *, __be16, u16);
static int qlcnic_vlan_rx_del(struct net_device *, u16); static int qlcnic_vlan_rx_del(struct net_device *, __be16, u16);
#define QLCNIC_IS_TSO_CAPABLE(adapter) \ #define QLCNIC_IS_TSO_CAPABLE(adapter) \
((adapter)->ahw->capabilities & QLCNIC_FW_CAPABILITY_TSO) ((adapter)->ahw->capabilities & QLCNIC_FW_CAPABILITY_TSO)
@ -902,7 +902,7 @@ void qlcnic_set_vlan_config(struct qlcnic_adapter *adapter,
} }
static int static int
qlcnic_vlan_rx_add(struct net_device *netdev, u16 vid) qlcnic_vlan_rx_add(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct qlcnic_adapter *adapter = netdev_priv(netdev); struct qlcnic_adapter *adapter = netdev_priv(netdev);
set_bit(vid, adapter->vlans); set_bit(vid, adapter->vlans);
@ -910,7 +910,7 @@ qlcnic_vlan_rx_add(struct net_device *netdev, u16 vid)
} }
static int static int
qlcnic_vlan_rx_del(struct net_device *netdev, u16 vid) qlcnic_vlan_rx_del(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct qlcnic_adapter *adapter = netdev_priv(netdev); struct qlcnic_adapter *adapter = netdev_priv(netdev);

4
drivers/net/ethernet/qlogic/qlge/qlge_main.c
View file

@ -2326,7 +2326,7 @@ static int __qlge_vlan_rx_add_vid(struct ql_adapter *qdev, u16 vid)
return err; return err;
} }
static int qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid) static int qlge_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
{ {
struct ql_adapter *qdev = netdev_priv(ndev); struct ql_adapter *qdev = netdev_priv(ndev);
int status; int status;
@ -2357,7 +2357,7 @@ static int __qlge_vlan_rx_kill_vid(struct ql_adapter *qdev, u16 vid)
return err; return err;
} }
static int qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid) static int qlge_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
{ {
struct ql_adapter *qdev = netdev_priv(ndev); struct ql_adapter *qdev = netdev_priv(ndev);
int status; int status;

6
drivers/net/ethernet/renesas/sh_eth.c
View file

@ -2448,7 +2448,8 @@ static int sh_eth_get_vtag_index(struct sh_eth_private *mdp)
return TSU_VTAG1; return TSU_VTAG1;
} }
static int sh_eth_vlan_rx_add_vid(struct net_device *ndev, u16 vid) static int sh_eth_vlan_rx_add_vid(struct net_device *ndev,
__be16 proto, u16 vid)
{ {
struct sh_eth_private *mdp = netdev_priv(ndev); struct sh_eth_private *mdp = netdev_priv(ndev);
int vtag_reg_index = sh_eth_get_vtag_index(mdp); int vtag_reg_index = sh_eth_get_vtag_index(mdp);
@ -2478,7 +2479,8 @@ static int sh_eth_vlan_rx_add_vid(struct net_device *ndev, u16 vid)
return 0; return 0;
} }
static int sh_eth_vlan_rx_kill_vid(struct net_device *ndev, u16 vid) static int sh_eth_vlan_rx_kill_vid(struct net_device *ndev,
__be16 proto, u16 vid)
{ {
struct sh_eth_private *mdp = netdev_priv(ndev); struct sh_eth_private *mdp = netdev_priv(ndev);
int vtag_reg_index = sh_eth_get_vtag_index(mdp); int vtag_reg_index = sh_eth_get_vtag_index(mdp);

4
drivers/net/ethernet/tehuti/tehuti.c
View file

@ -733,7 +733,7 @@ static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable)
* @ndev: network device * @ndev: network device
* @vid: VLAN vid to add * @vid: VLAN vid to add
*/ */
static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid) static int bdx_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
{ {
__bdx_vlan_rx_vid(ndev, vid, 1); __bdx_vlan_rx_vid(ndev, vid, 1);
return 0; return 0;
@ -744,7 +744,7 @@ static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)
* @ndev: network device * @ndev: network device
* @vid: VLAN vid to kill * @vid: VLAN vid to kill
*/ */
static int bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid) static int bdx_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
{ {
__bdx_vlan_rx_vid(ndev, vid, 0); __bdx_vlan_rx_vid(ndev, vid, 0);
return 0; return 0;

4
drivers/net/ethernet/ti/cpsw.c
View file

@ -1251,7 +1251,7 @@ clean_vid:
} }
static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev, static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev,
unsigned short vid) __be16 proto, u16 vid)
{ {
struct cpsw_priv *priv = netdev_priv(ndev); struct cpsw_priv *priv = netdev_priv(ndev);
@ -1263,7 +1263,7 @@ static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev,
} }
static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev, static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev,
unsigned short vid) __be16 proto, u16 vid)
{ {
struct cpsw_priv *priv = netdev_priv(ndev); struct cpsw_priv *priv = netdev_priv(ndev);
int ret; int ret;

10
drivers/net/ethernet/via/via-rhine.c
View file

@ -508,8 +508,10 @@ static struct rtnl_link_stats64 *rhine_get_stats64(struct net_device *dev,
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static const struct ethtool_ops netdev_ethtool_ops; static const struct ethtool_ops netdev_ethtool_ops;
static int rhine_close(struct net_device *dev); static int rhine_close(struct net_device *dev);
static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid); static int rhine_vlan_rx_add_vid(struct net_device *dev,
static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid); __be16 proto, u16 vid);
static int rhine_vlan_rx_kill_vid(struct net_device *dev,
__be16 proto, u16 vid);
static void rhine_restart_tx(struct net_device *dev); static void rhine_restart_tx(struct net_device *dev);
static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool low) static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool low)
@ -1415,7 +1417,7 @@ static void rhine_update_vcam(struct net_device *dev)
rhine_set_vlan_cam_mask(ioaddr, vCAMmask); rhine_set_vlan_cam_mask(ioaddr, vCAMmask);
} }
static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) static int rhine_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct rhine_private *rp = netdev_priv(dev); struct rhine_private *rp = netdev_priv(dev);
@ -1426,7 +1428,7 @@ static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
return 0; return 0;
} }
static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) static int rhine_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct rhine_private *rp = netdev_priv(dev); struct rhine_private *rp = netdev_priv(dev);

6
drivers/net/ethernet/via/via-velocity.c
View file

@ -525,7 +525,8 @@ static void velocity_init_cam_filter(struct velocity_info *vptr)
mac_set_vlan_cam_mask(regs, vptr->vCAMmask); mac_set_vlan_cam_mask(regs, vptr->vCAMmask);
} }
static int velocity_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) static int velocity_vlan_rx_add_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct velocity_info *vptr = netdev_priv(dev); struct velocity_info *vptr = netdev_priv(dev);
@ -536,7 +537,8 @@ static int velocity_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
return 0; return 0;
} }
static int velocity_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) static int velocity_vlan_rx_kill_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct velocity_info *vptr = netdev_priv(dev); struct velocity_info *vptr = netdev_priv(dev);

8
drivers/net/macvlan.c
View file

@ -567,21 +567,21 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
} }
static int macvlan_vlan_rx_add_vid(struct net_device *dev, static int macvlan_vlan_rx_add_vid(struct net_device *dev,
unsigned short vid) __be16 proto, u16 vid)
{ {
struct macvlan_dev *vlan = netdev_priv(dev); struct macvlan_dev *vlan = netdev_priv(dev);
struct net_device *lowerdev = vlan->lowerdev; struct net_device *lowerdev = vlan->lowerdev;
return vlan_vid_add(lowerdev, vid); return vlan_vid_add(lowerdev, proto, vid);
} }
static int macvlan_vlan_rx_kill_vid(struct net_device *dev, static int macvlan_vlan_rx_kill_vid(struct net_device *dev,
unsigned short vid) __be16 proto, u16 vid)
{ {
struct macvlan_dev *vlan = netdev_priv(dev); struct macvlan_dev *vlan = netdev_priv(dev);
struct net_device *lowerdev = vlan->lowerdev; struct net_device *lowerdev = vlan->lowerdev;
vlan_vid_del(lowerdev, vid); vlan_vid_del(lowerdev, proto, vid);
return 0; return 0;
} }

10
drivers/net/team/team.c
View file

@ -1598,7 +1598,7 @@ team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
return stats; return stats;
} }
static int team_vlan_rx_add_vid(struct net_device *dev, uint16_t vid) static int team_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct team *team = netdev_priv(dev); struct team *team = netdev_priv(dev);
struct team_port *port; struct team_port *port;
@ -1610,7 +1610,7 @@ static int team_vlan_rx_add_vid(struct net_device *dev, uint16_t vid)
*/ */
mutex_lock(&team->lock); mutex_lock(&team->lock);
list_for_each_entry(port, &team->port_list, list) { list_for_each_entry(port, &team->port_list, list) {
err = vlan_vid_add(port->dev, vid); err = vlan_vid_add(port->dev, proto, vid);
if (err) if (err)
goto unwind; goto unwind;
} }
@ -1620,20 +1620,20 @@ static int team_vlan_rx_add_vid(struct net_device *dev, uint16_t vid)
unwind: unwind:
list_for_each_entry_continue_reverse(port, &team->port_list, list) list_for_each_entry_continue_reverse(port, &team->port_list, list)
vlan_vid_del(port->dev, vid); vlan_vid_del(port->dev, proto, vid);
mutex_unlock(&team->lock); mutex_unlock(&team->lock);
return err; return err;
} }
static int team_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid) static int team_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct team *team = netdev_priv(dev); struct team *team = netdev_priv(dev);
struct team_port *port; struct team_port *port;
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(port, &team->port_list, list) list_for_each_entry_rcu(port, &team->port_list, list)
vlan_vid_del(port->dev, vid); vlan_vid_del(port->dev, proto, vid);
rcu_read_unlock(); rcu_read_unlock();
return 0; return 0;

6
drivers/net/virtio_net.c
View file

@ -1006,7 +1006,8 @@ static void virtnet_set_rx_mode(struct net_device *dev)
kfree(buf); kfree(buf);
} }
static int virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid) static int virtnet_vlan_rx_add_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct virtnet_info *vi = netdev_priv(dev); struct virtnet_info *vi = netdev_priv(dev);
struct scatterlist sg; struct scatterlist sg;
@ -1019,7 +1020,8 @@ static int virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
return 0; return 0;
} }
static int virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid) static int virtnet_vlan_rx_kill_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct virtnet_info *vi = netdev_priv(dev); struct virtnet_info *vi = netdev_priv(dev);
struct scatterlist sg; struct scatterlist sg;

4
drivers/net/vmxnet3/vmxnet3_drv.c
View file

@ -1931,7 +1931,7 @@ vmxnet3_restore_vlan(struct vmxnet3_adapter *adapter)
static int static int
vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid) vmxnet3_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct vmxnet3_adapter *adapter = netdev_priv(netdev); struct vmxnet3_adapter *adapter = netdev_priv(netdev);
@ -1953,7 +1953,7 @@ vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
static int static int
vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
{ {
struct vmxnet3_adapter *adapter = netdev_priv(netdev); struct vmxnet3_adapter *adapter = netdev_priv(netdev);

6
drivers/s390/net/qeth_l2_main.c
View file

@ -302,7 +302,8 @@ static void qeth_l2_process_vlans(struct qeth_card *card)
spin_unlock_bh(&card->vlanlock); spin_unlock_bh(&card->vlanlock);
} }
static int qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) static int qeth_l2_vlan_rx_add_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct qeth_card *card = dev->ml_priv; struct qeth_card *card = dev->ml_priv;
struct qeth_vlan_vid *id; struct qeth_vlan_vid *id;
@ -331,7 +332,8 @@ static int qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
return 0; return 0;
} }
static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct qeth_vlan_vid *id, *tmpid = NULL; struct qeth_vlan_vid *id, *tmpid = NULL;
struct qeth_card *card = dev->ml_priv; struct qeth_card *card = dev->ml_priv;

6
drivers/s390/net/qeth_l3_main.c
View file

@ -1824,7 +1824,8 @@ static void qeth_l3_free_vlan_addresses(struct qeth_card *card,
rcu_read_unlock(); rcu_read_unlock();
} }
static int qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) static int qeth_l3_vlan_rx_add_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct qeth_card *card = dev->ml_priv; struct qeth_card *card = dev->ml_priv;
@ -1832,7 +1833,8 @@ static int qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
return 0; return 0;
} }
static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev,
__be16 proto, u16 vid)
{ {
struct qeth_card *card = dev->ml_priv; struct qeth_card *card = dev->ml_priv;
unsigned long flags; unsigned long flags;

4
include/linux/if_vlan.h
View file

@ -93,8 +93,8 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev);
extern bool vlan_do_receive(struct sk_buff **skb); extern bool vlan_do_receive(struct sk_buff **skb);
extern struct sk_buff *vlan_untag(struct sk_buff *skb); extern struct sk_buff *vlan_untag(struct sk_buff *skb);
extern int vlan_vid_add(struct net_device *dev, unsigned short vid); extern int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid);
extern void vlan_vid_del(struct net_device *dev, unsigned short vid); extern void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid);
extern int vlan_vids_add_by_dev(struct net_device *dev, extern int vlan_vids_add_by_dev(struct net_device *dev,
const struct net_device *by_dev); const struct net_device *by_dev);

16
include/linux/netdevice.h
View file

@ -784,15 +784,13 @@ struct netdev_fcoe_hbainfo {
* 3. Update dev->stats asynchronously and atomically, and define * 3. Update dev->stats asynchronously and atomically, and define
* neither operation. * neither operation.
* *
* int (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid); * int (*ndo_vlan_rx_add_vid)(struct net_device *dev, __be16 proto, u16t vid);
* If device support VLAN filtering (dev->features & * If device support VLAN filtering this function is called when a
* NETIF_F_HW_VLAN_CTAG_FILTER) * VLAN id is registered.
* this function is called when a VLAN id is registered.
* *
* int (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid); * int (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid);
* If device support VLAN filtering (dev->features & * If device support VLAN filtering this function is called when a
* NETIF_F_HW_VLAN_CTAG_FILTER) * VLAN id is unregistered.
* this function is called when a VLAN id is unregistered.
* *
* void (*ndo_poll_controller)(struct net_device *dev); * void (*ndo_poll_controller)(struct net_device *dev);
* *
@ -936,9 +934,9 @@ struct net_device_ops {
struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
int (*ndo_vlan_rx_add_vid)(struct net_device *dev, int (*ndo_vlan_rx_add_vid)(struct net_device *dev,
unsigned short vid); __be16 proto, u16 vid);
int (*ndo_vlan_rx_kill_vid)(struct net_device *dev, int (*ndo_vlan_rx_kill_vid)(struct net_device *dev,
unsigned short vid); __be16 proto, u16 vid);
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
void (*ndo_poll_controller)(struct net_device *dev); void (*ndo_poll_controller)(struct net_device *dev);
int (*ndo_netpoll_setup)(struct net_device *dev, int (*ndo_netpoll_setup)(struct net_device *dev,

10
net/8021q/vlan.c
View file

@ -112,7 +112,7 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
* VLAN is not 0 (leave it there for 802.1p). * VLAN is not 0 (leave it there for 802.1p).
*/ */
if (vlan_id) if (vlan_id)
vlan_vid_del(real_dev, vlan_id); vlan_vid_del(real_dev, htons(ETH_P_8021Q), vlan_id);
/* Get rid of the vlan's reference to real_dev */ /* Get rid of the vlan's reference to real_dev */
dev_put(real_dev); dev_put(real_dev);
@ -142,7 +142,7 @@ int register_vlan_dev(struct net_device *dev)
struct vlan_group *grp; struct vlan_group *grp;
int err; int err;
err = vlan_vid_add(real_dev, vlan_id); err = vlan_vid_add(real_dev, htons(ETH_P_8021Q), vlan_id);
if (err) if (err)
return err; return err;
@ -195,7 +195,7 @@ out_uninit_gvrp:
if (grp->nr_vlan_devs == 0) if (grp->nr_vlan_devs == 0)
vlan_gvrp_uninit_applicant(real_dev); vlan_gvrp_uninit_applicant(real_dev);
out_vid_del: out_vid_del:
vlan_vid_del(real_dev, vlan_id); vlan_vid_del(real_dev, htons(ETH_P_8021Q), vlan_id);
return err; return err;
} }
@ -350,7 +350,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
(dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) { (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {
pr_info("adding VLAN 0 to HW filter on device %s\n", pr_info("adding VLAN 0 to HW filter on device %s\n",
dev->name); dev->name);
vlan_vid_add(dev, 0); vlan_vid_add(dev, htons(ETH_P_8021Q), 0);
} }
vlan_info = rtnl_dereference(dev->vlan_info); vlan_info = rtnl_dereference(dev->vlan_info);
@ -416,7 +416,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
case NETDEV_DOWN: case NETDEV_DOWN:
if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER) if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)
vlan_vid_del(dev, 0); vlan_vid_del(dev, htons(ETH_P_8021Q), 0);
/* Put all VLANs for this dev in the down state too. */ /* Put all VLANs for this dev in the down state too. */
for (i = 0; i < VLAN_N_VID; i++) { for (i = 0; i < VLAN_N_VID; i++) {

47
net/8021q/vlan_core.c
View file

@ -185,35 +185,37 @@ static struct vlan_info *vlan_info_alloc(struct net_device *dev)
struct vlan_vid_info { struct vlan_vid_info {
struct list_head list; struct list_head list;
unsigned short vid; __be16 proto;
u16 vid;
int refcount; int refcount;
}; };
static struct vlan_vid_info *vlan_vid_info_get(struct vlan_info *vlan_info, static struct vlan_vid_info *vlan_vid_info_get(struct vlan_info *vlan_info,
unsigned short vid) __be16 proto, u16 vid)
{ {
struct vlan_vid_info *vid_info; struct vlan_vid_info *vid_info;
list_for_each_entry(vid_info, &vlan_info->vid_list, list) { list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
if (vid_info->vid == vid) if (vid_info->proto == proto && vid_info->vid == vid)
return vid_info; return vid_info;
} }
return NULL; return NULL;
} }
static struct vlan_vid_info *vlan_vid_info_alloc(unsigned short vid) static struct vlan_vid_info *vlan_vid_info_alloc(__be16 proto, u16 vid)
{ {
struct vlan_vid_info *vid_info; struct vlan_vid_info *vid_info;
vid_info = kzalloc(sizeof(struct vlan_vid_info), GFP_KERNEL); vid_info = kzalloc(sizeof(struct vlan_vid_info), GFP_KERNEL);
if (!vid_info) if (!vid_info)
return NULL; return NULL;
vid_info->proto = proto;
vid_info->vid = vid; vid_info->vid = vid;
return vid_info; return vid_info;
} }
static int __vlan_vid_add(struct vlan_info *vlan_info, unsigned short vid, static int __vlan_vid_add(struct vlan_info *vlan_info, __be16 proto, u16 vid,
struct vlan_vid_info **pvid_info) struct vlan_vid_info **pvid_info)
{ {
struct net_device *dev = vlan_info->real_dev; struct net_device *dev = vlan_info->real_dev;
@ -221,12 +223,13 @@ static int __vlan_vid_add(struct vlan_info *vlan_info, unsigned short vid,
struct vlan_vid_info *vid_info; struct vlan_vid_info *vid_info;
int err; int err;
vid_info = vlan_vid_info_alloc(vid); vid_info = vlan_vid_info_alloc(proto, vid);
if (!vid_info) if (!vid_info)
return -ENOMEM; return -ENOMEM;
if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER) { if (proto == htons(ETH_P_8021Q) &&
err = ops->ndo_vlan_rx_add_vid(dev, vid); dev->features & NETIF_F_HW_VLAN_CTAG_FILTER) {
err = ops->ndo_vlan_rx_add_vid(dev, proto, vid);
if (err) { if (err) {
kfree(vid_info); kfree(vid_info);
return err; return err;
@ -238,7 +241,7 @@ static int __vlan_vid_add(struct vlan_info *vlan_info, unsigned short vid,
return 0; return 0;
} }
int vlan_vid_add(struct net_device *dev, unsigned short vid) int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct vlan_info *vlan_info; struct vlan_info *vlan_info;
struct vlan_vid_info *vid_info; struct vlan_vid_info *vid_info;
@ -254,9 +257,9 @@ int vlan_vid_add(struct net_device *dev, unsigned short vid)
return -ENOMEM; return -ENOMEM;
vlan_info_created = true; vlan_info_created = true;
} }
vid_info = vlan_vid_info_get(vlan_info, vid); vid_info = vlan_vid_info_get(vlan_info, proto, vid);
if (!vid_info) { if (!vid_info) {
err = __vlan_vid_add(vlan_info, vid, &vid_info); err = __vlan_vid_add(vlan_info, proto, vid, &vid_info);
if (err) if (err)
goto out_free_vlan_info; goto out_free_vlan_info;
} }
@ -279,14 +282,16 @@ static void __vlan_vid_del(struct vlan_info *vlan_info,
{ {
struct net_device *dev = vlan_info->real_dev; struct net_device *dev = vlan_info->real_dev;
const struct net_device_ops *ops = dev->netdev_ops; const struct net_device_ops *ops = dev->netdev_ops;
unsigned short vid = vid_info->vid; __be16 proto = vid_info->proto;
u16 vid = vid_info->vid;
int err; int err;
if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER) { if (proto == htons(ETH_P_8021Q) &&
err = ops->ndo_vlan_rx_kill_vid(dev, vid); dev->features & NETIF_F_HW_VLAN_CTAG_FILTER) {
err = ops->ndo_vlan_rx_kill_vid(dev, proto, vid);
if (err) { if (err) {
pr_warn("failed to kill vid %d for device %s\n", pr_warn("failed to kill vid %04x/%d for device %s\n",
vid, dev->name); proto, vid, dev->name);
} }
} }
list_del(&vid_info->list); list_del(&vid_info->list);
@ -294,7 +299,7 @@ static void __vlan_vid_del(struct vlan_info *vlan_info,
vlan_info->nr_vids--; vlan_info->nr_vids--;
} }
void vlan_vid_del(struct net_device *dev, unsigned short vid) void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid)
{ {
struct vlan_info *vlan_info; struct vlan_info *vlan_info;
struct vlan_vid_info *vid_info; struct vlan_vid_info *vid_info;
@ -305,7 +310,7 @@ void vlan_vid_del(struct net_device *dev, unsigned short vid)
if (!vlan_info) if (!vlan_info)
return; return;
vid_info = vlan_vid_info_get(vlan_info, vid); vid_info = vlan_vid_info_get(vlan_info, proto, vid);
if (!vid_info) if (!vid_info)
return; return;
vid_info->refcount--; vid_info->refcount--;
@ -333,7 +338,7 @@ int vlan_vids_add_by_dev(struct net_device *dev,
return 0; return 0;
list_for_each_entry(vid_info, &vlan_info->vid_list, list) { list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
err = vlan_vid_add(dev, vid_info->vid); err = vlan_vid_add(dev, vid_info->proto, vid_info->vid);
if (err) if (err)
goto unwind; goto unwind;
} }
@ -343,7 +348,7 @@ unwind:
list_for_each_entry_continue_reverse(vid_info, list_for_each_entry_continue_reverse(vid_info,
&vlan_info->vid_list, &vlan_info->vid_list,
list) { list) {
vlan_vid_del(dev, vid_info->vid); vlan_vid_del(dev, vid_info->proto, vid_info->vid);
} }
return err; return err;
@ -363,7 +368,7 @@ void vlan_vids_del_by_dev(struct net_device *dev,
return; return;
list_for_each_entry(vid_info, &vlan_info->vid_list, list) list_for_each_entry(vid_info, &vlan_info->vid_list, list)
vlan_vid_del(dev, vid_info->vid); vlan_vid_del(dev, vid_info->proto, vid_info->vid);
} }
EXPORT_SYMBOL(vlan_vids_del_by_dev); EXPORT_SYMBOL(vlan_vids_del_by_dev);

10
net/bridge/br_vlan.c
View file

@ -34,6 +34,7 @@ static void __vlan_add_flags(struct net_port_vlans *v, u16 vid, u16 flags)
static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags) static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
{ {
const struct net_device_ops *ops;
struct net_bridge_port *p = NULL; struct net_bridge_port *p = NULL;
struct net_bridge *br; struct net_bridge *br;
struct net_device *dev; struct net_device *dev;
@ -53,6 +54,7 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
br = v->parent.br; br = v->parent.br;
dev = br->dev; dev = br->dev;
} }
ops = dev->netdev_ops;
if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) { if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {
/* Add VLAN to the device filter if it is supported. /* Add VLAN to the device filter if it is supported.
@ -61,7 +63,8 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
* that ever changes this code will allow tagged * that ever changes this code will allow tagged
* traffic to enter the bridge. * traffic to enter the bridge.
*/ */
err = dev->netdev_ops->ndo_vlan_rx_add_vid(dev, vid); err = ops->ndo_vlan_rx_add_vid(dev, htons(ETH_P_8021Q),
vid);
if (err) if (err)
return err; return err;
} }
@ -83,7 +86,7 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
out_filt: out_filt:
if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER))
dev->netdev_ops->ndo_vlan_rx_kill_vid(dev, vid); ops->ndo_vlan_rx_kill_vid(dev, htons(ETH_P_8021Q), vid);
return err; return err;
} }
@ -97,9 +100,10 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid)
if (v->port_idx && vid) { if (v->port_idx && vid) {
struct net_device *dev = v->parent.port->dev; struct net_device *dev = v->parent.port->dev;
const struct net_device_ops *ops = dev->netdev_ops;
if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER) if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)
dev->netdev_ops->ndo_vlan_rx_kill_vid(dev, vid); ops->ndo_vlan_rx_kill_vid(dev, htons(ETH_P_8021Q), vid);
} }
clear_bit(vid, v->vlan_bitmap); clear_bit(vid, v->vlan_bitmap);