fm10k: Have the VF get the default VLAN during init

[linux-2.6-block.git] / drivers / net / ethernet / intel / fm10k / fm10k_vf.c

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_vf.c b/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
index 17219678439abbfa2a3f2acd3dddd09c6ffee94e..94f0f6a146d96e7e57fe9bf647bf6ae480a727b4 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
@@ -1,5 +1,5 @@
 /* Intel Ethernet Switch Host Interface Driver
- * Copyright(c) 2013 - 2014 Intel Corporation.
+ * Copyright(c) 2013 - 2015 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -124,6 +124,10 @@ static s32 fm10k_init_hw_vf(struct fm10k_hw *hw)
        /* record maximum queue count */
        hw->mac.max_queues = i;
 
+       /* fetch default VLAN */
+       hw->mac.default_vid = (fm10k_read_reg(hw, FM10K_TXQCTL(0)) &
+                              FM10K_TXQCTL_VID_MASK) >> FM10K_TXQCTL_VID_SHIFT;
+
        return 0;
 }