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

Commit cd79bf7b 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: (42 commits)
  b44: Fix wedge when using netconsole.
  wan: cosa: drop chan->wsem on error path
  ep93xx-eth: check for zero MAC address on probe, not on device open
  NET: smc91x: Fix irq flags
  smsc9420: prevent BUG() if ethtool is called with interface down
  r8169: restore mac addr in rtl8169_remove_one and rtl_shutdown
  ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr OOPS
  e100: Use pci pool to work around GFP_ATOMIC order 5 memory allocation failure
  sctp: on T3_RTX retransmit all the in-flight chunks
  pktgen: Fix netdevice unregister
  macvlan: fix gso_max_size setting
  rfkill: fix miscdev ops
  ath9k: set ps_default as false
  hso: fix soft-lockup
  hso: fix debug routines
  pktgen: Fix device name compares
  stmmac: do not fail when the timer cannot be used.
  stmmac: fixed a compilation error when use the external timer
  netfilter: xt_limit: fix invalid return code in limit_mt_check()
  Au1x00: fix crash when trying register_netdev()
  ...
parents d0964c37 0cae200e

drivers/ieee802154/fakehard.c

+1 −4
Original line number Diff line number Diff line
@@ -260,15 +260,12 @@ static int ieee802154_fake_close(struct net_device *dev) 
static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,

					      struct net_device *dev)

{

	skb->iif = dev->ifindex;

	skb->dev = dev;

	dev->stats.tx_packets++;

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



	dev->trans_start = jiffies;



	/* FIXME: do hardware work here ... */



	dev_kfree_skb(skb);

	return NETDEV_TX_OK;

}

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ config ENC28J60_WRITEVERIFY 


config ETHOC

	tristate "OpenCores 10/100 Mbps Ethernet MAC support"

	depends on NET_ETHERNET && HAS_IOMEM

	depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA

	select MII

	select PHYLIB

	select CRC32

drivers/net/arm/ep93xx_eth.c

+3 −9
Original line number Diff line number Diff line
@@ -628,15 +628,6 @@ static int ep93xx_open(struct net_device *dev) 
	if (ep93xx_alloc_buffers(ep))

		return -ENOMEM;



	if (is_zero_ether_addr(dev->dev_addr)) {

		random_ether_addr(dev->dev_addr);

		printk(KERN_INFO "%s: generated random MAC address "

			"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x.\n", dev->name,

			dev->dev_addr[0], dev->dev_addr[1],

			dev->dev_addr[2], dev->dev_addr[3],

			dev->dev_addr[4], dev->dev_addr[5]);

	}



	napi_enable(&ep->napi);



	if (ep93xx_start_hw(dev)) {
@@ -877,6 +868,9 @@ static int ep93xx_eth_probe(struct platform_device *pdev) 
	ep->mii.mdio_write = ep93xx_mdio_write;

	ep->mdc_divisor = 40;	/* Max HCLK 100 MHz, min MDIO clk 2.5 MHz.  */



	if (is_zero_ether_addr(dev->dev_addr))

		random_ether_addr(dev->dev_addr);



	err = register_netdev(dev);

	if (err) {

		dev_err(&pdev->dev, "Failed to register netdev\n");

drivers/net/au1000_eth.c

+8 −7
Original line number Diff line number Diff line
@@ -1088,7 +1088,14 @@ static struct net_device * au1000_probe(int port_num) 
		return NULL;

	}



	if ((err = register_netdev(dev)) != 0) {

	dev->base_addr = base;

	dev->irq = irq;

	dev->netdev_ops = &au1000_netdev_ops;

	SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops);

	dev->watchdog_timeo = ETH_TX_TIMEOUT;



	err = register_netdev(dev);

	if (err != 0) {

		printk(KERN_ERR "%s: Cannot register net device, error %d\n",

				DRV_NAME, err);

		free_netdev(dev);
@@ -1209,12 +1216,6 @@ static struct net_device * au1000_probe(int port_num) 
		aup->tx_db_inuse[i] = pDB;

	}



	dev->base_addr = base;

	dev->irq = irq;

	dev->netdev_ops = &au1000_netdev_ops;

	SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops);

	dev->watchdog_timeo = ETH_TX_TIMEOUT;



	/*

	 * The boot code uses the ethernet controller, so reset it to start

	 * fresh.  au1000_init() expects that the device is in reset state.

drivers/net/b44.c

+0 −3
Original line number Diff line number Diff line
@@ -912,9 +912,6 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id) 
			bp->istat = istat;

			__b44_disable_ints(bp);

			__napi_schedule(&bp->napi);

		} else {

			printk(KERN_ERR PFX "%s: Error, poll already scheduled\n",

			       dev->name);

		}



irq_ack: