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

Commit db7a89db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  dm9601: Fix receive MTU
  mv643xx_eth: Do not modify struct netdev tx_queue_len
  qla3xxx: bugfix: Fix VLAN rx completion handling.
  qla3xxx: bugfix: Add memory barrier before accessing rx completion.
parents 2910ca6f f662fe5a

drivers/net/mv643xx_eth.c

+0 −1
Original line number Diff line number Diff line
@@ -1357,7 +1357,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
#endif



	dev->watchdog_timeo = 2 * HZ;

	dev->tx_queue_len = mp->tx_ring_size;

	dev->base_addr = 0;

	dev->change_mtu = mv643xx_eth_change_mtu;

	dev->do_ioctl = mv643xx_eth_do_ioctl;

drivers/net/qla3xxx.c

+7 −0
Original line number Diff line number Diff line
@@ -2248,6 +2248,13 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev, 
		qdev->rsp_consumer_index) && (work_done < work_to_do)) {



		net_rsp = qdev->rsp_current;

		rmb();

		/*

		 * Fix 4032 chipe undocumented "feature" where bit-8 is set if the

		 * inbound completion is for a VLAN.

		 */

		if (qdev->device_id == QL3032_DEVICE_ID)

			net_rsp->opcode &= 0x7f;

		switch (net_rsp->opcode) {



		case OPCODE_OB_MAC_IOCB_FN0:

drivers/net/usb/dm9601.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) 
	dev->net->ethtool_ops = &dm9601_ethtool_ops;

	dev->net->hard_header_len += DM_TX_OVERHEAD;

	dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;

	dev->rx_urb_size = dev->net->mtu + DM_RX_OVERHEAD;

	dev->rx_urb_size = dev->net->mtu + ETH_HLEN + DM_RX_OVERHEAD;



	dev->mii.dev = dev->net;

	dev->mii.mdio_read = dm9601_mdio_read;