Commit 608307e6 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: (26 commits)
  pkt_sched: Fix lockdep warning on est_tree_lock in gen_estimator
  ipvs: avoid oops for passive FTP
  Revert "sky2: don't do GRO on second port"
  gro: fix different skb headrooms
  bridge: Clear INET control block of SKBs passed into ip_fragment().
  3c59x: Remove incorrect locking; correct documented lock hierarchy
  sky2: don't do GRO on second port
  ipv4: minor fix about RPF in help of Kconfig
  xfrm_user: avoid a warning with some compiler
  net/sched/sch_hfsc.c: initialize parent's cl_cfmin properly in init_vf()
  pxa168_eth: fix a mdiobus leak
  net sched: fix kernel leak in act_police
  vhost: stop worker only if created
  MAINTAINERS: Add ehea driver as Supported
  ath9k_hw: fix parsing of HT40 5 GHz CTLs
  ath9k_hw: Fix EEPROM uncompress block reading on AR9003
  wireless: register wiphy rfkill w/o holding cfg80211_mutex
  netlink: Make NETLINK_USERSOCK work again.
  irda: Correctly clean up self->ias_obj on irda_bind() failure.
  wireless extensions: fix kernel heap content leak
  ...
parents 96d4cbb6 0b5d404e

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -2201,6 +2201,12 @@ L: linux-rdma@vger.kernel.org 
S:	Supported

F:	drivers/infiniband/hw/ehca/



EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER

M:	Breno Leitao <leitao@linux.vnet.ibm.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ehea/



EMBEDDED LINUX

M:	Paul Gortmaker <paul.gortmaker@windriver.com>

M:	Matt Mackall <mpm@selenic.com>
@@ -4603,7 +4609,7 @@ F: include/linux/preempt.h 
PRISM54 WIRELESS DRIVER

M:	"Luis R. Rodriguez" <mcgrof@gmail.com>

L:	linux-wireless@vger.kernel.org

W:	http://prism54.org

W:	http://wireless.kernel.org/en/users/Drivers/p54

S:	Obsolete

F:	drivers/net/wireless/prism54/

drivers/net/3c59x.c

+1 −4
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ struct vortex_private { 
	u16 io_size;						/* Size of PCI region (for release_region) */



	/* Serialises access to hardware other than MII and variables below.

	 * The lock hierarchy is rtnl_lock > lock > mii_lock > window_lock. */

	 * The lock hierarchy is rtnl_lock > {lock, mii_lock} > window_lock. */

	spinlock_t lock;



	spinlock_t mii_lock;		/* Serialises access to MII */
@@ -2984,7 +2984,6 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
{

	int err;

	struct vortex_private *vp = netdev_priv(dev);

	unsigned long flags;

	pci_power_t state = 0;



	if(VORTEX_PCI(vp))
@@ -2994,9 +2993,7 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 


	if(state != 0)

		pci_set_power_state(VORTEX_PCI(vp), PCI_D0);

	spin_lock_irqsave(&vp->lock, flags);

	err = generic_mii_ioctl(&vp->mii, if_mii(rq), cmd, NULL);

	spin_unlock_irqrestore(&vp->lock, flags);

	if(state != 0)

		pci_set_power_state(VORTEX_PCI(vp), state);

drivers/net/pcmcia/pcnet_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -1637,6 +1637,7 @@ static struct pcmcia_device_id pcnet_ids[] = { 
	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCETTX", 0x547e66dc, 0x6fc5459b),

	PCMCIA_DEVICE_PROD_ID12("iPort", "10/100 Ethernet Card", 0x56c538d2, 0x11b0ffc0),

	PCMCIA_DEVICE_PROD_ID12("KANSAI ELECTRIC CO.,LTD", "KLA-PCM/T", 0xb18dc3b4, 0xcc51a956),

	PCMCIA_DEVICE_PROD_ID12("KENTRONICS", "KEP-230", 0xaf8144c9, 0x868f6616),

	PCMCIA_DEVICE_PROD_ID12("KCI", "PE520 PCMCIA Ethernet Adapter", 0xa89b87d3, 0x1eb88e64),

	PCMCIA_DEVICE_PROD_ID12("KINGMAX", "EN10T2T", 0x7bcb459a, 0xa5c81fa5),

	PCMCIA_DEVICE_PROD_ID12("Kingston", "KNE-PC2", 0x1128e633, 0xce2a89b3),

drivers/net/pxa168_eth.c

+2 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,8 @@ static int pxa168_eth_remove(struct platform_device *pdev) 


	iounmap(pep->base);

	pep->base = NULL;

	mdiobus_unregister(pep->smi_bus);

	mdiobus_free(pep->smi_bus);

	unregister_netdev(dev);

	flush_scheduled_work();

	free_netdev(dev);

drivers/net/wireless/ath/ath5k/base.c

+4 −0
Original line number Diff line number Diff line
@@ -1327,6 +1327,10 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf, 
			PCI_DMA_TODEVICE);



	rate = ieee80211_get_tx_rate(sc->hw, info);

	if (!rate) {

		ret = -EINVAL;

		goto err_unmap;

	}



	if (info->flags & IEEE80211_TX_CTL_NO_ACK)

		flags |= AR5K_TXDESC_NOACK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE