* Re: [PATCH V6 1/3] virtio-net: fix the set affinity bug when CPU IDs are not consecutive
From: Rusty Russell @ 2013-01-22 1:12 UTC (permalink / raw)
To: Wanlong Gao, linux-kernel
Cc: Michael S. Tsirkin, Jason Wang, Eric Dumazet, virtualization,
netdev, Wanlong Gao
In-Reply-To: <1358767524-17934-1-git-send-email-gaowanlong@cn.fujitsu.com>
Wanlong Gao <gaowanlong@cn.fujitsu.com> writes:
> As Michael mentioned, set affinity and select queue will not work very
> well when CPU IDs are not consecutive, this can happen with hot unplug.
> Fix this bug by traversal the online CPUs, and create a per cpu variable
> to find the mapping from CPU to the preferable virtual-queue.
This series looks fairly sane at a glance, to me, but MST is the Ack you
need.
Thanks,
Rusty.
^ permalink raw reply
* [PATCH net-next 02/15] drivers/net: delete intel 486 panther onboard ethernet support
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
This driver was specific to a "professional workstation" line
of products from around 1993 that used the i82596 ethernet chip
as an on-board ethernet solution.
With a 486 processor, and the premium top of the line model maxing
out at a clock speed of 50MHz, we can safely retire this support.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/ethernet/i825xx/Kconfig | 8 -
drivers/net/ethernet/i825xx/Makefile | 1 -
drivers/net/ethernet/i825xx/lp486e.c | 1337 ----------------------------------
3 files changed, 1346 deletions(-)
delete mode 100644 drivers/net/ethernet/i825xx/lp486e.c
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index c39698a..46edb81 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -93,14 +93,6 @@ config LASI_82596
Say Y here to support the builtin Intel 82596 ethernet controller
found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
-config LP486E
- tristate "LP486E on board Ethernet"
- depends on ISA
- ---help---
- Say Y here to support the 82596-based on-board Ethernet controller
- for the Panther motherboard, which is one of the two shipped in the
- Intel Professional Workstation.
-
config MVME16x_NET
tristate "MVME16x Ethernet support"
depends on MVME16x
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
index e5ab9d0..4f01584 100644
--- a/drivers/net/ethernet/i825xx/Makefile
+++ b/drivers/net/ethernet/i825xx/Makefile
@@ -7,7 +7,6 @@ obj-$(CONFIG_EEXPRESS) += eexpress.o
obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
obj-$(CONFIG_ELPLUS) += 3c505.o
obj-$(CONFIG_EL16) += 3c507.o
-obj-$(CONFIG_LP486E) += lp486e.o
obj-$(CONFIG_NI52) += ni52.o
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
obj-$(CONFIG_ZNET) += znet.o
diff --git a/drivers/net/ethernet/i825xx/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
deleted file mode 100644
index 3735bfa..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 01/15] drivers/net: delete 486 Apricot support
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
The Apricot was a 486 PC with 4MB RAM, and an on-board ethernet
via an intel i82596 hard-wired to i/o 0x300.
Those who were using linux in the 1990's will recall that the
i82596 driver was not one of the more stable or widely used
drivers of its day. Combine that with the extremely limited
resources of the platform, and it is truly time to expire the
support for this thing.
There are some old m68k targets who were also using this chip,
so rather than poll the m68k user base, we simply cut out the
x86/Apricot support here in this commit.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Space.c | 2 +-
drivers/net/ethernet/i825xx/82596.c | 96 +++---------------------------------
drivers/net/ethernet/i825xx/Kconfig | 11 -----
drivers/net/ethernet/i825xx/Makefile | 1 -
4 files changed, 9 insertions(+), 101 deletions(-)
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 5637c26..c6e5194 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -165,7 +165,7 @@ static struct devprobe2 isa_probes[] __initdata = {
#ifdef CONFIG_EWRK3 /* DEC EtherWORKS 3 */
{ewrk3_probe, 0},
#endif
-#if defined(CONFIG_APRICOT) || defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET) /* Intel I82596 */
+#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET) /* Intel I82596 */
{i82596_probe, 0},
#endif
#ifdef CONFIG_EL1 /* 3c501 */
diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c
index 6aa927a..05cda84 100644
--- a/drivers/net/ethernet/i825xx/82596.c
+++ b/drivers/net/ethernet/i825xx/82596.c
@@ -95,9 +95,6 @@ static char version[] __initdata =
#if defined(CONFIG_BVME6000_NET) || defined(CONFIG_BVME6000_NET_MODULE)
#define ENABLE_BVME6000_NET
#endif
-#if defined(CONFIG_APRICOT) || defined(CONFIG_APRICOT_MODULE)
-#define ENABLE_APRICOT
-#endif
#ifdef ENABLE_MVME16x_NET
#include <asm/mvme16xhw.h>
@@ -120,8 +117,15 @@ static char version[] __initdata =
#define WSWAPtbd(x) ((struct i596_tbd *) (((u32)(x)<<16) | ((((u32)(x)))>>16)))
#define WSWAPchar(x) ((char *) (((u32)(x)<<16) | ((((u32)(x)))>>16)))
#define ISCP_BUSY 0x00010000
-#define MACH_IS_APRICOT 0
#else
+#error 82596.c: unknown architecture
+#endif
+
+/*
+ * These were the intel versions, left here for reference. There
+ * are currently no x86 users of this legacy i82596 chip.
+ */
+#if 0
#define WSWAPrfd(x) ((struct i596_rfd *)((long)x))
#define WSWAPrbd(x) ((struct i596_rbd *)((long)x))
#define WSWAPiscp(x) ((struct i596_iscp *)((long)x))
@@ -130,7 +134,6 @@ static char version[] __initdata =
#define WSWAPtbd(x) ((struct i596_tbd *)((long)x))
#define WSWAPchar(x) ((char *)((long)x))
#define ISCP_BUSY 0x0001
-#define MACH_IS_APRICOT 1
#endif
/*
@@ -383,11 +386,6 @@ static inline void CA(struct net_device *dev)
i = *(volatile u32 *) (dev->base_addr);
}
#endif
-#ifdef ENABLE_APRICOT
- if (MACH_IS_APRICOT) {
- outw(0, (short) (dev->base_addr) + 4);
- }
-#endif
}
@@ -617,9 +615,6 @@ static void rebuild_rx_bufs(struct net_device *dev)
static int init_i596_mem(struct net_device *dev)
{
struct i596_private *lp = dev->ml_priv;
-#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET) || defined(ENABLE_APRICOT)
- short ioaddr = dev->base_addr;
-#endif
unsigned long flags;
MPU_PORT(dev, PORT_RESET, NULL);
@@ -653,20 +648,6 @@ static int init_i596_mem(struct net_device *dev)
MPU_PORT(dev, PORT_ALTSCP, (void *)virt_to_bus((void *)&lp->scp));
-#elif defined(ENABLE_APRICOT)
-
- {
- u32 scp = virt_to_bus(&lp->scp);
-
- /* change the scp address */
- outw(0, ioaddr);
- outw(0, ioaddr);
- outb(4, ioaddr + 0xf);
- outw(scp | 2, ioaddr);
- outw(scp >> 16, ioaddr);
- }
-#endif
-
lp->last_cmd = jiffies;
#ifdef ENABLE_MVME16x_NET
@@ -677,10 +658,6 @@ static int init_i596_mem(struct net_device *dev)
if (MACH_IS_BVME6000)
lp->scp.sysbus = 0x0000004c;
#endif
-#ifdef ENABLE_APRICOT
- if (MACH_IS_APRICOT)
- lp->scp.sysbus = 0x00440000;
-#endif
lp->scp.iscp = WSWAPiscp(virt_to_bus((void *)&lp->iscp));
lp->iscp.scb = WSWAPscb(virt_to_bus((void *)&lp->scb));
@@ -698,10 +675,6 @@ static int init_i596_mem(struct net_device *dev)
DEB(DEB_INIT,printk(KERN_DEBUG "%s: starting i82596.\n", dev->name));
-#if defined(ENABLE_APRICOT)
- (void) inb(ioaddr + 0x10);
- outb(4, ioaddr + 0xf);
-#endif
CA(dev);
if (wait_istat(dev,lp,1000,"initialization timed out"))
@@ -1203,43 +1176,6 @@ struct net_device * __init i82596_probe(int unit)
goto found;
}
#endif
-#ifdef ENABLE_APRICOT
- {
- int checksum = 0;
- int ioaddr = 0x300;
-
- /* this is easy the ethernet interface can only be at 0x300 */
- /* first check nothing is already registered here */
-
- if (!request_region(ioaddr, I596_TOTAL_SIZE, DRV_NAME)) {
- printk(KERN_ERR "82596: IO address 0x%04x in use\n", ioaddr);
- err = -EBUSY;
- goto out;
- }
-
- dev->base_addr = ioaddr;
-
- for (i = 0; i < 8; i++) {
- eth_addr[i] = inb(ioaddr + 8 + i);
- checksum += eth_addr[i];
- }
-
- /* checksum is a multiple of 0x100, got this wrong first time
- some machines have 0x100, some 0x200. The DOS driver doesn't
- even bother with the checksum.
- Some other boards trip the checksum.. but then appear as
- ether address 0. Trap these - AC */
-
- if ((checksum % 0x100) ||
- (memcmp(eth_addr, "\x00\x00\x49", 3) != 0)) {
- err = -ENODEV;
- goto out1;
- }
-
- dev->irq = 10;
- goto found;
- }
-#endif
err = -ENODEV;
goto out;
@@ -1296,9 +1232,6 @@ out2:
#endif
free_page ((u32)(dev->mem_start));
out1:
-#ifdef ENABLE_APRICOT
- release_region(dev->base_addr, I596_TOTAL_SIZE);
-#endif
out:
free_netdev(dev);
return ERR_PTR(err);
@@ -1455,10 +1388,6 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id)
*ethirq = 3;
}
#endif
-#ifdef ENABLE_APRICOT
- (void) inb(ioaddr + 0x10);
- outb(4, ioaddr + 0xf);
-#endif
CA(dev);
DEB(DEB_INTS,printk(KERN_DEBUG "%s: exiting interrupt.\n", dev->name));
@@ -1589,11 +1518,6 @@ static void set_multicast_list(struct net_device *dev)
#ifdef MODULE
static struct net_device *dev_82596;
-#ifdef ENABLE_APRICOT
-module_param(irq, int, 0);
-MODULE_PARM_DESC(irq, "Apricot IRQ number");
-#endif
-
static int debug = -1;
module_param(debug, int, 0);
MODULE_PARM_DESC(debug, "i82596 debug mask");
@@ -1620,10 +1544,6 @@ void __exit cleanup_module(void)
IOMAP_FULL_CACHING);
#endif
free_page ((u32)(dev_82596->mem_start));
-#ifdef ENABLE_APRICOT
- /* If we don't do this, we can't re-insmod it later. */
- release_region(dev_82596->base_addr, I596_TOTAL_SIZE);
-#endif
free_netdev(dev_82596);
}
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index 70f8c2d..c39698a 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -50,17 +50,6 @@ config ARM_ETHER1
If you have an Acorn system with one of these (AKA25) network cards,
you should say Y to this option if you wish to use it with Linux.
-config APRICOT
- tristate "Apricot Xen-II on board Ethernet"
- depends on ISA
- ---help---
- If you have a network (Ethernet) controller of this type, say Y and
- read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called apricot.
-
config BVME6000_NET
tristate "BVME6000 Ethernet support"
depends on BVME6000
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
index 6adff85..e5ab9d0 100644
--- a/drivers/net/ethernet/i825xx/Makefile
+++ b/drivers/net/ethernet/i825xx/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_LP486E) += lp486e.o
obj-$(CONFIG_NI52) += ni52.o
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
obj-$(CONFIG_ZNET) += znet.o
-obj-$(CONFIG_APRICOT) += 82596.o
obj-$(CONFIG_LASI_82596) += lasi_82596.o
obj-$(CONFIG_SNI_82596) += sni_82596.o
obj-$(CONFIG_MVME16x_NET) += 82596.o
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 05/15] drivers/net: delete the 3Com 3c505/3c507 intel i825xx support
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
For those of us who were around in the early to mid 1990's, we
will remember that the i825xx ethernet support was not something
that was considered sufficiently vetted for 24/7 use.
Folks might be inclined to use *functional* ISA hardware on some
near expired P3 ISA machines for dedicated workhorse applications,
but the odds of using (and relying on) one of these old/experimental
drivers is essentially nil. So lets remove them.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Space.c | 8 -
drivers/net/ethernet/i825xx/3c505.c | 1672 ----------------------------------
drivers/net/ethernet/i825xx/3c505.h | 292 ------
drivers/net/ethernet/i825xx/3c507.c | 939 -------------------
drivers/net/ethernet/i825xx/Kconfig | 23 -
drivers/net/ethernet/i825xx/Makefile | 2 -
6 files changed, 2936 deletions(-)
delete mode 100644 drivers/net/ethernet/i825xx/3c505.c
delete mode 100644 drivers/net/ethernet/i825xx/3c505.h
delete mode 100644 drivers/net/ethernet/i825xx/3c507.c
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index d487127..ac66a6a 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -51,8 +51,6 @@ extern struct net_device *fmv18x_probe(int unit);
extern struct net_device *eth16i_probe(int unit);
extern struct net_device *i82596_probe(int unit);
extern struct net_device *ewrk3_probe(int unit);
-extern struct net_device *el16_probe(int unit);
-extern struct net_device *elplus_probe(int unit);
extern struct net_device *e2100_probe(int unit);
extern struct net_device *ni5010_probe(int unit);
extern struct net_device *ni52_probe(int unit);
@@ -164,12 +162,6 @@ static struct devprobe2 isa_probes[] __initdata = {
#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET) /* Intel I82596 */
{i82596_probe, 0},
#endif
-#ifdef CONFIG_EL16 /* 3c507 */
- {el16_probe, 0},
-#endif
-#ifdef CONFIG_ELPLUS /* 3c505 */
- {elplus_probe, 0},
-#endif
#ifdef CONFIG_NI5010
{ni5010_probe, 0},
#endif
diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
deleted file mode 100644
index 6d000d6..0000000
diff --git a/drivers/net/ethernet/i825xx/3c505.h b/drivers/net/ethernet/i825xx/3c505.h
deleted file mode 100644
index 04df2a9..0000000
diff --git a/drivers/net/ethernet/i825xx/3c507.c b/drivers/net/ethernet/i825xx/3c507.c
deleted file mode 100644
index 13983ee..0000000
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index 46edb81..b800a94 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -20,29 +20,6 @@ config NET_VENDOR_I825XX
if NET_VENDOR_I825XX
-config ELPLUS
- tristate "3c505 \"EtherLink Plus\" support"
- depends on ISA && ISA_DMA_API
- ---help---
- Information about this network (Ethernet) card can be found in
- <file:Documentation/networking/3c505.txt>. If you have a card of
- this type, say Y and read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called 3c505.
-
-config EL16
- tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
- depends on ISA && EXPERIMENTAL
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called 3c507.
-
config ARM_ETHER1
tristate "Acorn Ether1 support"
depends on ARM && ARCH_ACORN
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
index 4f01584..bc81e14 100644
--- a/drivers/net/ethernet/i825xx/Makefile
+++ b/drivers/net/ethernet/i825xx/Makefile
@@ -5,8 +5,6 @@
obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_EEXPRESS) += eexpress.o
obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
-obj-$(CONFIG_ELPLUS) += 3c505.o
-obj-$(CONFIG_EL16) += 3c507.o
obj-$(CONFIG_NI52) += ni52.o
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
obj-$(CONFIG_ZNET) += znet.o
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 04/15] drivers/net: delete old parallel port de600/de620 drivers
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
The parallel port is largely replaced by USB, and even in the
day where these drivers were current, the documented speed was
less than 100kB/s. Let us not pretend that anyone cares about
these drivers anymore, or worse - pretend that anyone is using
them on a modern kernel.
As a side bonus, this is the end of legacy parallel port ethernet,
so we get to drop the whole chunk relating to that in the legacy
Space.c file containing the non-PCI unified probe dispatch.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
Documentation/networking/DLINK.txt | 203 --------
drivers/net/Space.c | 13 +-
drivers/net/ethernet/dlink/Kconfig | 32 +-
drivers/net/ethernet/dlink/Makefile | 2 -
drivers/net/ethernet/dlink/de600.c | 529 -------------------
drivers/net/ethernet/dlink/de600.h | 168 ------
drivers/net/ethernet/dlink/de620.c | 987 ------------------------------------
drivers/net/ethernet/dlink/de620.h | 117 -----
8 files changed, 2 insertions(+), 2049 deletions(-)
delete mode 100644 Documentation/networking/DLINK.txt
delete mode 100644 drivers/net/ethernet/dlink/de600.c
delete mode 100644 drivers/net/ethernet/dlink/de600.h
delete mode 100644 drivers/net/ethernet/dlink/de620.c
delete mode 100644 drivers/net/ethernet/dlink/de620.h
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt
deleted file mode 100644
index 55d2443..0000000
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 64cd86e..d487127 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -73,9 +73,6 @@ extern struct net_device *mac89x0_probe(int unit);
extern struct net_device *cops_probe(int unit);
extern struct net_device *ltpc_probe(void);
-/* Detachable devices ("pocket adaptors") */
-extern struct net_device *de620_probe(int unit);
-
/* Fibre Channel adapters */
extern int iph5526_probe(struct net_device *dev);
@@ -185,13 +182,6 @@ static struct devprobe2 isa_probes[] __initdata = {
{NULL, 0},
};
-static struct devprobe2 parport_probes[] __initdata = {
-#ifdef CONFIG_DE620 /* D-Link DE-620 adapter */
- {de620_probe, 0},
-#endif
- {NULL, 0},
-};
-
static struct devprobe2 m68k_probes[] __initdata = {
#ifdef CONFIG_ATARILANCE /* Lance-based Atari ethernet boards */
{atarilance_probe, 0},
@@ -230,8 +220,7 @@ static void __init ethif_probe2(int unit)
return;
(void)( probe_list2(unit, m68k_probes, base_addr == 0) &&
- probe_list2(unit, isa_probes, base_addr == 0) &&
- probe_list2(unit, parport_probes, base_addr == 0));
+ probe_list2(unit, isa_probes, base_addr == 0));
}
/* Statically configured drivers -- order matters here. */
diff --git a/drivers/net/ethernet/dlink/Kconfig b/drivers/net/ethernet/dlink/Kconfig
index b5afe21..ee26ce7 100644
--- a/drivers/net/ethernet/dlink/Kconfig
+++ b/drivers/net/ethernet/dlink/Kconfig
@@ -5,7 +5,7 @@
config NET_VENDOR_DLINK
bool "D-Link devices"
default y
- depends on PCI || PARPORT
+ depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
@@ -18,36 +18,6 @@ config NET_VENDOR_DLINK
if NET_VENDOR_DLINK
-config DE600
- tristate "D-Link DE600 pocket adapter support"
- depends on PARPORT
- ---help---
- This is a network (Ethernet) device which attaches to your parallel
- port. Read <file:Documentation/networking/DLINK.txt> as well as the
- Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>, if you want to use
- this. It is possible to have several devices share a single parallel
- port and it is safe to compile the corresponding drivers into the
- kernel.
-
- To compile this driver as a module, choose M here: the module
- will be called de600.
-
-config DE620
- tristate "D-Link DE620 pocket adapter support"
- depends on PARPORT
- ---help---
- This is a network (Ethernet) device which attaches to your parallel
- port. Read <file:Documentation/networking/DLINK.txt> as well as the
- Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>, if you want to use
- this. It is possible to have several devices share a single parallel
- port and it is safe to compile the corresponding drivers into the
- kernel.
-
- To compile this driver as a module, choose M here: the module
- will be called de620.
-
config DL2K
tristate "DL2000/TC902x-based Gigabit Ethernet support"
depends on PCI
diff --git a/drivers/net/ethernet/dlink/Makefile b/drivers/net/ethernet/dlink/Makefile
index c705eaa..40085f6 100644
--- a/drivers/net/ethernet/dlink/Makefile
+++ b/drivers/net/ethernet/dlink/Makefile
@@ -2,7 +2,5 @@
# Makefile for the D-Link network device drivers.
#
-obj-$(CONFIG_DE600) += de600.o
-obj-$(CONFIG_DE620) += de620.o
obj-$(CONFIG_DL2K) += dl2k.o
obj-$(CONFIG_SUNDANCE) += sundance.o
diff --git a/drivers/net/ethernet/dlink/de600.c b/drivers/net/ethernet/dlink/de600.c
deleted file mode 100644
index 414f0ee..0000000
diff --git a/drivers/net/ethernet/dlink/de600.h b/drivers/net/ethernet/dlink/de600.h
deleted file mode 100644
index e80ecba..0000000
diff --git a/drivers/net/ethernet/dlink/de620.c b/drivers/net/ethernet/dlink/de620.c
deleted file mode 100644
index 2e2bc60..0000000
diff --git a/drivers/net/ethernet/dlink/de620.h b/drivers/net/ethernet/dlink/de620.h
deleted file mode 100644
index e8d9a88..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 03/15] drivers/net: delete old 8bit ISA 3c501 driver.
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker, Alan Cox
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
It was amusing that linux was able to make use of this 1980's
technology on machines long past its intended lifespan, but
it probably should go now.
To set some context, the 3c501 was designed in the 1980's to be
used on 8088 PC-XT 8bit ISA machines. It was built using a large
number of discrete TTL components and truly looks like a relic
of the ancient past before large scale integration was common.
But from a functional point of view, the real issue, as stated
in the (also obsolete) Ethernet-HowTo, is that "...the 3c501 can
only do one thing at a time -- while you are removing one packet
from the single-packet buffer it cannot receive another packet,
nor can it receive a packet while loading a transmit packet."
You know things are not good when the Kconfig help text suggests
you make a cron job doing a ping every minute.
Hardware that old and crippled is simply not going to be used by
anyone in a time where 10 year old 100Mbit PCI cards (that are
still functional) are largely give-away items.
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Space.c | 4 -
drivers/net/ethernet/3com/3c501.c | 897 -------------------------------------
drivers/net/ethernet/3com/3c501.h | 91 ----
drivers/net/ethernet/3com/Kconfig | 14 -
drivers/net/ethernet/3com/Makefile | 1 -
5 files changed, 1007 deletions(-)
delete mode 100644 drivers/net/ethernet/3com/3c501.c
delete mode 100644 drivers/net/ethernet/3com/3c501.h
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index c6e5194..64cd86e 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -51,7 +51,6 @@ extern struct net_device *fmv18x_probe(int unit);
extern struct net_device *eth16i_probe(int unit);
extern struct net_device *i82596_probe(int unit);
extern struct net_device *ewrk3_probe(int unit);
-extern struct net_device *el1_probe(int unit);
extern struct net_device *el16_probe(int unit);
extern struct net_device *elplus_probe(int unit);
extern struct net_device *e2100_probe(int unit);
@@ -168,9 +167,6 @@ static struct devprobe2 isa_probes[] __initdata = {
#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET) /* Intel I82596 */
{i82596_probe, 0},
#endif
-#ifdef CONFIG_EL1 /* 3c501 */
- {el1_probe, 0},
-#endif
#ifdef CONFIG_EL16 /* 3c507 */
{el16_probe, 0},
#endif
diff --git a/drivers/net/ethernet/3com/3c501.c b/drivers/net/ethernet/3com/3c501.c
deleted file mode 100644
index 9abd9a7..0000000
diff --git a/drivers/net/ethernet/3com/3c501.h b/drivers/net/ethernet/3com/3c501.h
deleted file mode 100644
index 183fd55..0000000
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 8c417ed..1c71c76 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -18,20 +18,6 @@ config NET_VENDOR_3COM
if NET_VENDOR_3COM
-config EL1
- tristate "3c501 \"EtherLink\" support"
- depends on ISA
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>. Also, consider buying a
- new card, since the 3c501 is slow, broken, and obsolete: you will
- have problems. Some people suggest to ping ("man ping") a nearby
- machine every minute ("man cron") when using this card.
-
- To compile this driver as a module, choose M here. The module
- will be called 3c501.
-
config EL3
tristate "3c509/3c579 \"EtherLink III\" support"
depends on (ISA || EISA)
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
index 1e5382a..74046af 100644
--- a/drivers/net/ethernet/3com/Makefile
+++ b/drivers/net/ethernet/3com/Makefile
@@ -2,7 +2,6 @@
# Makefile for the 3Com Ethernet device drivers
#
-obj-$(CONFIG_EL1) += 3c501.o
obj-$(CONFIG_EL3) += 3c509.o
obj-$(CONFIG_3C515) += 3c515.o
obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 06/15] drivers/net: delete ISA intel eexpress and eepro i825xx drivers
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
These old drivers should not be confused with the very common PCI
cards that are supported by e100.c -- these older 10Mbit ISA only
drivers were not as commonly used as some of the other ISA drivers,
simply due to hardware availability and pricing.
Given the rarity of the hardware, and the subsequent less extensive
use of the drivers, it makes sense to obsolete them at this point
in time, along with other rare/experimental ISA drivers.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Space.c | 8 -
drivers/net/ethernet/i825xx/Kconfig | 27 -
drivers/net/ethernet/i825xx/Makefile | 2 -
drivers/net/ethernet/i825xx/eepro.c | 1822 --------------------------------
drivers/net/ethernet/i825xx/eexpress.c | 1661 -----------------------------
drivers/net/ethernet/i825xx/eexpress.h | 179 ----
6 files changed, 3699 deletions(-)
delete mode 100644 drivers/net/ethernet/i825xx/eepro.c
delete mode 100644 drivers/net/ethernet/i825xx/eexpress.c
delete mode 100644 drivers/net/ethernet/i825xx/eexpress.h
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index ac66a6a..726b17b 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -44,8 +44,6 @@ extern struct net_device *el2_probe(int unit);
extern struct net_device *ne_probe(int unit);
extern struct net_device *hp_probe(int unit);
extern struct net_device *hp_plus_probe(int unit);
-extern struct net_device *express_probe(int unit);
-extern struct net_device *eepro_probe(int unit);
extern struct net_device *at1700_probe(int unit);
extern struct net_device *fmv18x_probe(int unit);
extern struct net_device *eth16i_probe(int unit);
@@ -150,12 +148,6 @@ static struct devprobe2 isa_probes[] __initdata = {
#ifdef CONFIG_ETH16I
{eth16i_probe, 0}, /* ICL EtherTeam 16i/32 */
#endif
-#ifdef CONFIG_EEXPRESS /* Intel EtherExpress */
- {express_probe, 0},
-#endif
-#ifdef CONFIG_EEXPRESS_PRO /* Intel EtherExpress Pro/10 */
- {eepro_probe, 0},
-#endif
#ifdef CONFIG_EWRK3 /* DEC EtherWORKS 3 */
{ewrk3_probe, 0},
#endif
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index b800a94..16b14a9 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -36,33 +36,6 @@ config BVME6000_NET
in your kernel.
To compile this driver as a module, choose M here.
-config EEXPRESS
- tristate "EtherExpress 16 support"
- depends on ISA
- ---help---
- If you have an EtherExpress16 network (Ethernet) card, say Y and
- read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>. Note that the Intel
- EtherExpress16 card used to be regarded as a very poor choice
- because the driver was very unreliable. We now have a new driver
- that should do better.
-
- To compile this driver as a module, choose M here. The module
- will be called eexpress.
-
-config EEXPRESS_PRO
- tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
- depends on ISA
- ---help---
- If you have a network (Ethernet) card of this type, say Y. This
- driver supports Intel i82595{FX,TX} based boards. Note however
- that the EtherExpress PRO/100 Ethernet card has its own separate
- driver. Please read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called eepro.
-
config LASI_82596
tristate "Lasi ethernet"
depends on GSC
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
index bc81e14..4267ae7 100644
--- a/drivers/net/ethernet/i825xx/Makefile
+++ b/drivers/net/ethernet/i825xx/Makefile
@@ -3,8 +3,6 @@
#
obj-$(CONFIG_ARM_ETHER1) += ether1.o
-obj-$(CONFIG_EEXPRESS) += eexpress.o
-obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
obj-$(CONFIG_NI52) += ni52.o
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
obj-$(CONFIG_ZNET) += znet.o
diff --git a/drivers/net/ethernet/i825xx/eepro.c b/drivers/net/ethernet/i825xx/eepro.c
deleted file mode 100644
index 7f49fd5..0000000
diff --git a/drivers/net/ethernet/i825xx/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c
deleted file mode 100644
index 7a6a2f0..0000000
diff --git a/drivers/net/ethernet/i825xx/eexpress.h b/drivers/net/ethernet/i825xx/eexpress.h
deleted file mode 100644
index dc9c6ea..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 07/15] drivers/net: delete intel i825xx based znet notebook driver
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
This driver supported early to mid 1990's Zenith laptops, of the
2" thick variety. The driver was already dead 10+ years ago, but
we see this in the source:
----------------
/* 10/2002
[...]
Tested on a vintage Zenith Z-Note 433Lnp+. Probably broken on
anything else. Testers (and detailed bug reports) are welcome :-).
----------------
To clarify, a 433 translates into a 486 at 33MHz, and a system with
a default of 4MB RAM. I can't fault the noble effort to keep things
working a decade ago, but at this point in time, there is no valid
justification to continue carrying this driver along.
Note that there is no associated Space.c cleanup here since this
driver was using module_init to hook itself in.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/ethernet/i825xx/Kconfig | 10 -
drivers/net/ethernet/i825xx/Makefile | 1 -
drivers/net/ethernet/i825xx/znet.c | 928 -----------------------------------
3 files changed, 939 deletions(-)
delete mode 100644 drivers/net/ethernet/i825xx/znet.c
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index 16b14a9..c3cfa57 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -79,14 +79,4 @@ config SUN3_82586
that this driver does not support 82586-based adapters on additional
VME boards.
-config ZNET
- tristate "Zenith Z-Note support (EXPERIMENTAL)"
- depends on EXPERIMENTAL && ISA_DMA_API && X86
- ---help---
- The Zenith Z-Note notebook computer has a built-in network
- (Ethernet) card, and this is the Linux driver for it. Note that the
- IBM Thinkpad 300 is compatible with the Z-Note and is also supported
- by this driver. Read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
endif # NET_VENDOR_I825XX
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
index 4267ae7..df9e2ec 100644
--- a/drivers/net/ethernet/i825xx/Makefile
+++ b/drivers/net/ethernet/i825xx/Makefile
@@ -5,7 +5,6 @@
obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_NI52) += ni52.o
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
-obj-$(CONFIG_ZNET) += znet.o
obj-$(CONFIG_LASI_82596) += lasi_82596.o
obj-$(CONFIG_SNI_82596) += sni_82596.o
obj-$(CONFIG_MVME16x_NET) += 82596.o
diff --git a/drivers/net/ethernet/i825xx/znet.c b/drivers/net/ethernet/i825xx/znet.c
deleted file mode 100644
index c9479e0..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 08/15] drivers/net: delete Racal Interlan ISA ni52 (i825xx) driver
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
Like the other drivers that were in the ISA i825xx family, the ni52
was rather rare, not widely used, and hence perhaps not as reliable
as the more mainstream ISA drivers that were heavily used. Given
that, it is chosen for retirement at this time as well.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Space.c | 4 -
drivers/net/ethernet/i825xx/Kconfig | 11 -
drivers/net/ethernet/i825xx/Makefile | 1 -
drivers/net/ethernet/i825xx/ni52.c | 1346 ----------------------------------
drivers/net/ethernet/i825xx/ni52.h | 310 --------
5 files changed, 1672 deletions(-)
delete mode 100644 drivers/net/ethernet/i825xx/ni52.c
delete mode 100644 drivers/net/ethernet/i825xx/ni52.h
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 726b17b..b69dac1 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -51,7 +51,6 @@ extern struct net_device *i82596_probe(int unit);
extern struct net_device *ewrk3_probe(int unit);
extern struct net_device *e2100_probe(int unit);
extern struct net_device *ni5010_probe(int unit);
-extern struct net_device *ni52_probe(int unit);
extern struct net_device *ni65_probe(int unit);
extern struct net_device *sonic_probe(int unit);
extern struct net_device *seeq8005_probe(int unit);
@@ -157,9 +156,6 @@ static struct devprobe2 isa_probes[] __initdata = {
#ifdef CONFIG_NI5010
{ni5010_probe, 0},
#endif
-#ifdef CONFIG_NI52
- {ni52_probe, 0},
-#endif
#ifdef CONFIG_NI65
{ni65_probe, 0},
#endif
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index c3cfa57..955d929 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -52,17 +52,6 @@ config MVME16x_NET
driver for this chip in your kernel.
To compile this driver as a module, choose M here.
-config NI52
- tristate "NI5210 support"
- depends on ISA
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called ni52.
-
config SNI_82596
tristate "SNI RM ethernet"
depends on SNI_RM
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
index df9e2ec..8c8dcd2 100644
--- a/drivers/net/ethernet/i825xx/Makefile
+++ b/drivers/net/ethernet/i825xx/Makefile
@@ -3,7 +3,6 @@
#
obj-$(CONFIG_ARM_ETHER1) += ether1.o
-obj-$(CONFIG_NI52) += ni52.o
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
obj-$(CONFIG_LASI_82596) += lasi_82596.o
obj-$(CONFIG_SNI_82596) += sni_82596.o
diff --git a/drivers/net/ethernet/i825xx/ni52.c b/drivers/net/ethernet/i825xx/ni52.c
deleted file mode 100644
index 272976e..0000000
diff --git a/drivers/net/ethernet/i825xx/ni52.h b/drivers/net/ethernet/i825xx/ni52.h
deleted file mode 100644
index 0a03b28..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 10/15] drivers/net: delete at1700 ISA 10Mbit driver
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
These Fujitsu MB86965 based ISA 10Mbit cards were another of the
relatively rare cards dating from the early 1990s that for one reason
or another didn't seem to get a lot of use in linux. So we retire it
now with a reasonable degree of confidence that it won't impact anyone.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Space.c | 4 -
drivers/net/ethernet/fujitsu/Kconfig | 12 -
drivers/net/ethernet/fujitsu/Makefile | 1 -
drivers/net/ethernet/fujitsu/at1700.c | 791 ----------------------------------
4 files changed, 808 deletions(-)
delete mode 100644 drivers/net/ethernet/fujitsu/at1700.c
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 4141c64..e7d916d5 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -44,7 +44,6 @@ extern struct net_device *el2_probe(int unit);
extern struct net_device *ne_probe(int unit);
extern struct net_device *hp_probe(int unit);
extern struct net_device *hp_plus_probe(int unit);
-extern struct net_device *at1700_probe(int unit);
extern struct net_device *fmv18x_probe(int unit);
extern struct net_device *eth16i_probe(int unit);
extern struct net_device *i82596_probe(int unit);
@@ -140,9 +139,6 @@ static struct devprobe2 isa_probes[] __initdata = {
{cs89x0_probe, 0},
#endif
#endif
-#ifdef CONFIG_AT1700
- {at1700_probe, 0},
-#endif
#ifdef CONFIG_ETH16I
{eth16i_probe, 0}, /* ICL EtherTeam 16i/32 */
#endif
diff --git a/drivers/net/ethernet/fujitsu/Kconfig b/drivers/net/ethernet/fujitsu/Kconfig
index aca1568..af114fd 100644
--- a/drivers/net/ethernet/fujitsu/Kconfig
+++ b/drivers/net/ethernet/fujitsu/Kconfig
@@ -17,18 +17,6 @@ config NET_VENDOR_FUJITSU
if NET_VENDOR_FUJITSU
-config AT1700
- tristate "AT1700/1720 support (EXPERIMENTAL)"
- depends on ISA && EXPERIMENTAL
- select CRC32
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called at1700.
-
config PCMCIA_FMVJ18X
tristate "Fujitsu FMV-J18x PCMCIA support"
depends on PCMCIA
diff --git a/drivers/net/ethernet/fujitsu/Makefile b/drivers/net/ethernet/fujitsu/Makefile
index 2730ae6..e54d0af 100644
--- a/drivers/net/ethernet/fujitsu/Makefile
+++ b/drivers/net/ethernet/fujitsu/Makefile
@@ -2,6 +2,5 @@
# Makefile for the Fujitsu network device drivers.
#
-obj-$(CONFIG_AT1700) += at1700.o
obj-$(CONFIG_ETH16I) += eth16i.o
obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o
diff --git a/drivers/net/ethernet/fujitsu/at1700.c b/drivers/net/ethernet/fujitsu/at1700.c
deleted file mode 100644
index 4b80dc4..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 12/15] drivers/net: delete the really obsolete 8390 based 10Mbit ISA drivers
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
This is an area I know all too well, after being author of several 8390
drivers, and maintainer of all 8390 drivers during a large part of their
active lifecycle.
To that end, I can say this with a reasonable degree of confidence.
The drivers deleted here represent the earliest (as in early 1990)
hardware and/or rare hardware. The remaining hardware not deleted
here is the more modern/sane of the lot, with ISA-PnP and jumperless
"soft configuration" like the wd and smc cards had.
The original ne2000 driver (ne.c) gets a pass at this time since
AT/LANTIC based cards that could be both ne2000 or wd-like (with
shared memory) and with jumperless configuration were made in the
mid to late 1990's, and performed reasonably well for their era.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Space.c | 16 -
drivers/net/ethernet/8390/3c503.c | 778 ------------------------------------
drivers/net/ethernet/8390/3c503.h | 91 -----
drivers/net/ethernet/8390/Kconfig | 48 ---
drivers/net/ethernet/8390/Makefile | 4 -
drivers/net/ethernet/8390/e2100.c | 489 ----------------------
drivers/net/ethernet/8390/hp-plus.c | 505 -----------------------
drivers/net/ethernet/8390/hp.c | 438 --------------------
8 files changed, 2369 deletions(-)
delete mode 100644 drivers/net/ethernet/8390/3c503.c
delete mode 100644 drivers/net/ethernet/8390/3c503.h
delete mode 100644 drivers/net/ethernet/8390/e2100.c
delete mode 100644 drivers/net/ethernet/8390/hp-plus.c
delete mode 100644 drivers/net/ethernet/8390/hp.c
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 15de20b..393b017 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -40,14 +40,10 @@
extern struct net_device *hp100_probe(int unit);
extern struct net_device *ultra_probe(int unit);
extern struct net_device *wd_probe(int unit);
-extern struct net_device *el2_probe(int unit);
extern struct net_device *ne_probe(int unit);
-extern struct net_device *hp_probe(int unit);
-extern struct net_device *hp_plus_probe(int unit);
extern struct net_device *fmv18x_probe(int unit);
extern struct net_device *i82596_probe(int unit);
extern struct net_device *ewrk3_probe(int unit);
-extern struct net_device *e2100_probe(int unit);
extern struct net_device *ni65_probe(int unit);
extern struct net_device *sonic_probe(int unit);
extern struct net_device *seeq8005_probe(int unit);
@@ -108,18 +104,6 @@ static struct devprobe2 isa_probes[] __initdata = {
#ifdef CONFIG_WD80x3
{wd_probe, 0},
#endif
-#ifdef CONFIG_EL2 /* 3c503 */
- {el2_probe, 0},
-#endif
-#ifdef CONFIG_HPLAN
- {hp_probe, 0},
-#endif
-#ifdef CONFIG_HPLAN_PLUS
- {hp_plus_probe, 0},
-#endif
-#ifdef CONFIG_E2100 /* Cabletron E21xx series. */
- {e2100_probe, 0},
-#endif
#if defined(CONFIG_NE2000) || \
defined(CONFIG_NE_H8300) /* ISA (use ne2k-pci for PCI cards) */
{ne_probe, 0},
diff --git a/drivers/net/ethernet/8390/3c503.c b/drivers/net/ethernet/8390/3c503.c
deleted file mode 100644
index 0e9afe7..0000000
diff --git a/drivers/net/ethernet/8390/3c503.h b/drivers/net/ethernet/8390/3c503.h
deleted file mode 100644
index e2367b8..0000000
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index e49a442..1b78ca7 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -21,18 +21,6 @@ config NET_VENDOR_8390
if NET_VENDOR_8390
-config EL2
- tristate "3c503 \"EtherLink II\" support"
- depends on ISA
- select CRC32
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called 3c503.
-
config PCMCIA_AXNET
tristate "Asix AX88190 PCMCIA support"
depends on PCMCIA
@@ -62,42 +50,6 @@ config AX88796_93CX6
---help---
Select this if your platform comes with an external 93CX6 eeprom.
-config E2100
- tristate "Cabletron E21xx support"
- depends on ISA
- select CRC32
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called e2100.
-
-config HPLAN_PLUS
- tristate "HP PCLAN+ (27247B and 27252A) support"
- depends on ISA
- select CRC32
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called hp-plus.
-
-config HPLAN
- tristate "HP PCLAN (27245 and other 27xxx series) support"
- depends on ISA
- select CRC32
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called hp.
-
config HYDRA
tristate "Hydra support"
depends on ZORRO
diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile
index e8bb97c..588954a 100644
--- a/drivers/net/ethernet/8390/Makefile
+++ b/drivers/net/ethernet/8390/Makefile
@@ -6,10 +6,6 @@ obj-$(CONFIG_MAC8390) += mac8390.o
obj-$(CONFIG_APNE) += apne.o 8390.o
obj-$(CONFIG_ARM_ETHERH) += etherh.o
obj-$(CONFIG_AX88796) += ax88796.o
-obj-$(CONFIG_E2100) += e2100.o 8390.o
-obj-$(CONFIG_EL2) += 3c503.o 8390p.o
-obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
-obj-$(CONFIG_HPLAN) += hp.o 8390p.o
obj-$(CONFIG_HYDRA) += hydra.o 8390.o
obj-$(CONFIG_MCF8390) += mcf8390.o 8390.o
obj-$(CONFIG_NE2000) += ne.o 8390p.o
diff --git a/drivers/net/ethernet/8390/e2100.c b/drivers/net/ethernet/8390/e2100.c
deleted file mode 100644
index ed55ce8..0000000
diff --git a/drivers/net/ethernet/8390/hp-plus.c b/drivers/net/ethernet/8390/hp-plus.c
deleted file mode 100644
index 52f70f9..0000000
diff --git a/drivers/net/ethernet/8390/hp.c b/drivers/net/ethernet/8390/hp.c
deleted file mode 100644
index 37fa89a..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 15/15] drivers/net: delete old x86 variant of the seeq8005 driver
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
The last update to the Ethernet HowTo (over 10 years ago) listed this:
------------------------
SEEQ 8005
Status: Obsolete, Driver Name: seeq8005
There is little information about the card included in the driver,
and hence little information to be put here. If you have a question,
you are probably best trying to e-mail the driver author as listed
in the source.
It was marked obsolete as of the 2.4 series kernels.
------------------------
If it was obsolete over a decade ago, the situation can not have
improved with the passage of time, so let us act on that. Even with
today's improved search engines, I was unable to locate any real
meaningful information on the ISA implementation of this rare chip.
There are ARM and SGI variants of the driver in tree, but they do
not depend on the original x86 driver source or header file. We
leave those non-x86 drivers to be deleted by the arch maintainers
when they decide to expire those legacy platforms as a whole.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/net/Space.c | 4 -
drivers/net/ethernet/seeq/Kconfig | 11 -
drivers/net/ethernet/seeq/Makefile | 1 -
drivers/net/ethernet/seeq/seeq8005.c | 749 -----------------------------------
drivers/net/ethernet/seeq/seeq8005.h | 156 --------
5 files changed, 921 deletions(-)
delete mode 100644 drivers/net/ethernet/seeq/seeq8005.c
delete mode 100644 drivers/net/ethernet/seeq/seeq8005.h
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 9c30ea4..3a8c753 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -45,7 +45,6 @@ extern struct net_device *fmv18x_probe(int unit);
extern struct net_device *i82596_probe(int unit);
extern struct net_device *ni65_probe(int unit);
extern struct net_device *sonic_probe(int unit);
-extern struct net_device *seeq8005_probe(int unit);
extern struct net_device *smc_init(int unit);
extern struct net_device *atarilance_probe(int unit);
extern struct net_device *sun3lance_probe(int unit);
@@ -113,9 +112,6 @@ static struct devprobe2 isa_probes[] __initdata = {
#ifdef CONFIG_SMC9194
{smc_init, 0},
#endif
-#ifdef CONFIG_SEEQ8005
- {seeq8005_probe, 0},
-#endif
#ifdef CONFIG_CS89x0
#ifndef CONFIG_CS89x0_PLATFORM
{cs89x0_probe, 0},
diff --git a/drivers/net/ethernet/seeq/Kconfig b/drivers/net/ethernet/seeq/Kconfig
index 29f1853..a71e1ec 100644
--- a/drivers/net/ethernet/seeq/Kconfig
+++ b/drivers/net/ethernet/seeq/Kconfig
@@ -26,17 +26,6 @@ config ARM_ETHER3
If you have an Acorn system with one of these network cards, you
should say Y to this option if you wish to use it with Linux.
-config SEEQ8005
- tristate "SEEQ8005 support (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- ---help---
- This is a driver for the SEEQ 8005 network (Ethernet) card. If this
- is for you, read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called seeq8005.
-
config SGISEEQ
tristate "SGI Seeq ethernet controller support"
depends on SGI_HAS_SEEQ
diff --git a/drivers/net/ethernet/seeq/Makefile b/drivers/net/ethernet/seeq/Makefile
index 3e258a5..0488e99 100644
--- a/drivers/net/ethernet/seeq/Makefile
+++ b/drivers/net/ethernet/seeq/Makefile
@@ -3,5 +3,4 @@
#
obj-$(CONFIG_ARM_ETHER3) += ether3.o
-obj-$(CONFIG_SEEQ8005) += seeq8005.o
obj-$(CONFIG_SGISEEQ) += sgiseeq.o
diff --git a/drivers/net/ethernet/seeq/seeq8005.c b/drivers/net/ethernet/seeq/seeq8005.c
deleted file mode 100644
index d6e50de..0000000
diff --git a/drivers/net/ethernet/seeq/seeq8005.h b/drivers/net/ethernet/seeq/seeq8005.h
deleted file mode 100644
index 5dfb009..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 14/15] drivers/net: delete Digital EtherWorks-3 support.
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
This is another one that makes sense to target for obsolescence, since
it (a)appeared pre-1995, and (b)was rather rare, and (c)did not
really have any statistically significant active linux user base.
Removing this ISA 10Mbit driver support is unlikely to be even noticed
by the user base of 3.9+ linux kernels, especially when the documentation
clearly indicates the vintage with this text:
"...designed to work with all kernels > 1.1.33"
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
Documentation/networking/00-INDEX | 2 -
Documentation/networking/ewrk3.txt | 46 -
drivers/net/Space.c | 4 -
drivers/net/ethernet/dec/Kconfig | 16 -
drivers/net/ethernet/dec/Makefile | 1 -
drivers/net/ethernet/dec/ewrk3.c | 1961 ------------------------------------
drivers/net/ethernet/dec/ewrk3.h | 322 ------
7 files changed, 2352 deletions(-)
delete mode 100644 Documentation/networking/ewrk3.txt
delete mode 100644 drivers/net/ethernet/dec/ewrk3.c
delete mode 100644 drivers/net/ethernet/dec/ewrk3.h
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index 6ec1d6f..258d9b9 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -70,8 +70,6 @@ e1000e.txt
- README for the Intel Gigabit Ethernet Driver (e1000e).
eql.txt
- serial IP load balancing
-ewrk3.txt
- - the Digital EtherWORKS 3 DE203/4/5 Ethernet driver
fib_trie.txt
- Level Compressed Trie (LC-trie) notes: a structure for routing.
filter.txt
diff --git a/Documentation/networking/ewrk3.txt b/Documentation/networking/ewrk3.txt
deleted file mode 100644
index 90e9e5f..0000000
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 393b017..9c30ea4 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -43,7 +43,6 @@ extern struct net_device *wd_probe(int unit);
extern struct net_device *ne_probe(int unit);
extern struct net_device *fmv18x_probe(int unit);
extern struct net_device *i82596_probe(int unit);
-extern struct net_device *ewrk3_probe(int unit);
extern struct net_device *ni65_probe(int unit);
extern struct net_device *sonic_probe(int unit);
extern struct net_device *seeq8005_probe(int unit);
@@ -122,9 +121,6 @@ static struct devprobe2 isa_probes[] __initdata = {
{cs89x0_probe, 0},
#endif
#endif
-#ifdef CONFIG_EWRK3 /* DEC EtherWORKS 3 */
- {ewrk3_probe, 0},
-#endif
#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET) /* Intel I82596 */
{i82596_probe, 0},
#endif
diff --git a/drivers/net/ethernet/dec/Kconfig b/drivers/net/ethernet/dec/Kconfig
index 3794027..68262aa 100644
--- a/drivers/net/ethernet/dec/Kconfig
+++ b/drivers/net/ethernet/dec/Kconfig
@@ -17,21 +17,5 @@ config NET_VENDOR_DEC
your specific card in the following questions.
if NET_VENDOR_DEC
-
-config EWRK3
- tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
- depends on ISA
- select CRC32
- ---help---
- This driver supports the DE203, DE204 and DE205 network (Ethernet)
- cards. If this is for you, say Y and read
- <file:Documentation/networking/ewrk3.txt> in the kernel source as
- well as the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called ewrk3.
-
source "drivers/net/ethernet/dec/tulip/Kconfig"
-
endif # NET_VENDOR_DEC
diff --git a/drivers/net/ethernet/dec/Makefile b/drivers/net/ethernet/dec/Makefile
index 1b01ed8..32993fc 100644
--- a/drivers/net/ethernet/dec/Makefile
+++ b/drivers/net/ethernet/dec/Makefile
@@ -2,5 +2,4 @@
# Makefile for the Digital Equipment Inc. network device drivers.
#
-obj-$(CONFIG_EWRK3) += ewrk3.o
obj-$(CONFIG_NET_TULIP) += tulip/
diff --git a/drivers/net/ethernet/dec/ewrk3.c b/drivers/net/ethernet/dec/ewrk3.c
deleted file mode 100644
index 5015172..0000000
diff --git a/drivers/net/ethernet/dec/ewrk3.h b/drivers/net/ethernet/dec/ewrk3.h
deleted file mode 100644
index 8e0ee90..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 13/15] drivers/net: delete old DEC depca ISA drivers support.
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
These are old ISA 10Mbit cards from the 1st 1/2 of the 1990s and
required manual jumper settings in order to configure them. Here
we remove them on the premise that they are no longer used in any
modern 3.9+ kernels.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
Documentation/networking/00-INDEX | 2 -
Documentation/networking/depca.txt | 92 --
drivers/net/ethernet/amd/Kconfig | 13 -
drivers/net/ethernet/amd/Makefile | 1 -
drivers/net/ethernet/amd/depca.c | 1910 ------------------------------------
drivers/net/ethernet/amd/depca.h | 183 ----
6 files changed, 2201 deletions(-)
delete mode 100644 Documentation/networking/depca.txt
delete mode 100644 drivers/net/ethernet/amd/depca.c
delete mode 100644 drivers/net/ethernet/amd/depca.h
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index 1abfff2..6ec1d6f 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -52,8 +52,6 @@ de4x5.txt
- the Digital EtherWORKS DE4?? and DE5?? PCI Ethernet driver
decnet.txt
- info on using the DECnet networking layer in Linux.
-depca.txt
- - the Digital DEPCA/EtherWORKS DE1?? and DE2?? LANCE Ethernet driver
dl2k.txt
- README for D-Link DL2000-based Gigabit Ethernet Adapters (dl2k.ko).
dm9000.txt
diff --git a/Documentation/networking/depca.txt b/Documentation/networking/depca.txt
deleted file mode 100644
index 24c6b26..0000000
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 3046133..13d74aa 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -105,19 +105,6 @@ config DECLANCE
DEC (now Compaq) based on the AMD LANCE chipset, including the
DEPCA series. (This chipset is better known via the NE2100 cards.)
-config DEPCA
- tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
- depends on (ISA || EISA)
- select CRC32
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto> as well as
- <file:drivers/net/ethernet/amd/depca.c>.
-
- To compile this driver as a module, choose M here. The module
- will be called depca.
-
config HPLANCE
bool "HP on-board LANCE support"
depends on DIO
diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
index 175caa5..cdd4301 100644
--- a/drivers/net/ethernet/amd/Makefile
+++ b/drivers/net/ethernet/amd/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
obj-$(CONFIG_ARIADNE) += ariadne.o
obj-$(CONFIG_ATARILANCE) += atarilance.o
obj-$(CONFIG_DECLANCE) += declance.o
-obj-$(CONFIG_DEPCA) += depca.o
obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
obj-$(CONFIG_LANCE) += lance.o
obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
diff --git a/drivers/net/ethernet/amd/depca.c b/drivers/net/ethernet/amd/depca.c
deleted file mode 100644
index 34a4853..0000000
diff --git a/drivers/net/ethernet/amd/depca.h b/drivers/net/ethernet/amd/depca.h
deleted file mode 100644
index cdcfe42..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 09/15] drivers/net: delete old 8 bit ISA Racal ni5010 support.
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker, Andreas Mohr, Jan-Pascal van Best
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
These cards were only available in 8bit format, and in addition
they only had AUI and BNC(10-Base2) interfaces (i.e. no RJ-45).
In fact, they are so rare, that an internet search on these old
cards almost comes up empty, unless the "Micom interlan" name
is used.
This puts them in the equivalent domain as the 3c501, so there
should be no strong opposition to the driver removal, as nobody
is seriously using 3.9+ with 8 bit ISA hardware.
In doing so, the whole "ethernet/racal" category becomes empty,
so we clean up the Makefile/Kconfig and subdir appropriately.
Cc: Andreas Mohr <andi@lisas.de>
Cc: Jan-Pascal van Best <janpascal@vanbest.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
MAINTAINERS | 7 -
drivers/net/Space.c | 4 -
drivers/net/ethernet/Kconfig | 1 -
drivers/net/ethernet/Makefile | 1 -
drivers/net/ethernet/racal/Kconfig | 33 --
drivers/net/ethernet/racal/Makefile | 5 -
drivers/net/ethernet/racal/ni5010.c | 771 ------------------------------------
drivers/net/ethernet/racal/ni5010.h | 144 -------
8 files changed, 966 deletions(-)
delete mode 100644 drivers/net/ethernet/racal/Kconfig
delete mode 100644 drivers/net/ethernet/racal/Makefile
delete mode 100644 drivers/net/ethernet/racal/ni5010.c
delete mode 100644 drivers/net/ethernet/racal/ni5010.h
diff --git a/MAINTAINERS b/MAINTAINERS
index cd5b31f..88866e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5370,13 +5370,6 @@ F: include/linux/sunrpc/
F: include/uapi/linux/nfs*
F: include/uapi/linux/sunrpc/
-NI5010 NETWORK DRIVER
-M: Jan-Pascal van Best <janpascal@vanbest.org>
-M: Andreas Mohr <andi@lisas.de>
-L: netdev@vger.kernel.org
-S: Maintained
-F: drivers/net/ethernet/racal/ni5010.*
-
NILFS2 FILESYSTEM
M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
L: linux-nilfs@vger.kernel.org
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index b69dac1..4141c64 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -50,7 +50,6 @@ extern struct net_device *eth16i_probe(int unit);
extern struct net_device *i82596_probe(int unit);
extern struct net_device *ewrk3_probe(int unit);
extern struct net_device *e2100_probe(int unit);
-extern struct net_device *ni5010_probe(int unit);
extern struct net_device *ni65_probe(int unit);
extern struct net_device *sonic_probe(int unit);
extern struct net_device *seeq8005_probe(int unit);
@@ -153,9 +152,6 @@ static struct devprobe2 isa_probes[] __initdata = {
#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET) /* Intel I82596 */
{i82596_probe, 0},
#endif
-#ifdef CONFIG_NI5010
- {ni5010_probe, 0},
-#endif
#ifdef CONFIG_NI65
{ni65_probe, 0},
#endif
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index e4ff389..ed956e0 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -135,7 +135,6 @@ config ETHOC
source "drivers/net/ethernet/packetengines/Kconfig"
source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
-source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/realtek/Kconfig"
source "drivers/net/ethernet/renesas/Kconfig"
source "drivers/net/ethernet/rdc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index d447307..8268d85 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -53,7 +53,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
-obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_SH_ETH) += renesas/
obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
diff --git a/drivers/net/ethernet/racal/Kconfig b/drivers/net/ethernet/racal/Kconfig
deleted file mode 100644
index 01969e0..0000000
diff --git a/drivers/net/ethernet/racal/Makefile b/drivers/net/ethernet/racal/Makefile
deleted file mode 100644
index 1e210ca..0000000
diff --git a/drivers/net/ethernet/racal/ni5010.c b/drivers/net/ethernet/racal/ni5010.c
deleted file mode 100644
index 8079822..0000000
diff --git a/drivers/net/ethernet/racal/ni5010.h b/drivers/net/ethernet/racal/ni5010.h
deleted file mode 100644
index e10e717..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH net-next 11/15] drivers/net: delete old fujitsu based eth16i driver
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Gortmaker, Mika Kuoppala
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
This is another driver for relatively rare 10Mbit hardware that
originated in the early 1990's. So we select it for removal at
this point in time as well.
Cc: Mika Kuoppala <miku@iki.fi>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
MAINTAINERS | 5 -
drivers/net/Space.c | 4 -
drivers/net/ethernet/fujitsu/Kconfig | 11 -
drivers/net/ethernet/fujitsu/Makefile | 1 -
drivers/net/ethernet/fujitsu/eth16i.c | 1483 ---------------------------------
5 files changed, 1504 deletions(-)
delete mode 100644 drivers/net/ethernet/fujitsu/eth16i.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 88866e6..a7aadea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2974,11 +2974,6 @@ S: Maintained
F: include/linux/netfilter_bridge/
F: net/bridge/
-ETHERTEAM 16I DRIVER
-M: Mika Kuoppala <miku@iki.fi>
-S: Maintained
-F: drivers/net/ethernet/fujitsu/eth16i.c
-
EXT2 FILE SYSTEM
M: Jan Kara <jack@suse.cz>
L: linux-ext4@vger.kernel.org
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index e7d916d5..15de20b 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -45,7 +45,6 @@ extern struct net_device *ne_probe(int unit);
extern struct net_device *hp_probe(int unit);
extern struct net_device *hp_plus_probe(int unit);
extern struct net_device *fmv18x_probe(int unit);
-extern struct net_device *eth16i_probe(int unit);
extern struct net_device *i82596_probe(int unit);
extern struct net_device *ewrk3_probe(int unit);
extern struct net_device *e2100_probe(int unit);
@@ -139,9 +138,6 @@ static struct devprobe2 isa_probes[] __initdata = {
{cs89x0_probe, 0},
#endif
#endif
-#ifdef CONFIG_ETH16I
- {eth16i_probe, 0}, /* ICL EtherTeam 16i/32 */
-#endif
#ifdef CONFIG_EWRK3 /* DEC EtherWORKS 3 */
{ewrk3_probe, 0},
#endif
diff --git a/drivers/net/ethernet/fujitsu/Kconfig b/drivers/net/ethernet/fujitsu/Kconfig
index af114fd..c6a8762 100644
--- a/drivers/net/ethernet/fujitsu/Kconfig
+++ b/drivers/net/ethernet/fujitsu/Kconfig
@@ -28,15 +28,4 @@ config PCMCIA_FMVJ18X
To compile this driver as a module, choose M here: the module will be
called fmvj18x_cs. If unsure, say N.
-config ETH16I
- tristate "ICL EtherTeam 16i/32 support"
- depends on ISA
- ---help---
- If you have a network (Ethernet) card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module
- will be called eth16i.
-
endif # NET_VENDOR_FUJITSU
diff --git a/drivers/net/ethernet/fujitsu/Makefile b/drivers/net/ethernet/fujitsu/Makefile
index e54d0af..21561fd 100644
--- a/drivers/net/ethernet/fujitsu/Makefile
+++ b/drivers/net/ethernet/fujitsu/Makefile
@@ -2,5 +2,4 @@
# Makefile for the Fujitsu network device drivers.
#
-obj-$(CONFIG_ETH16I) += eth16i.o
obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o
diff --git a/drivers/net/ethernet/fujitsu/eth16i.c b/drivers/net/ethernet/fujitsu/eth16i.c
deleted file mode 100644
index a992d1f..0000000
--
1.8.1
^ permalink raw reply related
* [PATCH RFC net-next 00/15] drivers/net: obsolete ISA driver round-up
From: Paul Gortmaker @ 2013-01-22 1:46 UTC (permalink / raw)
To: David Miller
Cc: netdev, Paul Gortmaker, Donald Becker, Jeff Kirsher, Alan Cox,
Andreas Mohr, Jan-Pascal van Best, Mika Kuoppala
The Ethernet-HowTo was maintained for roughly 10 years, from 1993 to 2003.
Fortunately sane hardware probing and auto detection (via PCI and ISA/PnP)
largely made the document a relic of the past, hence it being abandoned
a decade ago.
However, there is one last useful thing that we can extract from the
effort made in maintaining that document. We can use it to guide us
with respect to what rare, experimental and/or super ancient 10Mbit
ISA drivers don't make sense to maintain in-tree anymore.
Nobody will argue that ISA is obsolete. Availability went away at about
the time Pentium3 motherboards moved from 500MHz Slot1/SECC processors
to the green 500MHz Socket 370 Pentium3 chips, at the turn of the century.
In theory, it is possible that someone could still be running one of these
12+ year old P3 machines and want 3.9+ bleeding edge kernels (but unlikely).
In light of the above (remote) possibility, we can defer the removal of some
ISA network drivers that were highly popular and well tested. Typically
that means the stuff more from the mid to late '90s, some with ISA PnP
support, like the 3c509, the wd/SMC 8390 based stuff, PCnet/lance etc.
But a lot of other drivers, typically from the early 1990s were for rare
hardware, and experimental (to the point of requiring a cron job that would
do a test ping, and then ifconfig down/up and/or a rmmod/insmod!). And
some of these drivers (znet, and lp486e to name two) are physically tied
to platforms with on motherboard ethernet -- of 486 machines that date
from the early 1990s and can only have single digit amounts of memory.
What I'd like to achieve here with this series, is to get rid of those old
drivers that are no longer being used. In an earlier discussion where
I'd proposed deleting a single driver, Alan suggested we instead dump
all the historical stuff in one go, to make it "...immediately obvious
where the break point is..."[1] and that it was "perfectly reasonable it
(and a pile of other ISA cards) ought to be shown the door"[2]. So that
is the goal here - make a clear line in the sand where the really ancient
stuff finally gets kicked to the curb.
Two old parallel port drivers are considered for removal here as well,
since in early 386/486 ISA machines, the parallel port was typically found
with the UARTS on the multi-I/O ISA controller card. These drivers also date
from the early 1990's; parallel ports are no longer found on modern boards,
and their performance was not even capable of 10% of 10Mbit bandwidth.
Allow me a preemptive justification against the inevitable comments from
well meaning bystanders who suggest "why not just leave all this alone?".
Dead drivers cost us all if they are left in tree. If you think that
is false, then please first consider:
-every time you type "git status", you are checking to see if modifications
have been made by you to all that dead code.
-every time you type "git grep <regex>" you are searching through files
which contain that dead code that simply does not interest you.
-every time you build a "allyesconfig" and an "allmodconfig" (don't tell
me you skip this step before submitting your changes to a maintainer),
you waste CPU cycles building this dead code.
-every time there is a tree wide API change, or cleanup, or file relocation,
we pay the cost of updating dead code, or moving dead code.
-daily regression tests (take linux-next as the most transparent
example) spend time building (and possibly running) this dead code.
-hard working people who regularly run auditing tools looking for lurking
bugs (sparse/coverity/smatch/coccinelle) are wasting time checking for,
and fixing bugs in this dead code.
This last one is key. Please take a look at the git history for the
files that are proposed for removal here. Look at the git history for
any one of them ("git whatchanged --follow drivers/net/.../driver.c")
Mentally sort the changes into two bins -- (1) the robotic tree-wide
changes, and (2) the "look I found a real run-time bug while using this"
category. You will see that category #2 is essentially empty.
Further to that, realize that drivers don't simply disappear. We are
not operating in the binary-only distribution space like other OS. All
these drivers remain in the git history forever. If a person is an
enthusiast for extreme legacy hardware, they are probably already
customizing their kernel source and building it themselves to support
such systems. Also keep in mind that they could still build the 3.8
kernel exactly as-is, and run it (or a 3.8.x stable variant of it) for
several more years if they were really determined to cling to these old
experimental ISA drivers for some reason.
In summary, I hope that folks can be pragmatic about this, and not
get swept up in nostalgia. Ask yourself whether it is realistic to
expect a person would have a genuine use case where they would
need to build a 3.9+ modern kernel and install it on some legacy hardware
that has no option but to absolutely _require_ one of the drivers
that are deleted here.
The following series was created with --irreversible-delete for
ease of review (it skips showing the content of files that are
deleted); however the complete patches can be pulled as per below.
Thanks,
Paul.
[1] http://www.spinics.net/lists/netdev/msg199142.html
[2] http://lists.openwall.net/netdev/2012/05/19/41
Cc: Donald Becker <becker@scyld.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Andreas Mohr <andi@lisas.de>
Cc: Jan-Pascal van Best <janpascal@vanbest.org>
Cc: Mika Kuoppala <miku@iki.fi>
---
The following changes since commit 63b203b43baeb1ba5fab0b7f3611e0f0a2a4a7ab:
isdn/gigaset: beautify ev-layer.c (2013-01-21 17:36:26 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git legacy-isa-delete
for you to fetch changes up to 6e5a2c3cc742fb3b9fb2cb3f0454918a5d5463f6:
drivers/net: delete old x86 variant of the seeq8005 driver (2013-01-21 20:02:23 -0500)
----------------------------------------------------------------
Paul Gortmaker (15):
drivers/net: delete 486 Apricot support
drivers/net: delete intel 486 panther onboard ethernet support
drivers/net: delete old 8bit ISA 3c501 driver.
drivers/net: delete old parallel port de600/de620 drivers
drivers/net: delete the 3Com 3c505/3c507 intel i825xx support
drivers/net: delete ISA intel eexpress and eepro i825xx drivers
drivers/net: delete intel i825xx based znet notebook driver
drivers/net: delete Racal Interlan ISA ni52 (i825xx) driver
drivers/net: delete old 8 bit ISA Racal ni5010 support.
drivers/net: delete at1700 ISA 10Mbit driver
drivers/net: delete old fujitsu based eth16i driver
drivers/net: delete the really obsolete 8390 based 10Mbit ISA drivers
drivers/net: delete old DEC depca ISA drivers support.
drivers/net: delete Digital EtherWorks-3 support.
drivers/net: delete old x86 variant of the seeq8005 driver
Documentation/networking/00-INDEX | 4 -
Documentation/networking/DLINK.txt | 203 ----
Documentation/networking/depca.txt | 92 --
Documentation/networking/ewrk3.txt | 46 -
MAINTAINERS | 12 -
drivers/net/Space.c | 75 +-
drivers/net/ethernet/3com/3c501.c | 897 ---------------
drivers/net/ethernet/3com/3c501.h | 91 --
drivers/net/ethernet/3com/Kconfig | 14 -
drivers/net/ethernet/3com/Makefile | 1 -
drivers/net/ethernet/8390/3c503.c | 778 -------------
drivers/net/ethernet/8390/3c503.h | 91 --
drivers/net/ethernet/8390/Kconfig | 48 -
drivers/net/ethernet/8390/Makefile | 4 -
drivers/net/ethernet/8390/e2100.c | 489 --------
drivers/net/ethernet/8390/hp-plus.c | 505 --------
drivers/net/ethernet/8390/hp.c | 438 -------
drivers/net/ethernet/Kconfig | 1 -
drivers/net/ethernet/Makefile | 1 -
drivers/net/ethernet/amd/Kconfig | 13 -
drivers/net/ethernet/amd/Makefile | 1 -
drivers/net/ethernet/amd/depca.c | 1910 -------------------------------
drivers/net/ethernet/amd/depca.h | 183 ---
drivers/net/ethernet/dec/Kconfig | 16 -
drivers/net/ethernet/dec/Makefile | 1 -
drivers/net/ethernet/dec/ewrk3.c | 1961 --------------------------------
drivers/net/ethernet/dec/ewrk3.h | 322 ------
drivers/net/ethernet/dlink/Kconfig | 32 +-
drivers/net/ethernet/dlink/Makefile | 2 -
drivers/net/ethernet/dlink/de600.c | 529 ---------
drivers/net/ethernet/dlink/de600.h | 168 ---
drivers/net/ethernet/dlink/de620.c | 987 ----------------
drivers/net/ethernet/dlink/de620.h | 117 --
drivers/net/ethernet/fujitsu/Kconfig | 23 -
drivers/net/ethernet/fujitsu/Makefile | 2 -
drivers/net/ethernet/fujitsu/at1700.c | 791 -------------
drivers/net/ethernet/fujitsu/eth16i.c | 1483 ------------------------
drivers/net/ethernet/i825xx/3c505.c | 1672 ---------------------------
drivers/net/ethernet/i825xx/3c505.h | 292 -----
drivers/net/ethernet/i825xx/3c507.c | 939 ---------------
drivers/net/ethernet/i825xx/82596.c | 96 +-
drivers/net/ethernet/i825xx/Kconfig | 90 --
drivers/net/ethernet/i825xx/Makefile | 8 -
drivers/net/ethernet/i825xx/eepro.c | 1822 -----------------------------
drivers/net/ethernet/i825xx/eexpress.c | 1661 ---------------------------
drivers/net/ethernet/i825xx/eexpress.h | 179 ---
drivers/net/ethernet/i825xx/lp486e.c | 1337 ----------------------
drivers/net/ethernet/i825xx/ni52.c | 1346 ----------------------
drivers/net/ethernet/i825xx/ni52.h | 310 -----
drivers/net/ethernet/i825xx/znet.c | 928 ---------------
drivers/net/ethernet/racal/Kconfig | 33 -
drivers/net/ethernet/racal/Makefile | 5 -
drivers/net/ethernet/racal/ni5010.c | 771 -------------
drivers/net/ethernet/racal/ni5010.h | 144 ---
drivers/net/ethernet/seeq/Kconfig | 11 -
drivers/net/ethernet/seeq/Makefile | 1 -
drivers/net/ethernet/seeq/seeq8005.c | 749 ------------
drivers/net/ethernet/seeq/seeq8005.h | 156 ---
58 files changed, 11 insertions(+), 24870 deletions(-)
delete mode 100644 Documentation/networking/DLINK.txt
delete mode 100644 Documentation/networking/depca.txt
delete mode 100644 Documentation/networking/ewrk3.txt
delete mode 100644 drivers/net/ethernet/3com/3c501.c
delete mode 100644 drivers/net/ethernet/3com/3c501.h
delete mode 100644 drivers/net/ethernet/8390/3c503.c
delete mode 100644 drivers/net/ethernet/8390/3c503.h
delete mode 100644 drivers/net/ethernet/8390/e2100.c
delete mode 100644 drivers/net/ethernet/8390/hp-plus.c
delete mode 100644 drivers/net/ethernet/8390/hp.c
delete mode 100644 drivers/net/ethernet/amd/depca.c
delete mode 100644 drivers/net/ethernet/amd/depca.h
delete mode 100644 drivers/net/ethernet/dec/ewrk3.c
delete mode 100644 drivers/net/ethernet/dec/ewrk3.h
delete mode 100644 drivers/net/ethernet/dlink/de600.c
delete mode 100644 drivers/net/ethernet/dlink/de600.h
delete mode 100644 drivers/net/ethernet/dlink/de620.c
delete mode 100644 drivers/net/ethernet/dlink/de620.h
delete mode 100644 drivers/net/ethernet/fujitsu/at1700.c
delete mode 100644 drivers/net/ethernet/fujitsu/eth16i.c
delete mode 100644 drivers/net/ethernet/i825xx/3c505.c
delete mode 100644 drivers/net/ethernet/i825xx/3c505.h
delete mode 100644 drivers/net/ethernet/i825xx/3c507.c
delete mode 100644 drivers/net/ethernet/i825xx/eepro.c
delete mode 100644 drivers/net/ethernet/i825xx/eexpress.c
delete mode 100644 drivers/net/ethernet/i825xx/eexpress.h
delete mode 100644 drivers/net/ethernet/i825xx/lp486e.c
delete mode 100644 drivers/net/ethernet/i825xx/ni52.c
delete mode 100644 drivers/net/ethernet/i825xx/ni52.h
delete mode 100644 drivers/net/ethernet/i825xx/znet.c
delete mode 100644 drivers/net/ethernet/racal/Kconfig
delete mode 100644 drivers/net/ethernet/racal/Makefile
delete mode 100644 drivers/net/ethernet/racal/ni5010.c
delete mode 100644 drivers/net/ethernet/racal/ni5010.h
delete mode 100644 drivers/net/ethernet/seeq/seeq8005.c
delete mode 100644 drivers/net/ethernet/seeq/seeq8005.h
^ permalink raw reply
* Unix Socket buffer attribution
From: Yannick Koehler @ 2013-01-22 2:01 UTC (permalink / raw)
To: netdev
Hi, I got pointed to this list, I have this question about the unix
socket domain buffer attribution system (sorry about the language,
trying to do my best).
I believe I have found a problem on how memory is associated with a
given socket when using Unix Socket Domains in datagram mode, the
problem is possibly also present in other mode but I have not checked.
I am not that familiar with kernel debugging, and got to this level
after attempting to understand a user-space application situation.
I have a server socket, using a unix domain socket. Many clients
connect to this server. If one of the client stop calling recvfrom()
on the socket, all others clients stops receiving anymore events.
This is pretty much a observer/subscriver model, where clients do not
need to send stuff in order to receive.
At the technical level, when my server try to send data to any of my
clients, I get errno EAGAIN (11) on a sendto. I would have expected
that in such situation, I would get the EAGAIN when calling sendto()
with the address of the particular client which stop calling
recvfrom(), but I actually am getting EAGAIN on all clients, even
those which properly behave and empty their receive buffer using
recvfrom().
I believe I tracked down in the kernel why this is occurring. When
sending, the af_unix.c uses sock_alloc_send_skb() and passes as the
first parameter the sk variable that hold my server socket. This
increase the sk_wmem_alloc variable associated with the server socket.
Then the code retrieve the socket associated with my destination and
place it under the variable "other".
It then validate that this "other" socket structure receive queue
isn't full, and then add the newly created skb to that queue. But,
the memory cost is still accounted for under the server sk_rmem_alloc,
and will only get cleared when the skb gets free using kfree_skb()
which will invoke sock_wfree() and decrease the count.
Since one of the client isn't calling recvfrom(), the kfree_skb will
never get invoked and therefore the count will only increase. When
the count exceed or reach the sk_sendrcv_size then the
sock_alloc_send_skb() function always return EAGAIN, independently of
which destination I am trying to reach.
I believe that the problem is that once we move the skb into the
client's receive queue we need to decrease the sk_wmem_alloc variable
of the server socket since that skb is no more tied to the server.
The code should then account for this memory as part of the
sk_rmem_alloc variable on the client's socket. The function
"skb_set_owner_r(skb,owner)" would seem to be the function to do that,
so it would seem to me.
--
Yannick Koehler
^ permalink raw reply
* Re: Rate Limitation of Router Reachability Probing for possible dead routers (is Re: ipv6: Do not depend on rt->n in rt6_probe().)
From: YOSHIFUJI Hideaki @ 2013-01-22 3:47 UTC (permalink / raw)
To: David Miller; +Cc: netdev, YOSHIFUJI Hideaki
In-Reply-To: <20130121.154425.239941234471254414.davem@davemloft.net>
David Miller wrote:
> From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> Date: Tue, 22 Jan 2013 04:28:36 +0900
>
>> Ok, fix is easy, but in fact, we have broken router reachability
>> probing.
>>
>> Here rt->n was neighbour entry for (unreachable) router.
>> The specification says, we SHOUDLD probe such router, but we
>> should have some rate limit (once per minute, or so).
>>
>> We used "rt->n->updated" for this purpose, but now, if NS failed,
>> we may immediately removes neighbour entry for it. So,
>> we might continue sending NS to dead router every 1 second.
>>
>> Any ideas?
>
> I don't see exactly how looking up the neigh on demand is different
> from using a cached one in this context.
>
> In both cases there should be a neigh entry in nd_tbl, why would
> there not be one?
Well, now, the almost only refcnt holder except table is timer.
because each route does not have reference to neighbour (thus no
refcnt) anymore.
If n->nud_state become NUD_FAILED (or even in NUD_STALE),
the entry does not have any refcnt holders other than table,
and then, neigh_periodic_work() will purge such entries.
> If necessary, you can decide to mark entries in such a way that
> they would have a lower priority for neigh GC purging if that
> is the issue.
It seems that we removed check for gc_thresh1 (number of
minimum entries) in neigh_alloc() during 2.3.x but I cannot
remember the reason (or just I do not know it).
--yoshfuji
^ permalink raw reply
* Re: 3.7.3+: Bad paging request in ip_rcv_finish while running NFS traffic.
From: Eric Dumazet @ 2013-01-22 4:40 UTC (permalink / raw)
To: Ben Greear; +Cc: netdev, linux-nfs@vger.kernel.org
In-Reply-To: <50FDDE35.7070806@candelatech.com>
On Mon, 2013-01-21 at 16:32 -0800, Ben Greear wrote:
> On 01/21/2013 01:07 PM, Ben Greear wrote:
> > I posted about this a few days ago, but this time the patches applied
> > are minimal and there are no out-of-tree kernel modules loaded.
>
> Here's another crash, this time with SLUB memory debugging turned on.
>
> Seems much harder to hit this way...I've only managed this one. I
> believe the RCX register might be interesting...that 6b is probably
> freed memory poisioning. Maybe skb or skb_dest() is already freed?
>
> I have added a 'verify_mem_not_deleted(skb)' before the
> dst_input line in ip_rcv_finish..but so far, it hasn't
> hit the problem...
>
There is no way skb is freed here.
I would say macvlan is at fault here.
It probably lacks a proper (dev->flags & IFF_UP) test.
Please try :
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d3fb97d..c07bdef 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -111,9 +111,15 @@ static int macvlan_broadcast_one(struct sk_buff *skb,
const struct ethhdr *eth, bool local)
{
struct net_device *dev = vlan->dev;
+
if (!skb)
return NET_RX_DROP;
+ if (!(dev->flags & IFF_UP)) {
+ kfree_skb(skb);
+ return NET_RX_DROP;
+ }
+
if (local)
return vlan->forward(dev, skb);
^ permalink raw reply related
* Re: Rate Limitation of Router Reachability Probing for possible dead routers (is Re: ipv6: Do not depend on rt->n in rt6_probe().)
From: David Miller @ 2013-01-22 5:49 UTC (permalink / raw)
To: yoshfuji; +Cc: netdev
In-Reply-To: <50FE0BDE.2080206@linux-ipv6.org>
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Tue, 22 Jan 2013 12:47:42 +0900
> It seems that we removed check for gc_thresh1 (number of
> minimum entries) in neigh_alloc() during 2.3.x but I cannot
> remember the reason (or just I do not know it).
You seem to suggest that neigh_periodic_work() should check gc_thresh1
and I agree with this idea.
Considering how neighbour references work now, what it does currently
doesn't make any sense.
Right now it runs over and over again, unconditionally, and purges
entries even if there are very few of them.
^ permalink raw reply
* Re: 3.7.3+: Bad paging request in ip_rcv_finish while running NFS traffic.
From: Ben Greear @ 2013-01-22 5:57 UTC (permalink / raw)
To: Eric Dumazet; +Cc: netdev, linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
In-Reply-To: <1358829606.3464.3151.camel@edumazet-glaptop>
On 01/21/2013 08:40 PM, Eric Dumazet wrote:
> On Mon, 2013-01-21 at 16:32 -0800, Ben Greear wrote:
>> On 01/21/2013 01:07 PM, Ben Greear wrote:
>>> I posted about this a few days ago, but this time the patches applied
>>> are minimal and there are no out-of-tree kernel modules loaded.
>>
>> Here's another crash, this time with SLUB memory debugging turned on.
>>
>> Seems much harder to hit this way...I've only managed this one. I
>> believe the RCX register might be interesting...that 6b is probably
>> freed memory poisioning. Maybe skb or skb_dest() is already freed?
>>
>> I have added a 'verify_mem_not_deleted(skb)' before the
>> dst_input line in ip_rcv_finish..but so far, it hasn't
>> hit the problem...
>>
>
> There is no way skb is freed here.
>
> I would say macvlan is at fault here.
>
> It probably lacks a proper (dev->flags & IFF_UP) test.
Thanks for the patch. It's running OK so far, but I'll need to
do a bunch more testing tomorrow to make sure I'm not just getting
lucky!
I'll let you know how it goes tomorrow.
Thanks,
Ben
--
Ben Greear <greearb-my8/4N5VtI7c+919tysfdA@public.gmane.org>
Candela Technologies Inc http://www.candelatech.com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [RFC PATCH linux-next] et131x: Promote staging et131x driver to drivers/net
From: Dan Carpenter @ 2013-01-22 6:20 UTC (permalink / raw)
To: Mark Einon; +Cc: Greg KH, devel, sfr, davem, linux-kernel, netdev
In-Reply-To: <CANK3SE2p3C38YrvCxWqvoRRz7=q7oAYyE=b0c7+ppBd3yzVrpw@mail.gmail.com>
On Mon, Jan 21, 2013 at 11:44:55PM +0000, Mark Einon wrote:
> On 19 January 2013 11:03, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> <snip>
> >
> > et131x_get_regs() has endian bugs calling et131x_mii_read().
> >
> </snip>
>
> Hi Dan,
>
> Could you be a bit more descriptive about the issues you think there
> are with these calls?
>
Sorry, that was sloppy on my part. Here's what I meant:
et131x_mii_read(adapter, MII_BMCR, (u16 *)®s_buff[num++]);
That puts the number in the 2 high bits which works for little
endian systems but not for big endian. It should be something like:
u16 tmp;
et131x_mii_read(adapter, MII_BMCR, &tmp);
regs_buff[num++] = tmp;
regards,
dan carpenter
^ permalink raw reply
* Re: [PATCH 20/33] net: Convert to devm_ioremap_resource()
From: Thierry Reding @ 2013-01-22 6:56 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, gregkh, dmitry.torokhov, arnd, w.sang, netdev
In-Reply-To: <20130121.152913.1377695352860141642.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]
On Mon, Jan 21, 2013 at 03:29:13PM -0500, David Miller wrote:
> From: Thierry Reding <thierry.reding@avionic-design.de>
> Date: Mon, 21 Jan 2013 11:09:13 +0100
>
> > Convert all uses of devm_request_and_ioremap() to the newly introduced
> > devm_ioremap_resource() which provides more consistent error handling.
> >
> > devm_ioremap_resource() provides its own error messages so all explicit
> > error messages can be removed from the failure code paths.
> >
> > Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
>
> This won't compile if I apply it.
>
> You really have to be clear when you submit patches like this.
>
> Since you only CC:'d the networking developers for this one
> patch, there is _ZERO_ context for us to work with to understand
> what's going on.
>
> You have to also CC: us on the other relevant changes and your
> "[PATCH 00/33]" posting that explains what is happening.
I planned to do so initially, but that yielded a Cc list of 156 people
and mailing lists, which I thought wasn't going to go down so well
either. In general I like Cc'ing everyone concerned on all patches of
the series, specifically for reasons of context. Some people have been
annoyed when I did so. Still, for small series where only a few dozen
people are concerned that seems to me to be the best way. But 156 email
addresses is a different story.
Either you add to many people or you don't add enough. Where do we draw
the line?
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH v1] net: net_cls: fd passed in SCM_RIGHTS datagram not set correctly
From: Daniel Wagner @ 2013-01-22 7:09 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA
Cc: lizefan-hv44wF8Li93QT0dZR+AlfA, Daniel Wagner, David S. Miller,
Eric W. Biederman, Al Viro, John Fastabend, Neil Horman,
netdev-u79uwXL29TY76Z2rM5mHXA
From: Daniel Wagner <daniel.wagner-98C5kh4wR6ohFhg+JK9F0w@public.gmane.org>
Commit 6a328d8c6f03501657ad580f6f98bf9a42583ff7 changed the update
logic for the socket but it does not update the SCM_RIGHTS update
as well. This patch is based on the net_prio fix commit
48a87cc26c13b68f6cce4e9d769fcb17a6b3e4b8
net: netprio: fd passed in SCM_RIGHTS datagram not set correctly
A socket fd passed in a SCM_RIGHTS datagram was not getting
updated with the new tasks cgrp prioidx. This leaves IO on
the socket tagged with the old tasks priority.
To fix this add a check in the scm recvmsg path to update the
sock cgrp prioidx with the new tasks value.
Let's apply the same fix for net_cls.
Signed-off-by: Daniel Wagner <daniel.wagner-98C5kh4wR6ohFhg+JK9F0w@public.gmane.org>
Reported-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: "Eric W. Biederman" <ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org>
Cc: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
Cc: John Fastabend <john.r.fastabend-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Neil Horman <nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
v1: missing Sob added (d'oh)
net/core/scm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/core/scm.c b/net/core/scm.c
index 57fb1ee..905dcc6 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -35,6 +35,7 @@
#include <net/sock.h>
#include <net/compat.h>
#include <net/scm.h>
+#include <net/cls_cgroup.h>
/*
@@ -302,8 +303,10 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
}
/* Bump the usage count and install the file. */
sock = sock_from_file(fp[i], &err);
- if (sock)
+ if (sock) {
sock_update_netprioidx(sock->sk, current);
+ sock_update_classid(sock->sk, current);
+ }
fd_install(new_fd, get_file(fp[i]));
}
--
1.8.0.rc0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox