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

Commit 9fc282ba 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:
  net: Fix FDDI and TR config checks in ipv4 arp and LLC.
  IPv4: unresolved multicast route cleanup
  mac80211: remove association work when processing deauth request
  ar9170: wait for asynchronous firmware loading
  ipv4: udp: fix short packet and bad checksum logging
  phy: Fix initialization in micrel driver.
  sctp: Fix a race between ICMP protocol unreachable and connect()
  veth: Dont kfree_skb() after dev_forward_skb()
  IPv6: fix IPV6_RECVERR handling of locally-generated errors
  net/gianfar: drop recycled skbs on MTU change
  iwlwifi: work around passive scan issue
parents c61ea31d de02d72b

drivers/net/gianfar.c

+1 −1
Original line number Diff line number Diff line
@@ -1649,6 +1649,7 @@ static void free_skb_resources(struct gfar_private *priv) 
			sizeof(struct rxbd8) * priv->total_rx_ring_size,

			priv->tx_queue[0]->tx_bd_base,

			priv->tx_queue[0]->tx_bd_dma_base);

	skb_queue_purge(&priv->rx_recycle);

}



void gfar_start(struct net_device *dev)
@@ -2088,7 +2089,6 @@ static int gfar_close(struct net_device *dev) 


	disable_napi(priv);



	skb_queue_purge(&priv->rx_recycle);

	cancel_work_sync(&priv->reset_task);

	stop_gfar(dev);

drivers/net/phy/micrel.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ static int kszphy_config_init(struct phy_device *phydev) 


static struct phy_driver ks8001_driver = {

	.phy_id		= PHY_ID_KS8001,

	.name		= "Micrel KS8001",

	.phy_id_mask	= 0x00fffff0,

	.features	= PHY_BASIC_FEATURES,

	.flags		= PHY_POLL,

drivers/net/veth.c

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;



rx_drop:

	kfree_skb(skb);

	rcv_stats->rx_dropped++;

	return NETDEV_TX_OK;

}

drivers/net/wireless/ath/ar9170/usb.c

+11 −0
Original line number Diff line number Diff line
@@ -727,12 +727,16 @@ static void ar9170_usb_firmware_failed(struct ar9170_usb *aru) 
{

	struct device *parent = aru->udev->dev.parent;



	complete(&aru->firmware_loading_complete);



	/* unbind anything failed */

	if (parent)

		down(&parent->sem);

	device_release_driver(&aru->udev->dev);

	if (parent)

		up(&parent->sem);



	usb_put_dev(aru->udev);

}



static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context)
@@ -761,6 +765,8 @@ static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context) 
	if (err)

		goto err_unrx;



	complete(&aru->firmware_loading_complete);

	usb_put_dev(aru->udev);

	return;



 err_unrx:
@@ -858,6 +864,7 @@ static int ar9170_usb_probe(struct usb_interface *intf, 
	init_usb_anchor(&aru->tx_pending);

	init_usb_anchor(&aru->tx_submitted);

	init_completion(&aru->cmd_wait);

	init_completion(&aru->firmware_loading_complete);

	spin_lock_init(&aru->tx_urb_lock);



	aru->tx_pending_urbs = 0;
@@ -877,6 +884,7 @@ static int ar9170_usb_probe(struct usb_interface *intf, 
	if (err)

		goto err_freehw;



	usb_get_dev(aru->udev);

	return request_firmware_nowait(THIS_MODULE, 1, "ar9170.fw",

				       &aru->udev->dev, GFP_KERNEL, aru,

				       ar9170_usb_firmware_step2);
@@ -896,6 +904,9 @@ static void ar9170_usb_disconnect(struct usb_interface *intf) 
		return;



	aru->common.state = AR9170_IDLE;



	wait_for_completion(&aru->firmware_loading_complete);



	ar9170_unregister(&aru->common);

	ar9170_usb_cancel_urbs(aru);

drivers/net/wireless/ath/ar9170/usb.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ struct ar9170_usb { 
	unsigned int tx_pending_urbs;



	struct completion cmd_wait;

	struct completion firmware_loading_complete;

	int readlen;

	u8 *readbuf;