Merge branch 'sky2' (06d61cbf) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/Kconfig

+19 −1

Original line number	Diff line number	Diff line
		@@ -2009,6 +2009,24 @@ config SKGE
		It does not support the link failover and network management
		features that "portable" vendor supplied sk98lin driver does.


		config SKY2
		tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
		depends on PCI && EXPERIMENTAL
		select CRC32
		---help---
		This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.

		To compile this driver as a module, choose M here: the module
		will be called sky2. This is recommended.

		config SKY2_EC_A1
		bool "Support old Yukon-EC A1 chipset"
		depends on SKY2
		---help---
		Include support for early revisions of the Yukon EC chipset
		that required extra workarounds. If in doubt, say N.

		config SK98LIN
		tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
		depends on PCI

+1 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o
		obj-$(CONFIG_SPIDER_NET) += spidernet.o
		obj-$(CONFIG_TC35815) += tc35815.o
		obj-$(CONFIG_SKGE) += skge.o
		obj-$(CONFIG_SKY2) += sky2.o
		obj-$(CONFIG_SK98LIN) += sk98lin/
		obj-$(CONFIG_SKFP) += skfp/
		obj-$(CONFIG_VIA_RHINE) += via-rhine.o

0 → 100644

+3039 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100644

+1910 −0

File added.

Preview size limit exceeded, changes collapsed.

+6 −2

Original line number	Diff line number	Diff line
		@@ -802,11 +802,15 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
		}

		/* Schedule rx intr now? */
		static inline int netif_rx_schedule_test(struct net_device *dev)
		{
		return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
		}

		/* Schedule only if device is up */
		static inline int netif_rx_schedule_prep(struct net_device *dev)
		{
		return netif_running(dev) &&
		!test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
		return netif_running(dev) && netif_rx_schedule_test(dev);
		}

		/* Add interface to tail of rx poll list. This assumes that _prep has