Commit 2634d064 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  MACB: clear transmit buffers properly on transmit underrun
  3c359 endianness annotations and fixes
  fec_mpc52xx: write in C...
  3c574 and 3c589 endianness fixes (.24?)
  rrunner: use offsetof() instead of homegrown insanity
  r8169 endianness
  dl2k endianness fixes (.24 fodder?)
  yellowfin: annotations and fixes (.24 fodder?)
  asix fixes
  cycx: annotations and fixes (.24 fodder?)
  typhoon: trivial endianness annotations
  typhoon: memory corruptor on big-endian if TSO is enabled
  typhoon: missed rx overruns on big-endian
  typhoon: set_settings broken on big-endian
  typhoon: missing le32_to_cpu() in get_drvinfo
  typhoon: endianness bug in tx/rx byte counters
  ipw2200: prevent alloc of unspecified size on stack
  iwlwifi: fix possible priv->mutex deadlock during suspend
  p54: add Kconfig description
  rtl8187: Add USB ID for Sitecom WL-168 v1 001
parents c63f7020 bdcba151

drivers/net/dl2k.c

+27 −24
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ parse_eeprom (struct net_device *dev) 
#endif

	/* Read eeprom */

	for (i = 0; i < 128; i++) {

		((u16 *) sromdata)[i] = le16_to_cpu (read_eeprom (ioaddr, i));

		((__le16 *) sromdata)[i] = cpu_to_le16(read_eeprom (ioaddr, i));

	}

#ifdef	MEM_MAPPING

	ioaddr = dev->base_addr;
@@ -516,7 +516,7 @@ rio_timer (unsigned long data) 
					  PCI_DMA_FROMDEVICE));

			}

			np->rx_ring[entry].fraginfo |=

			    cpu_to_le64 (np->rx_buf_sz) << 48;

			    cpu_to_le64((u64)np->rx_buf_sz << 48);

			np->rx_ring[entry].status = 0;

		} /* end for */

	} /* end if */
@@ -584,11 +584,11 @@ alloc_list (struct net_device *dev) 
		    cpu_to_le64 ( pci_map_single (

			 	  np->pdev, skb->data, np->rx_buf_sz,

				  PCI_DMA_FROMDEVICE));

		np->rx_ring[i].fraginfo |= cpu_to_le64 (np->rx_buf_sz) << 48;

		np->rx_ring[i].fraginfo |= cpu_to_le64((u64)np->rx_buf_sz << 48);

	}



	/* Set RFDListPtr */

	writel (cpu_to_le32 (np->rx_ring_dma), dev->base_addr + RFDListPtr0);

	writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0);

	writel (0, dev->base_addr + RFDListPtr1);



	return;
@@ -620,15 +620,14 @@ start_xmit (struct sk_buff *skb, struct net_device *dev) 
	}

#endif

	if (np->vlan) {

		tfc_vlan_tag =

		    cpu_to_le64 (VLANTagInsert) |

		    (cpu_to_le64 (np->vlan) << 32) |

		    (cpu_to_le64 (skb->priority) << 45);

		tfc_vlan_tag = VLANTagInsert |

		    ((u64)np->vlan << 32) |

		    ((u64)skb->priority << 45);

	}

	txdesc->fraginfo = cpu_to_le64 (pci_map_single (np->pdev, skb->data,

							skb->len,

							PCI_DMA_TODEVICE));

	txdesc->fraginfo |= cpu_to_le64 (skb->len) << 48;

	txdesc->fraginfo |= cpu_to_le64((u64)skb->len << 48);



	/* DL2K bug: DMA fails to get next descriptor ptr in 10Mbps mode

	 * Work around: Always use 1 descriptor in 10Mbps mode */
@@ -708,6 +707,11 @@ rio_interrupt (int irq, void *dev_instance) 
	return IRQ_RETVAL(handled);

}



static inline dma_addr_t desc_to_dma(struct netdev_desc *desc)

{

	return le64_to_cpu(desc->fraginfo) & DMA_48BIT_MASK;

}



static void

rio_free_tx (struct net_device *dev, int irq)

