aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorCatherine Sullivan <catherine.sullivan@intel.com>2014-03-06 04:02:30 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-04-22 00:04:34 -0400
commitacb3676b174366b81eb84ca5f44cbb4f0f29d079 (patch)
tree97914eea7244116d45ff7af56962c61f7848b741 /drivers/net
parent6b192891b88f70b2fcdc12ff7d435658aa387e00 (diff)
i40e/i40evf: Bump build versions
Bump i40e to 0.3.41 and i40evf to 0.9.20. Change-ID: If49251a1a81a0f25e8f74bc8b7d086befb6df676 Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c6
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40evf_main.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 6f1c464aba2f..7f16f12323a7 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -39,7 +39,7 @@ static const char i40e_driver_string[] =
39 39
40#define DRV_VERSION_MAJOR 0 40#define DRV_VERSION_MAJOR 0
41#define DRV_VERSION_MINOR 3 41#define DRV_VERSION_MINOR 3
42#define DRV_VERSION_BUILD 36 42#define DRV_VERSION_BUILD 41
43#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \ 43#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
44 __stringify(DRV_VERSION_MINOR) "." \ 44 __stringify(DRV_VERSION_MINOR) "." \
45 __stringify(DRV_VERSION_BUILD) DRV_KERN 45 __stringify(DRV_VERSION_BUILD) DRV_KERN
@@ -2312,6 +2312,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)
2312 rx_ctx.crcstrip = 1; 2312 rx_ctx.crcstrip = 1;
2313 rx_ctx.l2tsel = 1; 2313 rx_ctx.l2tsel = 1;
2314 rx_ctx.showiv = 1; 2314 rx_ctx.showiv = 1;
2315 /* set the prefena field to 1 because the manual says to */
2316 rx_ctx.prefena = 1;
2315 2317
2316 /* clear the context in the HMC */ 2318 /* clear the context in the HMC */
2317 err = i40e_clear_lan_rx_queue_context(hw, pf_q); 2319 err = i40e_clear_lan_rx_queue_context(hw, pf_q);
@@ -3140,8 +3142,6 @@ static void i40e_netpoll(struct net_device *netdev)
3140 pf->flags &= ~I40E_FLAG_IN_NETPOLL; 3142 pf->flags &= ~I40E_FLAG_IN_NETPOLL;
3141} 3143}
3142#endif 3144#endif
3143 /* set the prefena field to 1 because the manual says to */
3144 rx_ctx.prefena = 1;
3145 3145
3146/** 3146/**
3147 * i40e_vsi_control_tx - Start or stop a VSI's rings 3147 * i40e_vsi_control_tx - Start or stop a VSI's rings
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 2797548fde0d..2ac157d4ac83 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -31,7 +31,7 @@ char i40evf_driver_name[] = "i40evf";
31static const char i40evf_driver_string[] = 31static const char i40evf_driver_string[] =
32 "Intel(R) XL710 X710 Virtual Function Network Driver"; 32 "Intel(R) XL710 X710 Virtual Function Network Driver";
33 33
34#define DRV_VERSION "0.9.16" 34#define DRV_VERSION "0.9.20"
35const char i40evf_driver_version[] = DRV_VERSION; 35const char i40evf_driver_version[] = DRV_VERSION;
36static const char i40evf_copyright[] = 36static const char i40evf_copyright[] =
37 "Copyright (c) 2013 - 2014 Intel Corporation."; 37 "Copyright (c) 2013 - 2014 Intel Corporation.";