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

Commit 14eabf70 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents f49e1aa1 2f448911

drivers/net/8139too.c

+5 −5
Original line number Diff line number Diff line
@@ -966,8 +966,8 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, 


	addr_len = read_eeprom (ioaddr, 0, 8) == 0x8129 ? 8 : 6;

	for (i = 0; i < 3; i++)

		((u16 *) (dev->dev_addr))[i] =

		    le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len));

		((__le16 *) (dev->dev_addr))[i] =

		    cpu_to_le16(read_eeprom (ioaddr, i + 7, addr_len));

	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);



	/* The Rtl8139-specific entries in the device structure. */
@@ -1373,8 +1373,8 @@ static void rtl8139_hw_start (struct net_device *dev) 
	/* unlock Config[01234] and BMCR register writes */

	RTL_W8_F (Cfg9346, Cfg9346_Unlock);

	/* Restore our idea of the MAC address. */

	RTL_W32_F (MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0)));

	RTL_W32_F (MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4)));

	RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));

	RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4)));



	/* Must enable Tx/Rx before setting transfer thresholds! */

	RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
@@ -1945,7 +1945,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp, 
		rmb();



		/* read size+status of next frame from DMA ring buffer */

		rx_status = le32_to_cpu (*(u32 *) (rx_ring + ring_offset));

		rx_status = le32_to_cpu (*(__le32 *) (rx_ring + ring_offset));

		rx_size = rx_status >> 16;

		pkt_size = rx_size - 4;

drivers/net/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -467,6 +467,13 @@ config SNI_82596 
	  Say Y here to support the on-board Intel 82596 ethernet controller

	  built into SNI RM machines.



config KORINA

	tristate "Korina (IDT RC32434) Ethernet support"

	depends on NET_ETHERNET && MIKROTIK_RB500

	help

	  If you have a Mikrotik RouterBoard 500 or IDT RC32434

	  based system say Y. Otherwise say N.



config MIPS_JAZZ_SONIC

	tristate "MIPS JAZZ onboard SONIC Ethernet support"

	depends on MACH_JAZZ

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ obj-$(CONFIG_ZORRO8390) += zorro8390.o 
obj-$(CONFIG_HPLANCE) += hplance.o 7990.o

obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_KORINA) += korina.o

obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o

obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o

obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o

drivers/net/atp.c

+2 −2
Original line number Diff line number Diff line
@@ -378,8 +378,8 @@ static void __init get_node_ID(struct net_device *dev) 
		sa_offset = 15;



	for (i = 0; i < 3; i++)

		((u16 *)dev->dev_addr)[i] =

			be16_to_cpu(eeprom_op(ioaddr, EE_READ(sa_offset + i)));

		((__be16 *)dev->dev_addr)[i] =

			cpu_to_be16(eeprom_op(ioaddr, EE_READ(sa_offset + i)));



	write_reg(ioaddr, CMR2, CMR2_NULL);

}

drivers/net/cxgb3/cxgb3_offload.c

+19 −3
Original line number Diff line number Diff line
@@ -833,10 +833,26 @@ static int do_trace(struct t3cdev *dev, struct sk_buff *skb) 
	return 0;

}



/*

 * That skb would better have come from process_responses() where we abuse

 * ->priority and ->csum to carry our data.  NB: if we get to per-arch

 * ->csum, the things might get really interesting here.

 */



static inline u32 get_hwtid(struct sk_buff *skb)

{

	return ntohl((__force __be32)skb->priority) >> 8 & 0xfffff;

}



static inline u32 get_opcode(struct sk_buff *skb)

{

	return G_OPCODE(ntohl((__force __be32)skb->csum));

}



static int do_term(struct t3cdev *dev, struct sk_buff *skb)

{

	unsigned int hwtid = ntohl(skb->priority) >> 8 & 0xfffff;

	unsigned int opcode = G_OPCODE(ntohl(skb->csum));

	unsigned int hwtid = get_hwtid(skb);

	unsigned int opcode = get_opcode(skb);

	struct t3c_tid_entry *t3c_tid;



	t3c_tid = lookup_tid(&(T3C_DATA(dev))->tid_maps, hwtid);
@@ -914,7 +930,7 @@ int process_rx(struct t3cdev *dev, struct sk_buff **skbs, int n) 
{

	while (n--) {

		struct sk_buff *skb = *skbs++;

		unsigned int opcode = G_OPCODE(ntohl(skb->csum));

		unsigned int opcode = get_opcode(skb);

		int ret = cpl_handlers[opcode] (dev, skb);



#if VALIDATE_TID