{
@@ -725,11 +729,11 @@ rio_free_tx (struct net_device *dev, int irq) 
	while (entry != np->cur_tx) {

		struct sk_buff *skb;



		if (!(np->tx_ring[entry].status & TFDDone))

		if (!(np->tx_ring[entry].status & cpu_to_le64(TFDDone)))

			break;

		skb = np->tx_skbuff[entry];

		pci_unmap_single (np->pdev,

				  np->tx_ring[entry].fraginfo & DMA_48BIT_MASK,

				  desc_to_dma(&np->tx_ring[entry]),

				  skb->len, PCI_DMA_TODEVICE);

		if (irq)

			dev_kfree_skb_irq (skb);
@@ -831,13 +835,14 @@ receive_packet (struct net_device *dev) 
		int pkt_len;

		u64 frame_status;



		if (!(desc->status & RFDDone) ||

		    !(desc->status & FrameStart) || !(desc->status & FrameEnd))

		if (!(desc->status & cpu_to_le64(RFDDone)) ||

		    !(desc->status & cpu_to_le64(FrameStart)) ||

		    !(desc->status & cpu_to_le64(FrameEnd)))

			break;



		/* Chip omits the CRC. */

		pkt_len = le64_to_cpu (desc->status & 0xffff);

		frame_status = le64_to_cpu(desc->status);

		pkt_len = frame_status & 0xffff;

		if (--cnt < 0)

			break;

		/* Update rx error statistics, drop packet. */
@@ -857,15 +862,14 @@ receive_packet (struct net_device *dev) 
			/* Small skbuffs for short packets */

			if (pkt_len > copy_thresh) {

				pci_unmap_single (np->pdev,

						  desc->fraginfo & DMA_48BIT_MASK,

						  desc_to_dma(desc),

						  np->rx_buf_sz,

						  PCI_DMA_FROMDEVICE);

				skb_put (skb = np->rx_skbuff[entry], pkt_len);

				np->rx_skbuff[entry] = NULL;

			} else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {

				pci_dma_sync_single_for_cpu(np->pdev,

				  			    desc->fraginfo &

							    	DMA_48BIT_MASK,

							    desc_to_dma(desc),

							    np->rx_buf_sz,

							    PCI_DMA_FROMDEVICE);

				/* 16 byte align the IP header */
@@ -875,8 +879,7 @@ receive_packet (struct net_device *dev) 
						  pkt_len);

				skb_put (skb, pkt_len);

				pci_dma_sync_single_for_device(np->pdev,

				  			       desc->fraginfo &

							       	 DMA_48BIT_MASK,

							       desc_to_dma(desc),

							       np->rx_buf_sz,

							       PCI_DMA_FROMDEVICE);

			}
@@ -919,7 +922,7 @@ receive_packet (struct net_device *dev) 
					  PCI_DMA_FROMDEVICE));

		}

		np->rx_ring[entry].fraginfo |=

		    cpu_to_le64 (np->rx_buf_sz) << 48;

		    cpu_to_le64((u64)np->rx_buf_sz << 48);

		np->rx_ring[entry].status = 0;

		entry = (entry + 1) % RX_RING_SIZE;

	}
