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

Commit ef324285 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: (33 commits)
  Added support for usb ethernet (0x0fe6, 0x9700)
  r8169: fix RTL8168DP power off issue.
  r8169: correct settings of rtl8102e.
  r8169: fix incorrect args to oob notify.
  DM9000B: Fix PHY power for network down/up
  DM9000B: Fix reg_save after spin_lock in dm9000_timeout
  net_sched: long word align struct qdisc_skb_cb data
  sfc: lower stack usage in efx_ethtool_self_test
  bridge: Use IPv6 link-local address for multicast listener queries
  bridge: Fix MLD queries' ethernet source address
  bridge: Allow mcast snooping for transient link local addresses too
  ipv6: Add IPv6 multicast address flag defines
  bridge: Add missing ntohs()s for MLDv2 report parsing
  bridge: Fix IPv6 multicast snooping by correcting offset in MLDv2 report
  bridge: Fix IPv6 multicast snooping by storing correct protocol type
  p54pci: update receive dma buffers before and after processing
  fix cfg80211_wext_siwfreq lock ordering...
  rt2x00: Fix WPA TKIP Michael MIC failures.
  ath5k: Fix fast channel switching
  tcp: undo_retrans counter fixes
  ...
parents b5f7376e 518d020a

drivers/bluetooth/ath3k.c

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ static struct usb_device_id ath3k_table[] = { 


	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },

	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+5 −2
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ static struct usb_device_id blacklist_table[] = { 
	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -829,7 +832,7 @@ static void btusb_work(struct work_struct *work) 


	if (hdev->conn_hash.sco_num > 0) {

		if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {

			err = usb_autopm_get_interface(data->isoc);

			err = usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);

			if (err < 0) {

				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);

				usb_kill_anchored_urbs(&data->isoc_anchor);
@@ -858,7 +861,7 @@ static void btusb_work(struct work_struct *work) 


		__set_isoc_interface(hdev, 0);

		if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags))

			usb_autopm_put_interface(data->isoc);

			usb_autopm_put_interface(data->isoc ? data->isoc : data->intf);

	}

}

drivers/net/dm9000.c

+5 −4
Original line number Diff line number Diff line
@@ -802,10 +802,7 @@ dm9000_init_dm9000(struct net_device *dev) 
	/* Checksum mode */

	dm9000_set_rx_csum_unlocked(dev, db->rx_csum);



	/* GPIO0 on pre-activate PHY */

	iow(db, DM9000_GPR, 0);	/* REG_1F bit0 activate phyxcer */

	iow(db, DM9000_GPCR, GPCR_GEP_CNTL);	/* Let GPIO0 output */

	iow(db, DM9000_GPR, 0);	/* Enable PHY */



	ncr = (db->flags & DM9000_PLATF_EXT_PHY) ? NCR_EXT_PHY : 0;
@@ -852,8 +849,8 @@ static void dm9000_timeout(struct net_device *dev) 
	unsigned long flags;



	/* Save previous register address */

	reg_save = readb(db->io_addr);

	spin_lock_irqsave(&db->lock, flags);

	reg_save = readb(db->io_addr);



	netif_stop_queue(dev);

	dm9000_reset(db);
@@ -1194,6 +1191,10 @@ dm9000_open(struct net_device *dev) 
	if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev))

		return -EAGAIN;



	/* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */

	iow(db, DM9000_GPR, 0);	/* REG_1F bit0 activate phyxcer */

	mdelay(1); /* delay needs by DM9000B */



	/* Initialize DM9000 board */

	dm9000_reset(db);

	dm9000_init_dm9000(dev);

drivers/net/r8169.c

+23 −19
Original line number Diff line number Diff line
@@ -617,8 +617,9 @@ static void ocp_write(struct rtl8169_private *tp, u8 mask, u16 reg, u32 data) 
	}

}



static void rtl8168_oob_notify(void __iomem *ioaddr, u8 cmd)

static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd)

{

	void __iomem *ioaddr = tp->mmio_addr;

	int i;



	RTL_W8(ERIDR, cmd);
@@ -630,7 +631,7 @@ static void rtl8168_oob_notify(void __iomem *ioaddr, u8 cmd) 
			break;

	}



	ocp_write(ioaddr, 0x1, 0x30, 0x00000001);

	ocp_write(tp, 0x1, 0x30, 0x00000001);

}



#define OOB_CMD_RESET		0x00
@@ -2868,8 +2869,11 @@ static void r8168_pll_power_down(struct rtl8169_private *tp) 
{

	void __iomem *ioaddr = tp->mmio_addr;



	if (tp->mac_version == RTL_GIGA_MAC_VER_27)

	if (((tp->mac_version == RTL_GIGA_MAC_VER_27) ||

	     (tp->mac_version == RTL_GIGA_MAC_VER_28)) &&

	    (ocp_read(tp, 0x0f, 0x0010) & 0x00008000)) {

		return;

	}



	if (((tp->mac_version == RTL_GIGA_MAC_VER_23) ||

	     (tp->mac_version == RTL_GIGA_MAC_VER_24)) &&
@@ -2891,6 +2895,8 @@ static void r8168_pll_power_down(struct rtl8169_private *tp) 
	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_25:

	case RTL_GIGA_MAC_VER_26:

	case RTL_GIGA_MAC_VER_27:

	case RTL_GIGA_MAC_VER_28:

		RTL_W8(PMCH, RTL_R8(PMCH) & ~0x80);

		break;

	}
@@ -2900,12 +2906,17 @@ static void r8168_pll_power_up(struct rtl8169_private *tp) 
{

	void __iomem *ioaddr = tp->mmio_addr;



	if (tp->mac_version == RTL_GIGA_MAC_VER_27)

	if (((tp->mac_version == RTL_GIGA_MAC_VER_27) ||

	     (tp->mac_version == RTL_GIGA_MAC_VER_28)) &&

	    (ocp_read(tp, 0x0f, 0x0010) & 0x00008000)) {

		return;

	}



	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_25:

	case RTL_GIGA_MAC_VER_26:

	case RTL_GIGA_MAC_VER_27:

	case RTL_GIGA_MAC_VER_28:

		RTL_W8(PMCH, RTL_R8(PMCH) | 0x80);

		break;

	}
@@ -3042,7 +3053,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out_mwi_2;

	}



	tp->cp_cmd = PCIMulRW | RxChkSum;

	tp->cp_cmd = RxChkSum;



	if ((sizeof(dma_addr_t) > 4) &&

	    !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && use_dac) {
@@ -3318,7 +3329,8 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp) 
	/* Disable interrupts */

	rtl8169_irq_mask_and_ack(ioaddr);



	if (tp->mac_version == RTL_GIGA_MAC_VER_28) {

	if (tp->mac_version == RTL_GIGA_MAC_VER_27 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_28) {

		while (RTL_R8(TxPoll) & NPQ)

			udelay(20);
@@ -3847,8 +3859,7 @@ static void rtl_hw_start_8168(struct net_device *dev) 
	Cxpl_dbg_sel | \

	ASF | \

	PktCntrDisable | \

	PCIDAC | \

	PCIMulRW)

	Mac_dbgo_sel)



static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)

{
@@ -3878,8 +3889,6 @@ static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev) 
	if ((cfg1 & LEDS0) && (cfg1 & LEDS1))

		RTL_W8(Config1, cfg1 & ~LEDS0);



	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R810X_CPCMD_QUIRK_MASK);



	rtl_ephy_init(ioaddr, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));

}
@@ -3891,8 +3900,6 @@ static void rtl_hw_start_8102e_2(void __iomem *ioaddr, struct pci_dev *pdev) 


	RTL_W8(Config1, MEMMAP | IOMAP | VPD | PMEnable);

	RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);



	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R810X_CPCMD_QUIRK_MASK);

}



static void rtl_hw_start_8102e_3(void __iomem *ioaddr, struct pci_dev *pdev)
@@ -3918,6 +3925,8 @@ static void rtl_hw_start_8101(struct net_device *dev) 
		}

	}



	RTL_W8(Cfg9346, Cfg9346_Unlock);



	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_07:

		rtl_hw_start_8102e_1(ioaddr, pdev);
@@ -3932,14 +3941,13 @@ static void rtl_hw_start_8101(struct net_device *dev) 
		break;

	}



	RTL_W8(Cfg9346, Cfg9346_Unlock);

	RTL_W8(Cfg9346, Cfg9346_Lock);



	RTL_W8(MaxTxPacketSize, TxPacketMax);



	rtl_set_rx_max_size(ioaddr, rx_buf_sz);



	tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW;



	tp->cp_cmd &= ~R810X_CPCMD_QUIRK_MASK;

	RTL_W16(CPlusCmd, tp->cp_cmd);



	RTL_W16(IntrMitigate, 0x0000);
@@ -3949,14 +3957,10 @@ static void rtl_hw_start_8101(struct net_device *dev) 
	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);

	rtl_set_rx_tx_config_registers(tp);



	RTL_W8(Cfg9346, Cfg9346_Lock);



	RTL_R8(IntrMask);



	rtl_set_rx_mode(dev);



	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);



	RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xf000);



	RTL_W16(IntrMask, tp->intr_event);

drivers/net/sfc/ethtool.c

+13 −9
Original line number Diff line number Diff line
@@ -569,9 +569,14 @@ static void efx_ethtool_self_test(struct net_device *net_dev, 
				  struct ethtool_test *test, u64 *data)

{

	struct efx_nic *efx = netdev_priv(net_dev);

	struct efx_self_tests efx_tests;

	struct efx_self_tests *efx_tests;

	int already_up;

	int rc;

	int rc = -ENOMEM;



	efx_tests = kzalloc(sizeof(*efx_tests), GFP_KERNEL);

	if (!efx_tests)

		goto fail;





	ASSERT_RTNL();

	if (efx->state != STATE_RUNNING) {
@@ -589,13 +594,11 @@ static void efx_ethtool_self_test(struct net_device *net_dev, 
		if (rc) {

			netif_err(efx, drv, efx->net_dev,

				  "failed opening device.\n");

			goto fail2;

			goto fail1;

		}

	}



	memset(&efx_tests, 0, sizeof(efx_tests));



	rc = efx_selftest(efx, &efx_tests, test->flags);

	rc = efx_selftest(efx, efx_tests, test->flags);



	if (!already_up)

		dev_close(efx->net_dev);
@@ -604,10 +607,11 @@ static void efx_ethtool_self_test(struct net_device *net_dev, 
		   rc == 0 ? "passed" : "failed",

		   (test->flags & ETH_TEST_FL_OFFLINE) ? "off" : "on");



 fail2:

fail1:

	/* Fill ethtool results structures */

	efx_ethtool_fill_self_tests(efx, &efx_tests, NULL, data);

	efx_ethtool_fill_self_tests(efx, efx_tests, NULL, data);

	kfree(efx_tests);

fail:

	if (rc)

		test->flags |= ETH_TEST_FL_FAILED;

}