Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (152cbcf9) · Commits · e / devices / android_kernel_xiaomi_markw

MAINTAINERS

+3 −1

Original line number	Diff line number	Diff line
		@@ -750,11 +750,13 @@ P: Ville Syrjala
		M: syrjala@sci.fi
		S: Maintained

		ATL1 ETHERNET DRIVER
		ATLX ETHERNET DRIVERS
		P: Jay Cliburn
		M: jcliburn@gmail.com
		P: Chris Snook
		M: csnook@redhat.com
		P: Jie Yang
		M: jie.yang@atheros.com
		L: atl1-devel@lists.sourceforge.net
		W: http://sourceforge.net/projects/atl1
		W: http://atl1.sourceforge.net

drivers/net/3c505.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,12 +130,12 @@ static const char filename[] = __FILE__;

		static const char timeout_msg[] = "* timeout at %s:%s (line %d) *\n";
		#define TIMEOUT_MSG(lineno) \
		printk(timeout_msg, filename,__FUNCTION__,(lineno))
		printk(timeout_msg, filename,__func__,(lineno))

		static const char invalid_pcb_msg[] =
		"* invalid pcb length %d at %s:%s (line %d) *\n";
		#define INVALID_PCB_MSG(len) \
		printk(invalid_pcb_msg, (len),filename,__FUNCTION__,__LINE__)
		printk(invalid_pcb_msg, (len),filename,__func__,__LINE__)

		static char search_msg[] __initdata = KERN_INFO "%s: Looking for 3c505 adapter at address %#x...";

drivers/net/8139too.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ enum RTL8139_registers {
		Cfg9346 = 0x50,
		Config0 = 0x51,
		Config1 = 0x52,
		FlashReg = 0x54,
		TimerInt = 0x54,
		MediaStatus = 0x58,
		Config3 = 0x59,
		Config4 = 0x5A, /* absent on RTL-8139A */
		@@ -325,6 +325,7 @@ enum RTL8139_registers {
		FIFOTMS = 0x70, /* FIFO Control and test. */
		CSCR = 0x74, /* Chip Status and Configuration Register. */
		PARA78 = 0x78,
		FlashReg = 0xD4, /* Communication with Flash ROM, four bytes. */
		PARA7c = 0x7c, /* Magic transceiver parameter register. */
		Config5 = 0xD8, /* absent on RTL-8139A */
		};

drivers/net/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -2057,6 +2057,7 @@ config R8169
		tristate "Realtek 8169 gigabit ethernet support"
		depends on PCI
		select CRC32
		select MII
		---help---
		Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.

		@@ -2411,6 +2412,7 @@ config IXGBE
		tristate "Intel(R) 10GbE PCI Express adapters support"
		depends on PCI && INET
		select INET_LRO
		select INTEL_IOATDMA
		---help---
		This driver supports Intel(R) 10GbE PCI Express family of
		adapters. For more information on how to identify your adapter, go
		@@ -2462,6 +2464,7 @@ config MYRI10GE
		select FW_LOADER
		select CRC32
		select INET_LRO
		select INTEL_IOATDMA
		---help---
		This driver supports Myricom Myri-10G Dual Protocol interface in
		Ethernet mode. If the eeprom on your board is not recent enough,

drivers/net/arcnet/arcnet.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -442,24 +442,24 @@ static int arcnet_open(struct net_device *dev)
		BUGMSG(D_NORMAL, "WARNING! Station address FF may confuse "
		"DOS networking programs!\n");

		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
		if (ASTATUS() & RESETflag) {
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
		ACOMMAND(CFLAGScmd \| RESETclear);
		}


		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
		/* make sure we're ready to receive IRQ's. */
		AINTMASK(0);
		udelay(1); /* give it time to set the mask before
		* we reset it again. (may not even be
		* necessary)
		*/
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
		lp->intmask = NORXflag \| RECONflag;
		AINTMASK(lp->intmask);
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

		netif_start_queue(dev);

		@@ -670,14 +670,14 @@ static int arcnet_send_packet(struct sk_buff skb, struct net_device dev)
		freeskb = 0;
		}

		BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());
		BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS());
		/* make sure we didn't ignore a TX IRQ while we were in here */
		AINTMASK(0);

		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);
		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
		lp->intmask \|= TXFREEflag\|EXCNAKflag;
		AINTMASK(lp->intmask);
		BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());
		BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS());

		spin_unlock_irqrestore(&lp->lock, flags);
		if (freeskb) {
		@@ -798,7 +798,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
		diagstatus = (status >> 8) & 0xFF;

		BUGMSG(D_DEBUG, "%s: %d: %s: status=%x\n",
		__FILE__,__LINE__,__FUNCTION__,status);
		__FILE__,__LINE__,__func__,status);
		didsomething = 0;

		/*