--- /dev/null
+From 51c80af32574d688c2cdfdaaa8aea15aefc5f056 Mon Sep 17 00:00:00 2001
+From: Kenth Eriksson <kenth.eriksson@transmode.com>
+Date: Tue, 27 Mar 2012 22:05:54 +0000
+Subject: Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
+
+
+From: Kenth Eriksson <kenth.eriksson@transmode.com>
+
+[ Upstream commit 464b57da56910c8737ede75ad820b9a7afc46b3e ]
+
+The merge done in commit b26e478f undid bug fix in commit c3e072f8
+("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non
+TBI (e.g. MDIO) PHYs cannot be accessed.
+
+Signed-off-by: Kenth Eriksson <kenth.eriksson@transmode.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/freescale/fsl_pq_mdio.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
++++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+@@ -356,13 +356,13 @@ static int fsl_pq_mdio_probe(struct plat
+
+ if (prop)
+ tbiaddr = *prop;
+- }
+
+- if (tbiaddr == -1) {
+- err = -EBUSY;
+- goto err_free_irqs;
+- } else {
+- out_be32(tbipa, tbiaddr);
++ if (tbiaddr == -1) {
++ err = -EBUSY;
++ goto err_free_irqs;
++ } else {
++ out_be32(tbipa, tbiaddr);
++ }
+ }
+
+ err = of_mdiobus_register(new_bus, np);
--- /dev/null
+From 1392f4a6a6896c5828c07c47898dc900ef0f90ad Mon Sep 17 00:00:00 2001
+From: Rabin Vincent <rabin@rab.in>
+Date: Thu, 29 Mar 2012 07:15:15 +0000
+Subject: net: usb: cdc_eem: fix mtu
+
+
+From: Rabin Vincent <rabin@rab.in>
+
+[ Upstream commit 78fb72f7936c01d5b426c03a691eca082b03f2b9 ]
+
+Make CDC EEM recalculate the hard_mtu after adjusting the
+hard_header_len.
+
+Without this, usbnet adjusts the MTU down to 1494 bytes, and the host is
+unable to receive standard 1500-byte frames from the device.
+
+Tested with the Linux USB Ethernet gadget.
+
+Cc: Oliver Neukum <oliver@neukum.name>
+Signed-off-by: Rabin Vincent <rabin@rab.in>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/usb/cdc_eem.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/usb/cdc_eem.c
++++ b/drivers/net/usb/cdc_eem.c
+@@ -93,6 +93,7 @@ static int eem_bind(struct usbnet *dev,
+ /* no jumbogram (16K) support for now */
+
+ dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN;
++ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
+
+ return 0;
+ }
--- /dev/null
+From 5ac754f7183e40f00ea68a2f4697c000b24f78f2 Mon Sep 17 00:00:00 2001
+From: "danborkmann@iogearbox.net" <danborkmann@iogearbox.net>
+Date: Tue, 27 Mar 2012 22:47:43 +0000
+Subject: rose_dev: fix memcpy-bug in rose_set_mac_address
+
+
+From: "danborkmann@iogearbox.net" <danborkmann@iogearbox.net>
+
+[ Upstream commit 81213b5e8ae68e204aa7a3f83c4f9100405dbff9 ]
+
+If both addresses equal, nothing needs to be done. If the device is down,
+then we simply copy the new address to dev->dev_addr. If the device is up,
+then we add another loopback device with the new address, and if that does
+not fail, we remove the loopback device with the old address. And only
+then, we update the dev->dev_addr.
+
+Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/rose/rose_dev.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/net/rose/rose_dev.c
++++ b/net/rose/rose_dev.c
+@@ -96,11 +96,11 @@ static int rose_set_mac_address(struct n
+ struct sockaddr *sa = addr;
+ int err;
+
+- if (!memcpy(dev->dev_addr, sa->sa_data, dev->addr_len))
++ if (!memcmp(dev->dev_addr, sa->sa_data, dev->addr_len))
+ return 0;
+
+ if (dev->flags & IFF_UP) {
+- err = rose_add_loopback_node((rose_address *)dev->dev_addr);
++ err = rose_add_loopback_node((rose_address *)sa->sa_data);
+ if (err)
+ return err;
+
--- /dev/null
+x86-bpf_jit-fix-a-bug-in-emitting-the-16-bit-immediate-operand-of-and.patch
+via-rhine-fix-wait-bit-inversion.patch
+tg3-fix-5717-serdes-powerdown-problem.patch
+sky2-dont-overwrite-settings-for-phy-quick-link.patch
+rose_dev-fix-memcpy-bug-in-rose_set_mac_address.patch
+net-usb-cdc_eem-fix-mtu.patch
+fix-non-tbi-phy-access-a-bad-merge-undid-bug-fix-in-a-previous-commit.patch
--- /dev/null
+From c12f662049d889e2fef2837fb8015ee6a555fd24 Mon Sep 17 00:00:00 2001
+From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
+Date: Fri, 30 Mar 2012 07:28:59 +0000
+Subject: sky2: dont overwrite settings for PHY Quick link
+
+
+From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
+
+[ Upstream commit 2240eb4ae3dc4acff20d1a8947c441c451513e37 ]
+
+This patch corrects a bug in function sky2_open() of the Marvell Yukon 2 driver
+in which the settings for PHY quick link are overwritten.
+
+Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
+Acked-by: Stephen Hemminger <shemminger@vyattta.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/marvell/sky2.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/marvell/sky2.c
++++ b/drivers/net/ethernet/marvell/sky2.c
+@@ -1767,13 +1767,14 @@ static int sky2_open(struct net_device *
+
+ sky2_hw_up(sky2);
+
++ /* Enable interrupts from phy/mac for port */
++ imask = sky2_read32(hw, B0_IMSK);
++
+ if (hw->chip_id == CHIP_ID_YUKON_OPT ||
+ hw->chip_id == CHIP_ID_YUKON_PRM ||
+ hw->chip_id == CHIP_ID_YUKON_OP_2)
+ imask |= Y2_IS_PHY_QLNK; /* enable PHY Quick Link */
+
+- /* Enable interrupts from phy/mac for port */
+- imask = sky2_read32(hw, B0_IMSK);
+ imask |= portirq_msk[port];
+ sky2_write32(hw, B0_IMSK, imask);
+ sky2_read32(hw, B0_IMSK);
--- /dev/null
+From 50775ba5e7a5fe86b03dbffc2bcb95c0401403df Mon Sep 17 00:00:00 2001
+From: Matt Carlson <mcarlson@broadcom.com>
+Date: Mon, 2 Apr 2012 09:01:40 +0000
+Subject: tg3: Fix 5717 serdes powerdown problem
+
+
+From: Matt Carlson <mcarlson@broadcom.com>
+
+[ Upstream commit 085f1afc56619bda424941412fdeaff1e32c21dc ]
+
+If port 0 of a 5717 serdes device powers down, it hides the phy from
+port 1. This patch works around the problem by keeping port 0's phy
+powered up.
+
+Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
+Signed-off-by: Michael Chan <mchan@broadcom.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/broadcom/tg3.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/tg3.c
++++ b/drivers/net/ethernet/broadcom/tg3.c
+@@ -2771,7 +2771,9 @@ static void tg3_power_down_phy(struct tg
+ if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
+ GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
+ (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780 &&
+- (tp->phy_flags & TG3_PHYFLG_MII_SERDES)))
++ (tp->phy_flags & TG3_PHYFLG_MII_SERDES)) ||
++ (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
++ !tp->pci_fn))
+ return;
+
+ if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5784_AX ||
--- /dev/null
+From 289475139dc5b35bcb3e9505e13d48043e2467f2 Mon Sep 17 00:00:00 2001
+From: Andreas Mohr <andi@lisas.de>
+Date: Sun, 1 Apr 2012 12:35:00 +0000
+Subject: via-rhine: fix wait-bit inversion.
+
+
+From: Andreas Mohr <andi@lisas.de>
+
+[ Upstream commit 3f8c91a7398b9266fbe7abcbe4bd5dffef907643 ]
+
+Bug appeared in a384a33bb1c9ec2d99db2046b41f57023fa7d77b
+("via-rhine: RHINE_WAIT_FOR macro removal). It can be noticed
+during suspend/resume.
+
+Signed-off-by: Andreas Mohr <andi@lisas.de>
+Acked-by: Francois Romieu <romieu@fr.zoreil.com>
+Cc: David Lv <DavidLv@viatech.com.cn>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/via/via-rhine.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+--- a/drivers/net/ethernet/via/via-rhine.c
++++ b/drivers/net/ethernet/via/via-rhine.c
+@@ -503,30 +503,32 @@ static int rhine_vlan_rx_add_vid(struct
+ static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);
+ static void rhine_restart_tx(struct net_device *dev);
+
+-static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool high)
++static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool low)
+ {
+ void __iomem *ioaddr = rp->base;
+ int i;
+
+ for (i = 0; i < 1024; i++) {
+- if (high ^ !!(ioread8(ioaddr + reg) & mask))
++ bool has_mask_bits = !!(ioread8(ioaddr + reg) & mask);
++
++ if (low ^ has_mask_bits)
+ break;
+ udelay(10);
+ }
+ if (i > 64) {
+ netif_dbg(rp, hw, rp->dev, "%s bit wait (%02x/%02x) cycle "
+- "count: %04d\n", high ? "high" : "low", reg, mask, i);
++ "count: %04d\n", low ? "low" : "high", reg, mask, i);
+ }
+ }
+
+ static void rhine_wait_bit_high(struct rhine_private *rp, u8 reg, u8 mask)
+ {
+- rhine_wait_bit(rp, reg, mask, true);
++ rhine_wait_bit(rp, reg, mask, false);
+ }
+
+ static void rhine_wait_bit_low(struct rhine_private *rp, u8 reg, u8 mask)
+ {
+- rhine_wait_bit(rp, reg, mask, false);
++ rhine_wait_bit(rp, reg, mask, true);
+ }
+
+ static u32 rhine_get_events(struct rhine_private *rp)
--- /dev/null
+From 4c8fa7b71cdd7fccd765e0a677155cd00590549c Mon Sep 17 00:00:00 2001
+From: "zhuangfeiran@ict.ac.cn" <zhuangfeiran@ict.ac.cn>
+Date: Wed, 28 Mar 2012 23:27:00 +0000
+Subject: x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND
+
+From: Feiran Zhuang <zhuangfeiran@ict.ac.cn>
+
+[ Upstream commit 1d24fb3684f347226747c6b11ea426b7b992694e ]
+
+When K >= 0xFFFF0000, AND needs the two least significant bytes of K as
+its operand, but EMIT2() gives it the least significant byte of K and
+0x2. EMIT() should be used here to replace EMIT2().
+
+Signed-off-by: Feiran Zhuang <zhuangfeiran@ict.ac.cn>
+Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/net/bpf_jit_comp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/net/bpf_jit_comp.c
++++ b/arch/x86/net/bpf_jit_comp.c
+@@ -289,7 +289,7 @@ void bpf_jit_compile(struct sk_filter *f
+ EMIT2(0x24, K & 0xFF); /* and imm8,%al */
+ } else if (K >= 0xFFFF0000) {
+ EMIT2(0x66, 0x25); /* and imm16,%ax */
+- EMIT2(K, 2);
++ EMIT(K, 2);
+ } else {
+ EMIT1_off32(0x25, K); /* and imm32,%eax */
+ }
projects / thirdparty / kernel / stable-queue.git / commitdiff
