Commit 11fe8839 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 



Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f3
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 70d4bf6d 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/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);

drivers/net/wireless/rt2x00/rt2x00dev.c

+5 −5
Original line number Diff line number Diff line
@@ -958,6 +958,11 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
		    BIT(NL80211_IFTYPE_MESH_POINT) |

		    BIT(NL80211_IFTYPE_WDS);



	/*

	 * Initialize configuration work.

	 */

	INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);



	/*

	 * Let the driver probe the device to detect the capabilities.

	 */
@@ -967,11 +972,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
		goto exit;

	}



	/*

	 * Initialize configuration work.

	 */

	INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);



	/*

	 * Allocate queue array.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE