aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorAnjali Singhai <anjali.singhai@intel.com>2013-09-28 02:00:02 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-10-09 23:46:28 -0400
commit6d779b41f715ce7cd0f3ddbf809a3b8aaff72115 (patch)
treeaeaf53af9bbadd0164dbdd6b1a3ebb66918dabcd /drivers/net/ethernet
parentb68656b22fd7a3e03087c11b2b45c15c0b328609 (diff)
i40e: Link code updates
Link events should not print to the log until the device is administratively up. Signed-off-by: Anjali Singhai <anjali.singhai@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@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/ethernet')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 221aa4795017..657babe82c9c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -3703,8 +3703,11 @@ static int i40e_up_complete(struct i40e_vsi *vsi)
3703 3703
3704 if ((pf->hw.phy.link_info.link_info & I40E_AQ_LINK_UP) && 3704 if ((pf->hw.phy.link_info.link_info & I40E_AQ_LINK_UP) &&
3705 (vsi->netdev)) { 3705 (vsi->netdev)) {
3706 netdev_info(vsi->netdev, "NIC Link is Up\n");
3706 netif_tx_start_all_queues(vsi->netdev); 3707 netif_tx_start_all_queues(vsi->netdev);
3707 netif_carrier_on(vsi->netdev); 3708 netif_carrier_on(vsi->netdev);
3709 } else if (vsi->netdev) {
3710 netdev_info(vsi->netdev, "NIC Link is Down\n");
3708 } 3711 }
3709 i40e_service_event_schedule(pf); 3712 i40e_service_event_schedule(pf);
3710 3713
@@ -4153,8 +4156,9 @@ static void i40e_link_event(struct i40e_pf *pf)
4153 if (new_link == old_link) 4156 if (new_link == old_link)
4154 return; 4157 return;
4155 4158
4156 netdev_info(pf->vsi[pf->lan_vsi]->netdev, 4159 if (!test_bit(__I40E_DOWN, &pf->vsi[pf->lan_vsi]->state))
4157 "NIC Link is %s\n", (new_link ? "Up" : "Down")); 4160 netdev_info(pf->vsi[pf->lan_vsi]->netdev,
4161 "NIC Link is %s\n", (new_link ? "Up" : "Down"));
4158 4162
4159 /* Notify the base of the switch tree connected to 4163 /* Notify the base of the switch tree connected to
4160 * the link. Floating VEBs are not notified. 4164 * the link. Floating VEBs are not notified.