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

Commit 1414abea authored by Sucheta Chakraborty's avatar Sucheta Chakraborty Committed by David S. Miller
Browse files

qlcnic: Restrict VF from configuring any VLAN mode. 



o Adapter should allow vlan traffic only for vlans configured on a VF.
  On configuring any vlan mode from VF, adapter will allow any vlan
  traffic to pass for that VF. Do not allow VF to configure this mode.

Signed-off-by: default avatarSucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2315dc91

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c

+11 −1
Original line number Diff line number Diff line
@@ -9,9 +9,12 @@ 
#include "qlcnic.h"

#include <linux/types.h>



#define QLCNIC_SRIOV_VF_MAX_MAC 8

#define QLCNIC_SRIOV_VF_MAX_MAC 7

#define QLC_VF_MIN_TX_RATE	100

#define QLC_VF_MAX_TX_RATE	9999

#define QLC_MAC_OPCODE_MASK	0x7

#define QLC_MAC_STAR_ADD	6

#define QLC_MAC_STAR_DEL	7



static int qlcnic_sriov_pf_get_vport_handle(struct qlcnic_adapter *, u8);
@@ -1173,6 +1176,13 @@ static int qlcnic_sriov_validate_cfg_macvlan(struct qlcnic_adapter *adapter, 
	struct qlcnic_vport *vp = vf->vp;

	u8 op, new_op;



	if (((cmd->req.arg[1] & QLC_MAC_OPCODE_MASK) == QLC_MAC_STAR_ADD) ||

	    ((cmd->req.arg[1] & QLC_MAC_OPCODE_MASK) == QLC_MAC_STAR_DEL)) {

		netdev_err(adapter->netdev, "MAC + any VLAN filter not allowed from VF %d\n",

			   vf->pci_func);

		return -EINVAL;

	}



	if (!(cmd->req.arg[1] & BIT_8))

		return -EINVAL;