diff options
Diffstat (limited to 'trunk/2.6.21/21353_linux-2.6-netdev-e1000e-04.patch')
| -rw-r--r-- | trunk/2.6.21/21353_linux-2.6-netdev-e1000e-04.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/trunk/2.6.21/21353_linux-2.6-netdev-e1000e-04.patch b/trunk/2.6.21/21353_linux-2.6-netdev-e1000e-04.patch new file mode 100644 index 0000000..36f7c6d --- /dev/null +++ b/trunk/2.6.21/21353_linux-2.6-netdev-e1000e-04.patch @@ -0,0 +1,23 @@ +From: Auke Kok <auke-jan.h.kok@intel.com> +Date: Wed, 8 Aug 2007 17:22:21 +0000 (-0700) +Subject: e1000e: remove duplicate shadowing reference to adapter->hw +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjgarzik%2Fnetdev-2.6.git;a=commitdiff_plain;h=5b8fe1c4280c9424a5fc03d8e8e13c1b4cde22f0 + +e1000e: remove duplicate shadowing reference to adapter->hw + +Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> +Signed-off-by: Jeff Garzik <jeff@garzik.org> +--- + +diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c +index dd4eca6..741965d 100644 +--- a/drivers/net/e1000e/netdev.c ++++ b/drivers/net/e1000e/netdev.c +@@ -2981,7 +2981,6 @@ static void e1000_watchdog_task(struct work_struct *work) + } else { + /* make sure the receive unit is started */ + if (adapter->flags & FLAG_RX_NEEDS_RESTART) { +- struct e1000_hw *hw = &adapter->hw; + u32 rctl = er32(RCTL); + ew32(RCTL, rctl | + E1000_RCTL_EN); |