Commit 1cac6ec9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  smc91x: let smc91x work well under netpoll
  pxaficp-ir: remove incorrect net_device_ops
  NET: llc, zero sockaddr_llc struct
  drivers/net: fixed drivers that support netpoll use ndo_start_xmit()
  netpoll: warning for ndo_start_xmit returns with interrupts enabled
  net: Fix Micrel KSZ8842 Kconfig description
  netfilter: xt_quota: fix wrong return value (error case)
  ipv6: Fix commit 63d9950b (ipv6: Make v4-mapped bindings consistent with IPv4)
  E100: fix interaction with swiotlb on X86.
  pkt_sched: Convert CBQ to tasklet_hrtimer.
  pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer
  rtl8187: always set MSR_LINK_ENEDCA flag with RTL8187B
  ibm_newemac: emac_close() needs to call netif_carrier_off()
  net: fix ks8851 build errors
  net: Rename MAC platform driver for w90p910 platform
  yellowfin: Fix buffer underrun after dev_alloc_skb() failure
  orinoco: correct key bounds check in orinoco_hw_get_tkip_iv
  mac80211: fix todo lock
parents ce0cfd4c 8ff499e4

drivers/net/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -1727,12 +1727,14 @@ config KS8842 
	tristate "Micrel KSZ8842"

	depends on HAS_IOMEM

	help

	  This platform driver is for Micrel KSZ8842 chip.

	  This platform driver is for Micrel KSZ8842 / KS8842

	  2-port ethernet switch chip (managed, VLAN, QoS).



config KS8851

       tristate "Micrel KS8851 SPI"

       depends on SPI

       select MII

	select CRC32

       help

         SPI driver for Micrel KS8851 SPI attached network chip.

drivers/net/arm/w90p910_ether.c

+2 −2
Original line number Diff line number Diff line
@@ -1080,7 +1080,7 @@ static struct platform_driver w90p910_ether_driver = { 
	.probe		= w90p910_ether_probe,

	.remove		= __devexit_p(w90p910_ether_remove),

	.driver		= {

		.name	= "w90p910-emc",

		.name	= "nuc900-emc",

		.owner	= THIS_MODULE,

	},

};
@@ -1101,5 +1101,5 @@ module_exit(w90p910_ether_exit); 
MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");

MODULE_DESCRIPTION("w90p910 MAC driver!");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:w90p910-emc");

MODULE_ALIAS("platform:nuc900-emc");

drivers/net/e100.c

+1 −1
Original line number Diff line number Diff line
@@ -1899,7 +1899,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, 
				nic->ru_running = RU_SUSPENDED;

		pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,

					       sizeof(struct rfd),

					       PCI_DMA_BIDIRECTIONAL);

					       PCI_DMA_FROMDEVICE);

		return -ENODATA;

	}

drivers/net/fec_mpc52xx.c

+3 −2
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ static int mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev) 
{

	struct mpc52xx_fec_priv *priv = netdev_priv(dev);

	struct bcom_fec_bd *bd;

	unsigned long flags;



	if (bcom_queue_full(priv->tx_dmatsk)) {

		if (net_ratelimit())
@@ -316,7 +317,7 @@ static int mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		return NETDEV_TX_BUSY;

	}



	spin_lock_irq(&priv->lock);

	spin_lock_irqsave(&priv->lock, flags);

	dev->trans_start = jiffies;



	bd = (struct bcom_fec_bd *)
@@ -332,7 +333,7 @@ static int mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		netif_stop_queue(dev);

	}



	spin_unlock_irq(&priv->lock);

	spin_unlock_irqrestore(&priv->lock, flags);



	return NETDEV_TX_OK;

}

drivers/net/ibm_newemac/core.c

+2 −0
Original line number Diff line number Diff line
@@ -1305,6 +1305,8 @@ static int emac_close(struct net_device *ndev) 


	free_irq(dev->emac_irq, dev);



	netif_carrier_off(ndev);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE