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

Commit 36373b44 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:
  myri10ge: update driver version to 1.3.2-1.269
  myri10ge: use pcie_get/set_readrq
  ehea: fix queue destructor
  ehea: fix module parameter description
  ehea: fix interface to DLPAR tools
  sgiseeq: Fix return type of sgiseeq_remove
  sky2 1.17
  sky2: only bring up watchdog if link is active
  sky2: clear PCI power control reg at startup
  DM9000: fix interface hang under load
  phy layer: fix genphy_setup_forced (don't reset)
  Don't use GFP_DMA for zone allocation.
  fix realtek phy id in forcedeth
parents 0b887d03 29728637

drivers/net/dm9000.c

+7 −18
Original line number Diff line number Diff line
@@ -700,6 +700,7 @@ dm9000_init_dm9000(struct net_device *dev) 
static int

dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	unsigned long flags;

	board_info_t *db = (board_info_t *) dev->priv;



	PRINTK3("dm9000_start_xmit\n");
@@ -707,10 +708,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (db->tx_pkt_cnt > 1)

		return 1;



	netif_stop_queue(dev);



	/* Disable all interrupts */

	iow(db, DM9000_IMR, IMR_PAR);

	spin_lock_irqsave(&db->lock, flags);



	/* Move data to DM9000 TX RAM */

	writeb(DM9000_MWCMD, db->io_addr);
@@ -718,12 +716,9 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	(db->outblk)(db->io_data, skb->data, skb->len);

	db->stats.tx_bytes += skb->len;



	/* TX control: First packet immediately send, second packet queue */

	if (db->tx_pkt_cnt == 0) {



		/* First Packet */

	db->tx_pkt_cnt++;



	/* TX control: First packet immediately send, second packet queue */

	if (db->tx_pkt_cnt == 1) {

		/* Set TX length to DM9000 */

		iow(db, DM9000_TXPLL, skb->len & 0xff);

		iow(db, DM9000_TXPLH, (skb->len >> 8) & 0xff);
@@ -732,23 +727,17 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		iow(db, DM9000_TCR, TCR_TXREQ);	/* Cleared after TX complete */



		dev->trans_start = jiffies;	/* save the time stamp */



	} else {

		/* Second packet */

		db->tx_pkt_cnt++;

		db->queue_pkt_len = skb->len;

		netif_stop_queue(dev);

	}



	spin_unlock_irqrestore(&db->lock, flags);



	/* free this SKB */

	dev_kfree_skb(skb);



	/* Re-enable resource check */

	if (db->tx_pkt_cnt == 1)

		netif_wake_queue(dev);



	/* Re-enable interrupt */

	iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);



	return 0;

}

drivers/net/ehea/ehea_main.c

+4 −4
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ MODULE_PARM_DESC(rq1_entries, "Number of entries for Receive Queue 1 " 
MODULE_PARM_DESC(sq_entries, " Number of entries for the Send Queue  "

		 "[2^x - 1], x = [6..14]. Default = "

		 __MODULE_STRING(EHEA_DEF_ENTRIES_SQ) ")");

MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 1 ");

MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 0 ");



static int port_name_cnt = 0;

static LIST_HEAD(adapter_list);
@@ -2490,7 +2490,7 @@ static ssize_t ehea_show_port_id(struct device *dev, 
				 struct device_attribute *attr, char *buf)

{

	struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);

	return sprintf(buf, "0x%X", port->logical_port_id);

	return sprintf(buf, "%d", port->logical_port_id);

}



static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id,
@@ -2781,7 +2781,7 @@ static ssize_t ehea_probe_port(struct device *dev, 


	u32 logical_port_id;



	sscanf(buf, "%X", &logical_port_id);

	sscanf(buf, "%d", &logical_port_id);



	port = ehea_get_port(adapter, logical_port_id);
@@ -2834,7 +2834,7 @@ static ssize_t ehea_remove_port(struct device *dev, 
	int i;

	u32 logical_port_id;



	sscanf(buf, "%X", &logical_port_id);

	sscanf(buf, "%d", &logical_port_id);



	port = ehea_get_port(adapter, logical_port_id);

drivers/net/ehea/ehea_qmr.c

+6 −0
Original line number Diff line number Diff line
@@ -235,6 +235,8 @@ int ehea_destroy_cq(struct ehea_cq *cq) 
	if (!cq)

		return 0;



	hcp_epas_dtor(&cq->epas);



	if ((hret = ehea_destroy_cq_res(cq, NORMAL_FREE)) == H_R_STATE) {

		ehea_error_data(cq->adapter, cq->fw_handle);

		hret = ehea_destroy_cq_res(cq, FORCE_FREE);
@@ -361,6 +363,8 @@ int ehea_destroy_eq(struct ehea_eq *eq) 
	if (!eq)

		return 0;



	hcp_epas_dtor(&eq->epas);



	if ((hret = ehea_destroy_eq_res(eq, NORMAL_FREE)) == H_R_STATE) {

		ehea_error_data(eq->adapter, eq->fw_handle);

		hret = ehea_destroy_eq_res(eq, FORCE_FREE);
@@ -541,6 +545,8 @@ int ehea_destroy_qp(struct ehea_qp *qp) 
	if (!qp)

		return 0;



	hcp_epas_dtor(&qp->epas);



	if ((hret = ehea_destroy_qp_res(qp, NORMAL_FREE)) == H_R_STATE) {

		ehea_error_data(qp->adapter, qp->fw_handle);

		hret = ehea_destroy_qp_res(qp, FORCE_FREE);

drivers/net/forcedeth.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ union ring_type { 
#define PHY_OUI_MARVELL	0x5043

#define PHY_OUI_CICADA	0x03f1

#define PHY_OUI_VITESSE	0x01c1

#define PHY_OUI_REALTEK	0x01c1

#define PHY_OUI_REALTEK	0x0732

#define PHYID1_OUI_MASK	0x03ff

#define PHYID1_OUI_SHFT	6

#define PHYID2_OUI_MASK	0xfc00

drivers/net/meth.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status) 
				priv->stats.rx_length_errors++;

				skb = priv->rx_skbs[priv->rx_write];

			} else {

				skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC | GFP_DMA);

				skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC);

				if (!skb) {

					/* Ouch! No memory! Drop packet on the floor */

					DPRINTK("No mem: dropping packet\n");