- e1000-disable-aggressive-clocking-on-esb2-with-serdes-port.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     e1000: Disable aggressive clocking on esb2 with SERDES port

has been removed from the -mm tree.  Its filename is

     e1000-disable-aggressive-clocking-on-esb2-with-serdes-port.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: e1000: Disable aggressive clocking on esb2 with SERDES port
From: "Kok, Auke" <auke-jan.h.kok@xxxxxxxxx>

Disable aggressive clocking on esb2 with SERDES port as it causes hardware
problems.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/net/e1000/e1000_main.c |    2 --
 1 files changed, 2 deletions(-)

diff -puN drivers/net/e1000/e1000_main.c~e1000-disable-aggressive-clocking-on-esb2-with-serdes-port drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c~e1000-disable-aggressive-clocking-on-esb2-with-serdes-port
+++ a/drivers/net/e1000/e1000_main.c
@@ -1498,8 +1498,6 @@ e1000_configure_tx(struct e1000_adapter 
 	} else if (hw->mac_type == e1000_80003es2lan) {
 		tarc = E1000_READ_REG(hw, TARC0);
 		tarc |= 1;
-		if (hw->media_type == e1000_media_type_internal_serdes)
-			tarc |= (1 << 20);
 		E1000_WRITE_REG(hw, TARC0, tarc);
 		tarc = E1000_READ_REG(hw, TARC1);
 		tarc |= 1;
_

Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are

git-netdev-all.patch
e1000-memory-leak-in-e1000_set_ringparam.patch
e1000-ring-buffers-resources-cleanup.patch
e1000-irq-resources-cleanup.patch
e1000-e1000_probe-resources-cleanup.patch
ixgb-add-pci-error-recovery-callbacks.patch
e100-disable-device-on-pci-error.patch
e1000-disable-device-on-pci-error.patch
e1000_7033_dump_ring.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux