Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (6dec4ac4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/arcnet/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@

	menuconfig ARCNET		menuconfig ARCNET
	depends on NETDEVICES && (ISA \|\| PCI \|\| PCMCIA)		depends on NETDEVICES && (ISA \|\| PCI \|\| PCMCIA)
	bool "ARCnet support"		tristate "ARCnet support"
	---help---		---help---
	If you have a network card of this type, say Y and check out the		If you have a network card of this type, say Y and check out the
	(arguably) beautiful poetry in		(arguably) beautiful poetry in

drivers/net/can/sja1000/peak_pci.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@
	*/		*/

	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/version.h>
	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>

drivers/net/ethernet/broadcom/b44.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -608,7 +608,7 @@ static void b44_tx(struct b44 *bp)
	skb->len,		skb->len,
	DMA_TO_DEVICE);		DMA_TO_DEVICE);
	rp->skb = NULL;		rp->skb = NULL;
	dev_kfree_skb(skb);		dev_kfree_skb_irq(skb);
	}		}

	bp->tx_cons = cons;		bp->tx_cons = cons;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c

+38 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10327,6 +10327,43 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,
	return 0;		return 0;
	}		}


			static void bnx2x_5461x_set_link_led(struct bnx2x_phy *phy,
			struct link_params *params, u8 mode)
			{
			struct bnx2x *bp = params->bp;
			u16 temp;

			bnx2x_cl22_write(bp, phy,
			MDIO_REG_GPHY_SHADOW,
			MDIO_REG_GPHY_SHADOW_LED_SEL1);
			bnx2x_cl22_read(bp, phy,
			MDIO_REG_GPHY_SHADOW,
			&temp);
			temp &= 0xff00;

			DP(NETIF_MSG_LINK, "54618x set link led (mode=%x)\n", mode);
			switch (mode) {
			case LED_MODE_FRONT_PANEL_OFF:
			case LED_MODE_OFF:
			temp \|= 0x00ee;
			break;
			case LED_MODE_OPER:
			temp \|= 0x0001;
			break;
			case LED_MODE_ON:
			temp \|= 0x00ff;
			break;
			default:
			break;
			}
			bnx2x_cl22_write(bp, phy,
			MDIO_REG_GPHY_SHADOW,
			MDIO_REG_GPHY_SHADOW_WR_ENA \| temp);
			return;
			}


	static void bnx2x_54618se_link_reset(struct bnx2x_phy *phy,		static void bnx2x_54618se_link_reset(struct bnx2x_phy *phy,
	struct link_params *params)		struct link_params *params)
	{		{
	@@ -11103,7 +11140,7 @@ static struct bnx2x_phy phy_54618se = {
	.config_loopback = (config_loopback_t)bnx2x_54618se_config_loopback,		.config_loopback = (config_loopback_t)bnx2x_54618se_config_loopback,
	.format_fw_ver = (format_fw_ver_t)NULL,		.format_fw_ver = (format_fw_ver_t)NULL,
	.hw_reset = (hw_reset_t)NULL,		.hw_reset = (hw_reset_t)NULL,
	.set_link_led = (set_link_led_t)NULL,		.set_link_led = (set_link_led_t)bnx2x_5461x_set_link_led,
	.phy_specific_func = (phy_specific_func_t)NULL		.phy_specific_func = (phy_specific_func_t)NULL
	};		};
	/*****************************************************************/		/*****************************************************************/

drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6990,6 +6990,7 @@ Theotherbitsarereservedandshouldbezero*/
	#define MDIO_REG_INTR_MASK 0x1b		#define MDIO_REG_INTR_MASK 0x1b
	#define MDIO_REG_INTR_MASK_LINK_STATUS (0x1 << 1)		#define MDIO_REG_INTR_MASK_LINK_STATUS (0x1 << 1)
	#define MDIO_REG_GPHY_SHADOW 0x1c		#define MDIO_REG_GPHY_SHADOW 0x1c
			#define MDIO_REG_GPHY_SHADOW_LED_SEL1 (0x0d << 10)
	#define MDIO_REG_GPHY_SHADOW_LED_SEL2 (0x0e << 10)		#define MDIO_REG_GPHY_SHADOW_LED_SEL2 (0x0e << 10)
	#define MDIO_REG_GPHY_SHADOW_WR_ENA (0x1 << 15)		#define MDIO_REG_GPHY_SHADOW_WR_ENA (0x1 << 15)
	#define MDIO_REG_GPHY_SHADOW_AUTO_DET_MED (0x1e << 10)		#define MDIO_REG_GPHY_SHADOW_AUTO_DET_MED (0x1e << 10)