@@ -1121,7 +1124,7 @@ set_multicast (struct net_device *dev) 


	hash_table[0] = hash_table[1] = 0;

	/* RxFlowcontrol DA: 01-80-C2-00-00-01. Hash index=0x39 */

	hash_table[1] |= cpu_to_le32(0x02000000);

	hash_table[1] |= 0x02000000;

	if (dev->flags & IFF_PROMISC) {

		/* Receive all frames promiscuously. */

		rx_mode = ReceiveAllFrames;
@@ -1762,7 +1765,7 @@ rio_close (struct net_device *dev) 
		skb = np->rx_skbuff[i];

		if (skb) {

			pci_unmap_single(np->pdev,

					 np->rx_ring[i].fraginfo & DMA_48BIT_MASK,

					 desc_to_dma(&np->rx_ring[i]),

					 skb->len, PCI_DMA_FROMDEVICE);

			dev_kfree_skb (skb);

			np->rx_skbuff[i] = NULL;
@@ -1772,7 +1775,7 @@ rio_close (struct net_device *dev) 
		skb = np->tx_skbuff[i];

		if (skb) {

			pci_unmap_single(np->pdev,

					 np->tx_ring[i].fraginfo & DMA_48BIT_MASK,

					 desc_to_dma(&np->tx_ring[i]),

					 skb->len, PCI_DMA_TODEVICE);

			dev_kfree_skb (skb);

			np->tx_skbuff[i] = NULL;

drivers/net/dl2k.h

+3 −3
Original line number Diff line number Diff line
@@ -633,9 +633,9 @@ struct mii_data { 


/* The Rx and Tx buffer descriptors. */

struct netdev_desc {

	u64 next_desc;

	u64 status;

	u64 fraginfo;

	__le64 next_desc;

	__le64 status;

	__le64 fraginfo;

};



#define PRIV_ALIGN	15	/* Required alignment mask */

drivers/net/fec_mpc52xx.c

+3 −2
Original line number Diff line number Diff line
@@ -568,8 +568,9 @@ static void mpc52xx_fec_reset_stats(struct net_device *dev) 
	struct mpc52xx_fec __iomem *fec = priv->fec;



	out_be32(&fec->mib_control, FEC_MIB_DISABLE);

	memset_io(&fec->rmon_t_drop, 0,	(__force u32)&fec->reserved10 -

			(__force u32)&fec->rmon_t_drop);

	memset_io(&fec->rmon_t_drop, 0,

		   offsetof(struct mpc52xx_fec, reserved10) -

		   offsetof(struct mpc52xx_fec, rmon_t_drop));

	out_be32(&fec->mib_control, 0);



	memset(&dev->stats, 0, sizeof(dev->stats));

drivers/net/macb.c

+24 −1
Original line number Diff line number Diff line
@@ -307,8 +307,31 @@ static void macb_tx(struct macb *bp) 
		(unsigned long)status);



	if (status & MACB_BIT(UND)) {

		int i;

		printk(KERN_ERR "%s: TX underrun, resetting buffers\n",

			bp->dev->name);



		head = bp->tx_head;



		/*Mark all the buffer as used to avoid sending a lost buffer*/

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

			bp->tx_ring[i].ctrl = MACB_BIT(TX_USED);



		/* free transmit buffer in upper layer*/

		for (tail = bp->tx_tail; tail != head; tail = NEXT_TX(tail)) {

			struct ring_info *rp = &bp->tx_skb[tail];

			struct sk_buff *skb = rp->skb;



			BUG_ON(skb == NULL);



			rmb();



			dma_unmap_single(&bp->pdev->dev, rp->mapping, skb->len,

							 DMA_TO_DEVICE);

			rp->skb = NULL;

			dev_kfree_skb_irq(skb);

		}



		bp->tx_head = bp->tx_tail = 0;

	}

drivers/net/pcmcia/3c574_cs.c

+5 −5
Original line number Diff line number Diff line
@@ -337,15 +337,15 @@ static int tc574_config(struct pcmcia_device *link) 
	struct net_device *dev = link->priv;

	struct el3_private *lp = netdev_priv(dev);

	tuple_t tuple;

	unsigned short buf[32];

	__le16 buf[32];

	int last_fn, last_ret, i, j;

	kio_addr_t ioaddr;

	u16 *phys_addr;

	__be16 *phys_addr;

	char *cardname;

	union wn3_config config;

	DECLARE_MAC_BUF(mac);



	phys_addr = (u16 *)dev->dev_addr;

	phys_addr = (__be16 *)dev->dev_addr;



	DEBUG(0, "3c574_config(0x%p)\n", link);
@@ -378,12 +378,12 @@ static int tc574_config(struct pcmcia_device *link) 
	if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {

		pcmcia_get_tuple_data(link, &tuple);

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

			phys_addr[i] = htons(buf[i]);

			phys_addr[i] = htons(le16_to_cpu(buf[i]));

	} else {

		EL3WINDOW(0);

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

			phys_addr[i] = htons(read_eeprom(ioaddr, i + 10));

		if (phys_addr[0] == 0x6060) {

		if (phys_addr[0] == htons(0x6060)) {

			printk(KERN_NOTICE "3c574_cs: IO port conflict at 0x%03lx"

				   "-0x%03lx\n", dev->base_addr, dev->base_addr+15);

			goto failed;

CRA Git | Maintained and supported by SUSTech CRA and CCSE