[Intel-wired-lan] [next PATCH S51 4/9] i40e: remove second check of VLAN_N_VID in i40e_vlan_rx_add_vid
Bimmy Pujari
bimmy.pujari at intel.com
Tue Oct 25 22:17:58 UTC 2016
From: Jacob Keller <jacob.e.keller at intel.com>
Replace a check of magic number 4095 with VLAN_N_VID. This
makes it obvious that a later check against VLAN_N_VID is
always true and can be removed
Signed-off-by: Jacob Keller <jacob.e.keller at intel.com>
Change-ID: I28998f127a61a529480ce63d8a07e266f6c63b7b
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 3a759ea..ed71d4d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -2591,7 +2591,7 @@ static int i40e_vlan_rx_add_vid(struct net_device *netdev,
struct i40e_vsi *vsi = np->vsi;
int ret = 0;
- if (vid > 4095)
+ if (vid >= VLAN_N_VID)
return -EINVAL;
/* If the network stack called us with vid = 0 then
@@ -2603,7 +2603,7 @@ static int i40e_vlan_rx_add_vid(struct net_device *netdev,
if (vid)
ret = i40e_vsi_add_vlan(vsi, vid);
- if (!ret && (vid < VLAN_N_VID))
+ if (!ret)
set_bit(vid, vsi->active_vlans);
return ret;
--
2.4.11
More information about the Intel-wired-lan
mailing list