Commit 516bd664 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: (24 commits)
  bridge: Partially disable netpoll support
  tcp: fix crash in tcp_xmit_retransmit_queue
  IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())
  ibmveth: lost IRQ while closing/opening device leads to service loss
  rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()
  vhost: avoid pr_err on condition guest can trigger
  ipmr: Don't leak memory if fib lookup fails.
  vhost-net: avoid flush under lock
  net: fix problem in reading sock TX queue
  net/core: neighbour update Oops
  net: skb_tx_hash() fix relative to skb_orphan_try()
  rfs: call sock_rps_record_flow() in tcp_splice_read()
  xfrm: do not assume that template resolving always returns xfrms
  hostap_pci: set dev->base_addr during probe
  axnet_cs: use spin_lock_irqsave in ax_interrupt
  dsa: Fix Kconfig dependencies.
  act_nat: not all of the ICMP packets need an IP header payload
  r8169: incorrect identifier for a 8168dp
  Phonet: fix skb leak in pipe endpoint accept()
  Bluetooth: Update sec_level/auth_type for already existing connections
  ...
parents 844b9a87 573201f3

drivers/net/ibmveth.c

+3 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ static int ibmveth_close(struct net_device *netdev) 
	if (!adapter->pool_config)

		netif_stop_queue(netdev);



	free_irq(netdev->irq, netdev);

	h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE);



	do {

		lpar_rc = h_free_logical_lan(adapter->vdev->unit_address);
@@ -689,6 +689,8 @@ static int ibmveth_close(struct net_device *netdev) 
				     lpar_rc);

	}



	free_irq(netdev->irq, netdev);



	adapter->rx_no_buffer = *(u64*)(((char*)adapter->buffer_list_addr) + 4096 - 8);



	ibmveth_cleanup(adapter);

drivers/net/pcmcia/axnet_cs.c

+4 −3
Original line number Diff line number Diff line
@@ -1168,6 +1168,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id) 
	int interrupts, nr_serviced = 0, i;

	struct ei_device *ei_local;

    	int handled = 0;

	unsigned long flags;



	e8390_base = dev->base_addr;

	ei_local = netdev_priv(dev);
@@ -1176,7 +1177,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id) 
	 *	Protect the irq test too.

	 */

	 

	spin_lock(&ei_local->page_lock);

	spin_lock_irqsave(&ei_local->page_lock, flags);



	if (ei_local->irqlock) 

	{
@@ -1188,7 +1189,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id) 
			   dev->name, inb_p(e8390_base + EN0_ISR),

			   inb_p(e8390_base + EN0_IMR));

#endif

		spin_unlock(&ei_local->page_lock);

		spin_unlock_irqrestore(&ei_local->page_lock, flags);

		return IRQ_NONE;

	}
@@ -1261,7 +1262,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id) 
	ei_local->irqlock = 0;

	outb_p(ENISR_ALL, e8390_base + EN0_IMR);



	spin_unlock(&ei_local->page_lock);

	spin_unlock_irqrestore(&ei_local->page_lock, flags);

	return IRQ_RETVAL(handled);

}

drivers/net/r8169.c

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp, 
		{ 0x7c800000, 0x28000000,	RTL_GIGA_MAC_VER_26 },



		/* 8168C family. */

		{ 0x7cf00000, 0x3ca00000,	RTL_GIGA_MAC_VER_24 },

		{ 0x7cf00000, 0x3cb00000,	RTL_GIGA_MAC_VER_24 },

		{ 0x7cf00000, 0x3c900000,	RTL_GIGA_MAC_VER_23 },

		{ 0x7cf00000, 0x3c800000,	RTL_GIGA_MAC_VER_18 },

		{ 0x7c800000, 0x3c800000,	RTL_GIGA_MAC_VER_24 },

drivers/net/wireless/ath/ath9k/hif_usb.c

+6 −2
Original line number Diff line number Diff line
@@ -730,13 +730,17 @@ static int ath9k_hif_usb_alloc_urbs(struct hif_device_usb *hif_dev) 


	/* RX */

	if (ath9k_hif_usb_alloc_rx_urbs(hif_dev) < 0)

		goto err;

		goto err_rx;



	/* Register Read */

	if (ath9k_hif_usb_alloc_reg_in_urb(hif_dev) < 0)

		goto err;

		goto err_reg;



	return 0;

err_reg:

	ath9k_hif_usb_dealloc_rx_urbs(hif_dev);

err_rx:

	ath9k_hif_usb_dealloc_tx_urbs(hif_dev);

err:

	return -ENOMEM;

}

drivers/net/wireless/hostap/hostap_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ static int prism2_pci_probe(struct pci_dev *pdev, 


        dev->irq = pdev->irq;

        hw_priv->mem_start = mem;

	dev->base_addr = (unsigned long) mem;



	prism2_pci_cor_sreset(local);

CRA Git | Maintained and supported by SUSTech CRA and CCSE