Commit 2638f713 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-ethernet: consolidate carrier notifications 



Always use cvm_oct_note_carrier() to avoid copy-pasted code.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36a14572

drivers/staging/octeon/ethernet-mdio.c

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "ethernet-mdio.h"

#include "ethernet-util.h"



#include <asm/octeon/cvmx-helper-board.h>

#include <asm/octeon/cvmx-gmxx-defs.h>

#include <asm/octeon/cvmx-smix-defs.h>
@@ -116,7 +115,7 @@ int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
	return phy_mii_ioctl(priv->phydev, rq, cmd);

}



static void cvm_oct_note_carrier(struct octeon_ethernet *priv,

void cvm_oct_note_carrier(struct octeon_ethernet *priv,

			  cvmx_helper_link_info_t li)

{

	if (li.s.link_up) {

drivers/staging/octeon/ethernet-rgmii.c

+3 −16
Original line number Diff line number Diff line
@@ -176,23 +176,10 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) 
		if (link_info.s.link_up) {

			if (!netif_carrier_ok(dev))

				netif_carrier_on(dev);

			if (priv->queue != -1)

				printk_ratelimited("%s: %u Mbps %s duplex, port %2d, queue %2d\n",

						   dev->name, link_info.s.speed,

						   (link_info.s.full_duplex) ?

						   "Full" : "Half",

						   priv->port, priv->queue);

			else

				printk_ratelimited("%s: %u Mbps %s duplex, port %2d, POW\n",

						   dev->name, link_info.s.speed,

						   (link_info.s.full_duplex) ?

						   "Full" : "Half",

						   priv->port);

		} else {

			if (netif_carrier_ok(dev))

		} else if (netif_carrier_ok(dev)) {

			netif_carrier_off(dev);

			printk_ratelimited("%s: Link down\n", dev->name);

		}

		cvm_oct_note_carrier(priv, link_info);

	}

}

drivers/staging/octeon/ethernet-sgmii.c

+3 −17
Original line number Diff line number Diff line
@@ -55,26 +55,12 @@ static void cvm_oct_sgmii_poll(struct net_device *dev) 


	/* Tell Linux */

	if (link_info.s.link_up) {



		if (!netif_carrier_ok(dev))

			netif_carrier_on(dev);

		if (priv->queue != -1)

			printk_ratelimited

			    ("%s: %u Mbps %s duplex, port %2d, queue %2d\n",

			     dev->name, link_info.s.speed,

			     (link_info.s.full_duplex) ? "Full" : "Half",

			     priv->port, priv->queue);

		else

			printk_ratelimited

				("%s: %u Mbps %s duplex, port %2d, POW\n",

				 dev->name, link_info.s.speed,

				 (link_info.s.full_duplex) ? "Full" : "Half",

				 priv->port);

	} else {

		if (netif_carrier_ok(dev))

	} else if (netif_carrier_ok(dev)) {

		netif_carrier_off(dev);

		printk_ratelimited("%s: Link down\n", dev->name);

	}

	cvm_oct_note_carrier(priv, link_info);

}



int cvm_oct_sgmii_open(struct net_device *dev)

drivers/staging/octeon/ethernet-xaui.c

+3 −17
Original line number Diff line number Diff line
@@ -55,26 +55,12 @@ static void cvm_oct_xaui_poll(struct net_device *dev) 


	/* Tell Linux */

	if (link_info.s.link_up) {



		if (!netif_carrier_ok(dev))

			netif_carrier_on(dev);

		if (priv->queue != -1)

			printk_ratelimited

				("%s: %u Mbps %s duplex, port %2d, queue %2d\n",

				 dev->name, link_info.s.speed,

				 (link_info.s.full_duplex) ? "Full" : "Half",

				 priv->port, priv->queue);

		else

			printk_ratelimited

				("%s: %u Mbps %s duplex, port %2d, POW\n",

				 dev->name, link_info.s.speed,

				 (link_info.s.full_duplex) ? "Full" : "Half",

				 priv->port);

	} else {

		if (netif_carrier_ok(dev))

	} else if (netif_carrier_ok(dev)) {

		netif_carrier_off(dev);

		printk_ratelimited("%s: Link down\n", dev->name);

	}

	cvm_oct_note_carrier(priv, link_info);

}



int cvm_oct_xaui_open(struct net_device *dev)

drivers/staging/octeon/octeon-ethernet.h

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 


#include <linux/of.h>



#include <asm/octeon/cvmx-helper-board.h>



/**

 * This is the definition of the Ethernet driver's private

 * driver state stored in netdev_priv(dev).
@@ -86,6 +88,8 @@ void cvm_oct_adjust_link(struct net_device *dev); 
int cvm_oct_common_stop(struct net_device *dev);

int cvm_oct_common_open(struct net_device *dev,

			void (*link_poll)(struct net_device *), bool poll_now);

void cvm_oct_note_carrier(struct octeon_ethernet *priv,

			  cvmx_helper_link_info_t li);



extern int always_use_pow;

extern int pow_send_group;