Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da169754 authored by Lino Sanfilippo's avatar Lino Sanfilippo Committed by Greg Kroah-Hartman
Browse files

staging: slicoss: notifiy network stack about change in link state



Notify the network stack about link states via netif_carrier_[off|on]().
Also set the link state off initially and when the interface is brought
down.

Signed-off-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ed4eb51
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,7 @@ static void slic_link_upr_complete(struct adapter *adapter, u32 isr)
	/* link has gone from up to down */
	if (linkup == LINK_DOWN) {
		adapter->linkstate = LINK_DOWN;
		netif_carrier_off(adapter->netdev);
		return;
	}

@@ -1028,6 +1029,7 @@ static void slic_link_upr_complete(struct adapter *adapter, u32 isr)
		slic_config_set(adapter, true);
		adapter->linkstate = LINK_UP;
		netif_start_queue(adapter->netdev);
		netif_carrier_on(adapter->netdev);
	}
}

@@ -2418,6 +2420,7 @@ static int slic_entry_open(struct net_device *dev)
	int status;

	netif_stop_queue(adapter->netdev);
	netif_carrier_off(dev);

	spin_lock_irqsave(&slic_global.driver_lock, flags);
	if (!adapter->activated) {
@@ -2530,6 +2533,9 @@ static int slic_entry_halt(struct net_device *dev)
#endif

	spin_unlock_irqrestore(&slic_global.driver_lock, flags);

	netif_carrier_off(dev);

	return 0;
}

@@ -3172,6 +3178,8 @@ static int slic_entry_probe(struct pci_dev *pcidev,
	netdev->irq = adapter->irq;
	netdev->netdev_ops = &slic_netdev_ops;

	netif_carrier_off(netdev);

	strcpy(netdev->name, "eth%d");
	err = register_netdev(netdev);
	if (err) {