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

Commit aa2d3322 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:
  ehea: Fixed multi queue RX bug
  sky2: enable IRQ on duplex renegotiation
  e1000: restore netif_poll_enable call but make sure IRQs are off
  defxx: Fix the handling of ioremap() failures
  sky2: program proper register for fiber PHY
  sky2: checksum offload plus vlan bug
  sky2: dont set bogus bit in PHY register
  [PATCH] hostap: Allocate enough tailroom for TKIP
  [PATCH] softmac: alloc_ieee80211() NULL check
  [PATCH] ieee80211: fix incomplete error message
  [PATCH] prism54: fix monitor mode oops
parents 9462544f ade21372

drivers/net/defxx.c

+1 −0
Original line number Diff line number Diff line
@@ -566,6 +566,7 @@ static int __devinit dfx_register(struct device *bdev) 
		bp->base.mem = ioremap_nocache(bar_start, bar_len);

		if (!bp->base.mem) {

			printk(KERN_ERR "%s: Cannot map MMIO\n", print_name);

			err = -ENOMEM;

			goto err_out_region;

		}

	} else {

drivers/net/e1000/e1000_main.c

+8 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,10 @@ e1000_sw_init(struct e1000_adapter *adapter) 
	spin_lock_init(&adapter->tx_queue_lock);

#endif



	atomic_set(&adapter->irq_sem, 1);

	/* Explicitly disable IRQ since the NIC can be in any state. */

	atomic_set(&adapter->irq_sem, 0);

	e1000_irq_disable(adapter);



	spin_lock_init(&adapter->stats_lock);



	set_bit(__E1000_DOWN, &adapter->flags);
@@ -1431,6 +1434,10 @@ e1000_open(struct net_device *netdev) 
	/* From here on the code is the same as e1000_up() */

	clear_bit(__E1000_DOWN, &adapter->flags);



#ifdef CONFIG_E1000_NAPI

	netif_poll_enable(netdev);

#endif



	e1000_irq_enable(adapter);



	/* fire a link status change interrupt to start the watchdog */

drivers/net/ehea/ehea.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0058"

#define DRV_VERSION	"EHEA_0061"



#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \

	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)

drivers/net/ehea/ehea_main.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static struct ehea_cqe *ehea_proc_rwqes(struct net_device *dev, 
				}

				skb_copy_to_linear_data(skb, ((char*)cqe) + 64,

					       cqe->num_bytes_transfered - 4);

				ehea_fill_skb(dev, skb, cqe);

				ehea_fill_skb(port->netdev, skb, cqe);

			} else if (rq == 2) {  /* RQ2 */

				skb = get_skb_by_index(skb_arr_rq2,

						       skb_arr_rq2_len, cqe);

drivers/net/sky2.c

+3 −3
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port) 
			/* for SFP-module set SIGDET polarity to low */

			ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);

			ctrl |= PHY_M_FIB_SIGD_POL;

			gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);

			gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);

		}



		gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
@@ -658,7 +658,7 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) 
	const u8 *addr = hw->dev[port]->dev_addr;



	sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);

	sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR|GPC_ENA_PAUSE);

	sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR);



	sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_RST_CLR);
@@ -1432,7 +1432,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) 
		tcpsum = offset << 16;		/* sum start */

		tcpsum |= offset + skb->csum_offset;	/* sum write */



		ctrl = CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;

		ctrl |= CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;

		if (ip_hdr(skb)->protocol == IPPROTO_UDP)

			ctrl |= UDPTCP;