aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjit Khaparde <ajit.khaparde@emulex.com>2013-09-27 16:18:16 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-27 17:11:49 -0400
commit1aa9673c209e5701d7226e9389349b53fa560536 (patch)
treede2657d9b590faadc8bced9fa319cdd94da1edce
parentd9d604f865ea82a6d344871c76f4a01cbb0b2b0f (diff)
be2net: Fix number of VLANs supported in UMC mode for BE3-R.
In BE3-R, when UMC is enabled, the number of VLANs that can be added to the interface is reduced to 15. Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/emulex/benet/be.h1
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 95d303d2da94..db020230bd0b 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -88,6 +88,7 @@ static inline char *nic_name(struct pci_dev *pdev)
88#define BE_MIN_MTU 256 88#define BE_MIN_MTU 256
89 89
90#define BE_NUM_VLANS_SUPPORTED 64 90#define BE_NUM_VLANS_SUPPORTED 64
91#define BE_UMC_NUM_VLANS_SUPPORTED 15
91#define BE_MAX_EQD 96u 92#define BE_MAX_EQD 96u
92#define BE_MAX_TX_FRAG_COUNT 30 93#define BE_MAX_TX_FRAG_COUNT 30
93 94
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 036f5830fee4..2962d2ff9f1c 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2985,6 +2985,8 @@ static void BEx_get_resources(struct be_adapter *adapter,
2985 2985
2986 if (adapter->function_mode & FLEX10_MODE) 2986 if (adapter->function_mode & FLEX10_MODE)
2987 res->max_vlans = BE_NUM_VLANS_SUPPORTED/8; 2987 res->max_vlans = BE_NUM_VLANS_SUPPORTED/8;
2988 else if (adapter->function_mode & UMC_ENABLED)
2989 res->max_vlans = BE_UMC_NUM_VLANS_SUPPORTED;
2988 else 2990 else
2989 res->max_vlans = BE_NUM_VLANS_SUPPORTED; 2991 res->max_vlans = BE_NUM_VLANS_SUPPORTED;
2990 res->max_mcast_mac = BE_MAX_MC; 2992 res->max_mcast_mac = BE_MAX_MC;