From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Geert Uytterhoeven <geert@linux-m68k.org>,
"David S. Miller" <davem@davemloft.net>
Subject: [11/21] zorro8390: Fix regression caused during net_device_ops conversion
Date: Thu, 19 May 2011 11:23:41 -0700 [thread overview]
Message-ID: <20110519182437.406242882@clark.kroah.org> (raw)
In-Reply-To: <20110519182446.GA23751@kroah.com>
2.6.32-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Geert Uytterhoeven <geert@linux-m68k.org>
commit cf7e032fc87d59c475df26c4d40bf45d401b2adb upstream.
Changeset b6114794a1c394534659f4a17420e48cf23aa922 ("zorro8390: convert to
net_device_ops") broke zorro8390 by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in zorro8390.c and once in
8390.c, subject to different macros. This patch reverts that by
avoiding the wrappers in 8390.c.
Fix based on commits 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390:
fix regression caused during net_device_ops conversion") and
4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with
NET_POLL_CONTROLLER").
Reported-by: Christian T. Steigies <cts@debian.org>
Suggested-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Christian T. Steigies <cts@debian.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/net/Makefile | 2 +-
drivers/net/zorro8390.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -208,7 +208,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
obj-$(CONFIG_LP486E) += lp486e.o
obj-$(CONFIG_ETH16I) += eth16i.o
-obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
+obj-$(CONFIG_ZORRO8390) += zorro8390.o
obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
obj-$(CONFIG_EQUALIZER) += eql.o
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -125,7 +125,7 @@ static int __devinit zorro8390_init_one(
board = z->resource.start;
ioaddr = board+cards[i].offset;
- dev = alloc_ei_netdev();
+ dev = ____alloc_ei_netdev(0);
if (!dev)
return -ENOMEM;
if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) {
@@ -145,15 +145,15 @@ static int __devinit zorro8390_init_one(
static const struct net_device_ops zorro8390_netdev_ops = {
.ndo_open = zorro8390_open,
.ndo_stop = zorro8390_close,
- .ndo_start_xmit = ei_start_xmit,
- .ndo_tx_timeout = ei_tx_timeout,
- .ndo_get_stats = ei_get_stats,
- .ndo_set_multicast_list = ei_set_multicast_list,
+ .ndo_start_xmit = __ei_start_xmit,
+ .ndo_tx_timeout = __ei_tx_timeout,
+ .ndo_get_stats = __ei_get_stats,
+ .ndo_set_multicast_list = __ei_set_multicast_list,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr,
.ndo_change_mtu = eth_change_mtu,
#ifdef CONFIG_NET_POLL_CONTROLLER
- .ndo_poll_controller = ei_poll,
+ .ndo_poll_controller = __ei_poll,
#endif
};
next prev parent reply other threads:[~2011-05-19 18:28 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 18:24 [00/21] 2.6.32.41-longterm review Greg KH
2011-05-19 18:23 ` [01/21] cifs: check for bytes_remaining going to zero in CIFS_SessSetup Greg KH
2011-05-19 18:23 ` [02/21] Validate size of EFI GUID partition entries Greg KH
2011-05-19 18:23 ` [03/21] dccp: handle invalid feature options length Greg KH
2011-05-19 18:23 ` [04/21] CIFS: Fix memory over bound bug in cifs_parse_mount_options Greg KH
2011-05-19 18:23 ` [05/21] Fix time() inconsistencies caused by intermediate xtime_cache values being read Greg KH
2011-05-19 20:33 ` [Stable-review] " Ben Hutchings
2011-05-19 18:23 ` [06/21] ehea: fix wrongly reported speed and port Greg KH
2011-05-19 18:23 ` [07/21] NET: slip, fix ldisc->open retval Greg KH
2011-05-19 18:23 ` [08/21] ne-h8300: Fix regression caused during net_device_ops conversion Greg KH
2011-05-19 18:23 ` [09/21] hydra: " Greg KH
2011-05-19 18:23 ` [10/21] libertas: fix cmdpendingq locking Greg KH
2011-05-19 18:23 ` Greg KH [this message]
2011-05-19 18:23 ` [12/21] cifs: add fallback in is_path_accessible for old servers Greg KH
2011-05-19 18:23 ` [13/21] Revert "x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors" Greg KH
2011-05-19 18:23 ` [14/21] x86, AMD: Fix ARAT feature setting again Greg KH
2011-05-19 18:23 ` [15/21] clocksource: Install completely before selecting Greg KH
2011-05-19 18:23 ` [16/21] tick: Clear broadcast active bit when switching to oneshot Greg KH
2011-05-19 18:23 ` [17/21] x86, apic: Fix spurious error interrupts triggering on all non-boot APs Greg KH
2011-05-19 18:23 ` [18/21] x86, mce, AMD: Fix leaving freed data in a list Greg KH
2011-05-19 18:23 ` [19/21] [SCSI] megaraid_sas: Sanity check user supplied length before passing it to dma_alloc_coherent() Greg KH
2011-05-19 18:23 ` [20/21] vmxnet3: Fix inconsistent LRO state after initialization Greg KH
2011-05-19 18:23 ` [21/21] netxen: Remove references to unified firmware file Greg KH
2011-05-19 18:30 ` [01/24] cifs: check for bytes_remaining going to zero in CIFS_SessSetup Greg KH
2011-05-19 18:30 ` [02/24] Validate size of EFI GUID partition entries Greg KH
2011-05-19 18:30 ` [03/24] x86, hw_breakpoints: Fix racy access to ptrace breakpoints Greg KH
2011-05-19 18:30 ` [04/24] ptrace: Prepare to fix racy accesses on task breakpoints Greg KH
2011-05-19 18:30 ` [05/24] dccp: handle invalid feature options length Greg KH
2011-05-19 18:30 ` [06/24] CIFS: Fix memory over bound bug in cifs_parse_mount_options Greg KH
2011-05-19 18:30 ` [07/24] tmpfs: fix race between umount and swapoff Greg KH
2011-05-21 4:52 ` Hugh Dickins
2011-05-19 18:30 ` [08/24] ehea: fix wrongly reported speed and port Greg KH
2011-05-19 18:30 ` [09/24] NET: slip, fix ldisc->open retval Greg KH
2011-05-19 18:30 ` [10/24] ne-h8300: Fix regression caused during net_device_ops conversion Greg KH
2011-05-19 18:30 ` [11/24] hydra: " Greg KH
2011-05-19 18:30 ` [12/24] libertas: fix cmdpendingq locking Greg KH
2011-05-19 18:30 ` [13/24] zorro8390: Fix regression caused during net_device_ops conversion Greg KH
2011-05-19 18:30 ` [14/24] fixes for using make 3.82 Greg KH
2011-05-19 18:30 ` [15/24] tmpfs: fix spurious ENOSPC when racing with unswap Greg KH
2011-05-20 17:49 ` Hugh Dickins
2011-05-21 21:49 ` Greg KH
2011-05-22 0:15 ` Hugh Dickins
2011-05-19 18:30 ` [16/24] cifs: add fallback in is_path_accessible for old servers Greg KH
2011-05-19 18:30 ` [17/24] Revert "x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors" Greg KH
2011-05-19 18:30 ` [18/24] x86, AMD: Fix ARAT feature setting again Greg KH
2011-05-19 18:30 ` [19/24] clocksource: Install completely before selecting Greg KH
2011-05-19 18:30 ` [20/24] tick: Clear broadcast active bit when switching to oneshot Greg KH
2011-05-19 18:30 ` [21/24] x86, apic: Fix spurious error interrupts triggering on all non-boot APs Greg KH
2011-05-19 18:30 ` [22/24] x86, mce, AMD: Fix leaving freed data in a list Greg KH
2011-05-19 18:30 ` [23/24] [SCSI] megaraid_sas: Sanity check user supplied length before passing it to dma_alloc_coherent() Greg KH
2011-05-19 18:30 ` [24/24] vmxnet3: Fix inconsistent LRO state after initialization Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110519182437.406242882@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=davem@davemloft.net \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®