* [net-next 02/10] cassini/niu/sun*: Move the Sun drivers
From: Jeff Kirsher @ 2011-08-11 9:51 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Sam Creasey, Adrian Sun,
Benjamin Herrenscmidt
In-Reply-To: <1313056294-28426-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Sun drivers into drivers/net/ethernet/sun/ and make
the necessary Kconfig and Makefile changes.
Oliver Hartkopp <socketcan@hartkopp.net> suggested removing the
sun* prefix on the driver names. This type of change I will
leave up to the driver maintainers.
CC: Sam Creasey <sammy@sammy.net>
CC: Adrian Sun <asun@darksunrising.com>
CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 1 +
drivers/net/Kconfig | 66 --------------------
drivers/net/Makefile | 10 +---
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/sun/Kconfig | 86 +++++++++++++++++++++++++++
drivers/net/ethernet/sun/Makefile | 11 ++++
drivers/net/{ => ethernet/sun}/cassini.c | 0
drivers/net/{ => ethernet/sun}/cassini.h | 0
drivers/net/{ => ethernet/sun}/niu.c | 0
drivers/net/{ => ethernet/sun}/niu.h | 0
drivers/net/{ => ethernet/sun}/sunbmac.c | 0
drivers/net/{ => ethernet/sun}/sunbmac.h | 0
drivers/net/{ => ethernet/sun}/sungem.c | 0
drivers/net/{ => ethernet/sun}/sungem.h | 0
drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
drivers/net/{ => ethernet/sun}/sunhme.c | 0
drivers/net/{ => ethernet/sun}/sunhme.h | 0
drivers/net/{ => ethernet/sun}/sunqe.c | 0
drivers/net/{ => ethernet/sun}/sunqe.h | 0
drivers/net/{ => ethernet/sun}/sunvnet.c | 0
drivers/net/{ => ethernet/sun}/sunvnet.h | 0
drivers/net/spider_net.h | 2 +-
24 files changed, 102 insertions(+), 76 deletions(-)
create mode 100644 drivers/net/ethernet/sun/Kconfig
create mode 100644 drivers/net/ethernet/sun/Makefile
rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
rename drivers/net/{ => ethernet/sun}/niu.c (100%)
rename drivers/net/{ => ethernet/sun}/niu.h (100%)
rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
rename drivers/net/{ => ethernet/sun}/sungem.c (100%)
rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
rename drivers/net/{ => ethernet/sun}/sungem_phy.c (100%)
rename drivers/net/{ => ethernet/sun}/sungem_phy.h (100%)
rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 19bd60d..1cb72da 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6272,6 +6272,7 @@ S: Maintained
F: arch/m68k/kernel/*sun3*
F: arch/m68k/sun3*/
F: arch/m68k/include/asm/sun3*
+F: drivers/net/ethernet/i825xx/sun3*
SUPERH
M: Paul Mundt <lethal@linux-sh.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b76de82..7977002 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -363,64 +363,6 @@ config SH_ETH
This driver supporting CPUs are:
- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
-config HAPPYMEAL
- tristate "Sun Happy Meal 10/100baseT support"
- depends on SBUS || PCI
- select CRC32
- help
- This driver supports the "hme" interface present on most Ultra
- systems and as an option on older Sbus systems. This driver supports
- both PCI and Sbus devices. This driver also supports the "qfe" quad
- 100baseT device available in both PCI and Sbus configurations.
-
- To compile this driver as a module, choose M here: the module
- will be called sunhme.
-
-config SUNBMAC
- tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
- depends on SBUS && EXPERIMENTAL
- select CRC32
- help
- This driver supports the "be" interface available as an Sbus option.
- This is Sun's older 100baseT Ethernet device.
-
- To compile this driver as a module, choose M here: the module
- will be called sunbmac.
-
-config SUNQE
- tristate "Sun QuadEthernet support"
- depends on SBUS
- select CRC32
- help
- This driver supports the "qe" 10baseT Ethernet device, available as
- an Sbus option. Note that this is not the same as Quad FastEthernet
- "qfe" which is supported by the Happy Meal driver instead.
-
- To compile this driver as a module, choose M here: the module
- will be called sunqe.
-
-config SUNGEM
- tristate "Sun GEM support"
- depends on PCI
- select CRC32
- help
- Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
- <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
-
-config CASSINI
- tristate "Sun Cassini support"
- depends on PCI
- select CRC32
- help
- Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
- <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
-
-config SUNVNET
- tristate "Sun Virtual Network support"
- depends on SUN_LDOMS
- help
- Support for virtual network devices under Sun Logical Domains.
-
config BFIN_MAC
tristate "Blackfin on-chip MAC support"
depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
@@ -1603,14 +1545,6 @@ config MYRI10GE_DCA
driver. DCA is a method for warming the CPU cache before data
is used, with the intent of lessening the impact of cache misses.
-config NIU
- tristate "Sun Neptune 10Gbit Ethernet support"
- depends on PCI
- select CRC32
- help
- This enables support for cards based upon Sun's
- Neptune chipset.
-
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e641f70..cfbb060 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -44,13 +44,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_HAPPYMEAL) += sunhme.o
-obj-$(CONFIG_SUNQE) += sunqe.o
-obj-$(CONFIG_SUNBMAC) += sunbmac.o
-obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
-obj-$(CONFIG_CASSINI) += cassini.o
-obj-$(CONFIG_SUNVNET) += sunvnet.o
-
obj-$(CONFIG_MACE) += mace.o
obj-$(CONFIG_BMAC) += bmac.o
@@ -64,7 +57,7 @@ obj-$(CONFIG_NATSEMI) += natsemi.o
obj-$(CONFIG_NS83820) += ns83820.o
obj-$(CONFIG_FEALNX) += fealnx.o
spidernet-y += spider_net.o spider_net_ethtool.o
-obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
@@ -207,7 +200,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_FS_ENET) += fs_enet/
-obj-$(CONFIG_NIU) += niu.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 7efbb7c..5edd237 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -21,5 +21,6 @@ source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
+source "drivers/net/ethernet/sun/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 86da8b8..18d8a89 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
+obj-$(CONFIG_NET_VENDOR_SUN) += sun/
diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
new file mode 100644
index 0000000..87b17a7
--- /dev/null
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -0,0 +1,86 @@
+#
+# Sun network device configuration
+#
+
+config NET_VENDOR_SUN
+ bool "Sun devices"
+ depends on SUN3 || SBUS || PCI || SUN_LDOMS
+ ---help---
+ If you have a network (Ethernet) card belonging to this class, say
+ Y and read the Ethernet-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>.
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about Sun network interfaces. If you say Y, you will be
+ asked for your specific card in the following questions.
+
+if NET_VENDOR_SUN
+
+config HAPPYMEAL
+ tristate "Sun Happy Meal 10/100baseT support"
+ depends on (SBUS || PCI)
+ select CRC32
+ ---help---
+ This driver supports the "hme" interface present on most Ultra
+ systems and as an option on older Sbus systems. This driver supports
+ both PCI and Sbus devices. This driver also supports the "qfe" quad
+ 100baseT device available in both PCI and Sbus configurations.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sunhme.
+
+config SUNBMAC
+ tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
+ depends on SBUS && EXPERIMENTAL
+ select CRC32
+ ---help---
+ This driver supports the "be" interface available as an Sbus option.
+ This is Sun's older 100baseT Ethernet device.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sunbmac.
+
+config SUNQE
+ tristate "Sun QuadEthernet support"
+ depends on SBUS
+ select CRC32
+ ---help---
+ This driver supports the "qe" 10baseT Ethernet device, available as
+ an Sbus option. Note that this is not the same as Quad FastEthernet
+ "qfe" which is supported by the Happy Meal driver instead.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sunqe.
+
+config SUNGEM
+ tristate "Sun GEM support"
+ depends on PCI
+ select CRC32
+ ---help---
+ Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
+ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
+
+config CASSINI
+ tristate "Sun Cassini support"
+ depends on PCI
+ select CRC32
+ ---help---
+ Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
+ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
+
+config SUNVNET
+ tristate "Sun Virtual Network support"
+ depends on SUN_LDOMS
+ ---help---
+ Support for virtual network devices under Sun Logical Domains.
+
+config NIU
+ tristate "Sun Neptune 10Gbit Ethernet support"
+ depends on PCI
+ select CRC32
+ ---help---
+ This enables support for cards based upon Sun's
+ Neptune chipset.
+
+endif # NET_VENDOR_SUN
diff --git a/drivers/net/ethernet/sun/Makefile b/drivers/net/ethernet/sun/Makefile
new file mode 100644
index 0000000..4f25217
--- /dev/null
+++ b/drivers/net/ethernet/sun/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the Sun network device drivers.
+#
+
+obj-$(CONFIG_HAPPYMEAL) += sunhme.o
+obj-$(CONFIG_SUNQE) += sunqe.o
+obj-$(CONFIG_SUNBMAC) += sunbmac.o
+obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
+obj-$(CONFIG_CASSINI) += cassini.o
+obj-$(CONFIG_SUNVNET) += sunvnet.o
+obj-$(CONFIG_NIU) += niu.o
diff --git a/drivers/net/cassini.c b/drivers/net/ethernet/sun/cassini.c
similarity index 100%
rename from drivers/net/cassini.c
rename to drivers/net/ethernet/sun/cassini.c
diff --git a/drivers/net/cassini.h b/drivers/net/ethernet/sun/cassini.h
similarity index 100%
rename from drivers/net/cassini.h
rename to drivers/net/ethernet/sun/cassini.h
diff --git a/drivers/net/niu.c b/drivers/net/ethernet/sun/niu.c
similarity index 100%
rename from drivers/net/niu.c
rename to drivers/net/ethernet/sun/niu.c
diff --git a/drivers/net/niu.h b/drivers/net/ethernet/sun/niu.h
similarity index 100%
rename from drivers/net/niu.h
rename to drivers/net/ethernet/sun/niu.h
diff --git a/drivers/net/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
similarity index 100%
rename from drivers/net/sunbmac.c
rename to drivers/net/ethernet/sun/sunbmac.c
diff --git a/drivers/net/sunbmac.h b/drivers/net/ethernet/sun/sunbmac.h
similarity index 100%
rename from drivers/net/sunbmac.h
rename to drivers/net/ethernet/sun/sunbmac.h
diff --git a/drivers/net/sungem.c b/drivers/net/ethernet/sun/sungem.c
similarity index 100%
rename from drivers/net/sungem.c
rename to drivers/net/ethernet/sun/sungem.c
diff --git a/drivers/net/sungem.h b/drivers/net/ethernet/sun/sungem.h
similarity index 100%
rename from drivers/net/sungem.h
rename to drivers/net/ethernet/sun/sungem.h
diff --git a/drivers/net/sungem_phy.c b/drivers/net/ethernet/sun/sungem_phy.c
similarity index 100%
rename from drivers/net/sungem_phy.c
rename to drivers/net/ethernet/sun/sungem_phy.c
diff --git a/drivers/net/sungem_phy.h b/drivers/net/ethernet/sun/sungem_phy.h
similarity index 100%
rename from drivers/net/sungem_phy.h
rename to drivers/net/ethernet/sun/sungem_phy.h
diff --git a/drivers/net/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
similarity index 100%
rename from drivers/net/sunhme.c
rename to drivers/net/ethernet/sun/sunhme.c
diff --git a/drivers/net/sunhme.h b/drivers/net/ethernet/sun/sunhme.h
similarity index 100%
rename from drivers/net/sunhme.h
rename to drivers/net/ethernet/sun/sunhme.h
diff --git a/drivers/net/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
similarity index 100%
rename from drivers/net/sunqe.c
rename to drivers/net/ethernet/sun/sunqe.c
diff --git a/drivers/net/sunqe.h b/drivers/net/ethernet/sun/sunqe.h
similarity index 100%
rename from drivers/net/sunqe.h
rename to drivers/net/ethernet/sun/sunqe.h
diff --git a/drivers/net/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
similarity index 100%
rename from drivers/net/sunvnet.c
rename to drivers/net/ethernet/sun/sunvnet.c
diff --git a/drivers/net/sunvnet.h b/drivers/net/ethernet/sun/sunvnet.h
similarity index 100%
rename from drivers/net/sunvnet.h
rename to drivers/net/ethernet/sun/sunvnet.h
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index 020f64a..a891ad0 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -27,7 +27,7 @@
#define VERSION "2.0 B"
-#include "sungem_phy.h"
+#include "./ethernet/sun/sungem_phy.h"
extern int spider_net_stop(struct net_device *netdev);
extern int spider_net_open(struct net_device *netdev);
--
1.7.6
^ permalink raw reply related
* [net-next 00/10] drivers/net organize Ethernet drivers (2nd series)
From: Jeff Kirsher @ 2011-08-11 9:51 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This is the second of seven 10 patch series to move the Ethernet
drivers into drivers/net/ethernet/
The following are changes since commit 628a604842b68cb0fc483e7cd5fcfb836be633d5:
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize
and are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master
Jeff Kirsher (10):
ni5010: Move the Racal-Interlan (Micom) driver
cassini/niu/sun*: Move the Sun drivers
sfc: Move the Solarflare drivers
be2net: Move the Emulex driver
bna: Move the Brocade driver
mlx4: Move the Mellanox driver
myri*: Move the Myricom drivers
s2io/vxge: Move the Exar drivers
ehea/ibm*: Move the IBM drivers
enic: Move the Cisco driver
MAINTAINERS | 20 +-
drivers/net/Kconfig | 225 --------------------
drivers/net/Makefile | 23 +--
drivers/net/benet/Kconfig | 6 -
drivers/net/ethernet/Kconfig | 10 +
drivers/net/ethernet/Makefile | 10 +
drivers/net/ethernet/brocade/Kconfig | 22 ++
drivers/net/ethernet/brocade/Makefile | 5 +
drivers/net/ethernet/brocade/bna/Kconfig | 17 ++
drivers/net/{ => ethernet/brocade}/bna/Makefile | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h | 0
.../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h | 0
.../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h | 0
.../{ => ethernet/brocade}/bna/bfa_defs_status.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h | 0
.../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfi.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_reg.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c | 0
drivers/net/{ => ethernet/brocade}/bna/bna_hw.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c | 0
drivers/net/{ => ethernet/brocade}/bna/bna_types.h | 0
drivers/net/{ => ethernet/brocade}/bna/bnad.c | 0
drivers/net/{ => ethernet/brocade}/bna/bnad.h | 0
.../net/{ => ethernet/brocade}/bna/bnad_ethtool.c | 0
drivers/net/{ => ethernet/brocade}/bna/cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c | 0
drivers/net/ethernet/cisco/Kconfig | 22 ++
drivers/net/ethernet/cisco/Makefile | 5 +
drivers/net/ethernet/cisco/enic/Kconfig | 9 +
drivers/net/{ => ethernet/cisco}/enic/Makefile | 0
drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0
.../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0
.../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 0
.../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0
.../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0
.../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0
drivers/net/ethernet/emulex/Kconfig | 22 ++
drivers/net/ethernet/emulex/Makefile | 5 +
drivers/net/ethernet/emulex/benet/Kconfig | 6 +
drivers/net/{ => ethernet/emulex}/benet/Makefile | 0
drivers/net/{ => ethernet/emulex}/benet/be.h | 0
drivers/net/{ => ethernet/emulex}/benet/be_cmds.c | 0
drivers/net/{ => ethernet/emulex}/benet/be_cmds.h | 0
.../net/{ => ethernet/emulex}/benet/be_ethtool.c | 0
drivers/net/{ => ethernet/emulex}/benet/be_hw.h | 0
drivers/net/{ => ethernet/emulex}/benet/be_main.c | 0
drivers/net/ethernet/ibm/Kconfig | 47 ++++
drivers/net/ethernet/ibm/Makefile | 8 +
drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig | 40 ++--
.../{ibm_newemac => ethernet/ibm/emac}/Makefile | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/core.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/core.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/debug.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/debug.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/emac.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/mal.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/mal.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/phy.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/phy.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/tah.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/tah.h | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c | 0
.../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h | 0
drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
drivers/net/{ => ethernet/ibm}/iseries_veth.c | 0
drivers/net/ethernet/mellanox/Kconfig | 22 ++
drivers/net/ethernet/mellanox/Makefile | 5 +
drivers/net/ethernet/mellanox/mlx4/Kconfig | 27 +++
drivers/net/{ => ethernet/mellanox}/mlx4/Makefile | 0
drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/catas.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/cq.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_netdev.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h | 0
.../{ => ethernet/mellanox}/mlx4/en_resources.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c | 0
.../net/{ => ethernet/mellanox}/mlx4/en_selftest.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/eq.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/fw.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/fw.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/icm.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/icm.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/intf.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/main.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h | 0
drivers/net/{ => ethernet/mellanox}/mlx4/mr.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/pd.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/port.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/profile.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/qp.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/reset.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/sense.c | 0
drivers/net/{ => ethernet/mellanox}/mlx4/srq.c | 0
drivers/net/ethernet/myricom/Kconfig | 46 ++++
drivers/net/ethernet/myricom/Makefile | 5 +
.../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
.../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
.../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
.../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
drivers/net/ethernet/neterion/Kconfig | 54 +++++
drivers/net/ethernet/neterion/Makefile | 6 +
drivers/net/{ => ethernet/neterion}/s2io-regs.h | 0
drivers/net/{ => ethernet/neterion}/s2io.c | 0
drivers/net/{ => ethernet/neterion}/s2io.h | 0
drivers/net/{ => ethernet/neterion}/vxge/Makefile | 0
.../net/{ => ethernet/neterion}/vxge/vxge-config.c | 0
.../net/{ => ethernet/neterion}/vxge/vxge-config.h | 0
.../{ => ethernet/neterion}/vxge/vxge-ethtool.c | 0
.../{ => ethernet/neterion}/vxge/vxge-ethtool.h | 0
.../net/{ => ethernet/neterion}/vxge/vxge-main.c | 0
.../net/{ => ethernet/neterion}/vxge/vxge-main.h | 0
.../net/{ => ethernet/neterion}/vxge/vxge-reg.h | 0
.../{ => ethernet/neterion}/vxge/vxge-traffic.c | 0
.../{ => ethernet/neterion}/vxge/vxge-traffic.h | 0
.../{ => ethernet/neterion}/vxge/vxge-version.h | 0
drivers/net/ethernet/racal/Kconfig | 32 +++
drivers/net/ethernet/racal/Makefile | 5 +
drivers/net/{ => ethernet/racal}/ni5010.c | 0
drivers/net/{ => ethernet/racal}/ni5010.h | 0
drivers/net/{ => ethernet}/sfc/Kconfig | 4 +-
drivers/net/{ => ethernet}/sfc/Makefile | 0
drivers/net/{ => ethernet}/sfc/bitfield.h | 0
drivers/net/{ => ethernet}/sfc/efx.c | 0
drivers/net/{ => ethernet}/sfc/efx.h | 0
drivers/net/{ => ethernet}/sfc/enum.h | 0
drivers/net/{ => ethernet}/sfc/ethtool.c | 0
drivers/net/{ => ethernet}/sfc/falcon.c | 0
drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
drivers/net/{ => ethernet}/sfc/filter.c | 0
drivers/net/{ => ethernet}/sfc/filter.h | 0
drivers/net/{ => ethernet}/sfc/io.h | 0
drivers/net/{ => ethernet}/sfc/mac.h | 0
drivers/net/{ => ethernet}/sfc/mcdi.c | 0
drivers/net/{ => ethernet}/sfc/mcdi.h | 0
drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
drivers/net/{ => ethernet}/sfc/mtd.c | 0
drivers/net/{ => ethernet}/sfc/net_driver.h | 0
drivers/net/{ => ethernet}/sfc/nic.c | 0
drivers/net/{ => ethernet}/sfc/nic.h | 0
drivers/net/{ => ethernet}/sfc/phy.h | 0
drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
drivers/net/{ => ethernet}/sfc/regs.h | 0
drivers/net/{ => ethernet}/sfc/rx.c | 0
drivers/net/{ => ethernet}/sfc/selftest.c | 0
drivers/net/{ => ethernet}/sfc/selftest.h | 0
drivers/net/{ => ethernet}/sfc/siena.c | 0
drivers/net/{ => ethernet}/sfc/spi.h | 0
drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
drivers/net/{ => ethernet}/sfc/tx.c | 0
drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
drivers/net/{ => ethernet}/sfc/workarounds.h | 0
drivers/net/ethernet/sun/Kconfig | 86 ++++++++
drivers/net/ethernet/sun/Makefile | 11 +
drivers/net/{ => ethernet/sun}/cassini.c | 0
drivers/net/{ => ethernet/sun}/cassini.h | 0
drivers/net/{ => ethernet/sun}/niu.c | 0
drivers/net/{ => ethernet/sun}/niu.h | 0
drivers/net/{ => ethernet/sun}/sunbmac.c | 0
drivers/net/{ => ethernet/sun}/sunbmac.h | 0
drivers/net/{ => ethernet/sun}/sungem.c | 0
drivers/net/{ => ethernet/sun}/sungem.h | 0
drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
drivers/net/{ => ethernet/sun}/sunhme.c | 0
drivers/net/{ => ethernet/sun}/sunhme.h | 0
drivers/net/{ => ethernet/sun}/sunqe.c | 0
drivers/net/{ => ethernet/sun}/sunqe.h | 0
drivers/net/{ => ethernet/sun}/sunvnet.c | 0
drivers/net/{ => ethernet/sun}/sunvnet.h | 0
drivers/net/spider_net.h | 2 +-
227 files changed, 521 insertions(+), 286 deletions(-)
delete mode 100644 drivers/net/benet/Kconfig
create mode 100644 drivers/net/ethernet/brocade/Kconfig
create mode 100644 drivers/net/ethernet/brocade/Makefile
create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
rename drivers/net/{ => ethernet/brocade}/bna/Makefile (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_reg.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_hw.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
create mode 100644 drivers/net/ethernet/cisco/Kconfig
create mode 100644 drivers/net/ethernet/cisco/Makefile
create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
create mode 100644 drivers/net/ethernet/emulex/Kconfig
create mode 100644 drivers/net/ethernet/emulex/Makefile
create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (100%)
rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (100%)
create mode 100644 drivers/net/ethernet/ibm/Kconfig
create mode 100644 drivers/net/ethernet/ibm/Makefile
rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Makefile (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (100%)
create mode 100644 drivers/net/ethernet/mellanox/Kconfig
create mode 100644 drivers/net/ethernet/mellanox/Makefile
create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
create mode 100644 drivers/net/ethernet/myricom/Kconfig
create mode 100644 drivers/net/ethernet/myricom/Makefile
rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
create mode 100644 drivers/net/ethernet/neterion/Kconfig
create mode 100644 drivers/net/ethernet/neterion/Makefile
rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
create mode 100644 drivers/net/ethernet/racal/Kconfig
create mode 100644 drivers/net/ethernet/racal/Makefile
rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
rename drivers/net/{ => ethernet}/sfc/efx.c (100%)
rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
rename drivers/net/{ => ethernet}/sfc/io.h (100%)
rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
create mode 100644 drivers/net/ethernet/sun/Kconfig
create mode 100644 drivers/net/ethernet/sun/Makefile
rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
rename drivers/net/{ => ethernet/sun}/niu.c (100%)
rename drivers/net/{ => ethernet/sun}/niu.h (100%)
rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
rename drivers/net/{ => ethernet/sun}/sungem.c (100%)
rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
rename drivers/net/{ => ethernet/sun}/sungem_phy.c (100%)
rename drivers/net/{ => ethernet/sun}/sungem_phy.h (100%)
rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
--
1.7.6
^ permalink raw reply
* [net-next 01/10] ni5010: Move the Racal-Interlan (Micom) driver
From: Jeff Kirsher @ 2011-08-11 9:51 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, Jan-Pascal van Best,
Andreas Mohr
In-Reply-To: <1313056294-28426-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and
make the necessary Kconfig and Makefile changes.
CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
CC: Andreas Mohr <andi@lisas.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 25 ----------------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/racal/Kconfig | 32 +++++++++++++++++++++++++++++
drivers/net/ethernet/racal/Makefile | 5 ++++
drivers/net/{ => ethernet/racal}/ni5010.c | 0
drivers/net/{ => ethernet/racal}/ni5010.h | 0
9 files changed, 40 insertions(+), 27 deletions(-)
create mode 100644 drivers/net/ethernet/racal/Kconfig
create mode 100644 drivers/net/ethernet/racal/Makefile
rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 5b368cc..19bd60d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4520,7 +4520,7 @@ M: Jan-Pascal van Best <janpascal@vanbest.org>
M: Andreas Mohr <andi@lisas.de>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/ni5010.*
+F: drivers/net/ethernet/racal/ni5010.*
NILFS2 FILESYSTEM
M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d7d0b35..b76de82 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -581,31 +581,6 @@ config GRETH
help
Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
-config NET_VENDOR_RACAL
- bool "Racal-Interlan (Micom) NI cards"
- depends on ISA
- help
- If you have a network (Ethernet) card belonging to this class, such
- as the NI5010, say Y and read the Ethernet-HOWTO,
- available from <http://www.tldp.org/docs.html#howto>.
-
- Note that the answer to this question doesn't directly affect the
- kernel: saying N will just cause the configurator to skip all
- the questions about NI cards. If you say Y, you will be asked for
- your specific card in the following questions.
-
-config NI5010
- tristate "NI5010 support (EXPERIMENTAL)"
- depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
- ---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>. Note that this is still
- experimental code.
-
- To compile this driver as a module, choose M here. The module
- will be called ni5010.
-
config DNET
tristate "Dave ethernet support (DNET)"
depends on NET_ETHERNET && HAS_IOMEM
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 49b3e87..e641f70 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -140,7 +140,6 @@ obj-$(CONFIG_8139TOO) += 8139too.o
obj-$(CONFIG_CPMAC) += cpmac.o
obj-$(CONFIG_EWRK3) += ewrk3.o
obj-$(CONFIG_ATP) += atp.o
-obj-$(CONFIG_NI5010) += ni5010.o
obj-$(CONFIG_SC92031) += sc92031.o
obj-$(CONFIG_ETH16I) += eth16i.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index d0a8fa8..7efbb7c 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
+source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 6d3276a..86da8b8 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,4 +10,5 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
+obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/ethernet/racal/Kconfig b/drivers/net/ethernet/racal/Kconfig
new file mode 100644
index 0000000..45d4930
--- /dev/null
+++ b/drivers/net/ethernet/racal/Kconfig
@@ -0,0 +1,32 @@
+#
+# Racal-Interlan device configuration
+#
+
+config NET_VENDOR_RACAL
+ bool "Racal-Interlan (Micom) NI devices"
+ depends on ISA
+ ---help---
+ If you have a network (Ethernet) card belonging to this class, such
+ as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO,
+ available from <http://www.tldp.org/docs.html#howto>.
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about NI cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+if NET_VENDOR_RACAL
+
+config NI5010
+ tristate "NI5010 support (EXPERIMENTAL)"
+ depends on ISA && EXPERIMENTAL && BROKEN_ON_SMP
+ ---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>. Note that this is still
+ experimental code.
+
+ To compile this driver as a module, choose M here. The module
+ will be called ni5010.
+
+endif # NET_VENDOR_RACAL
diff --git a/drivers/net/ethernet/racal/Makefile b/drivers/net/ethernet/racal/Makefile
new file mode 100644
index 0000000..1e210ca
--- /dev/null
+++ b/drivers/net/ethernet/racal/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Racal-Interlan network device drivers.
+#
+
+obj-$(CONFIG_NI5010) += ni5010.o
diff --git a/drivers/net/ni5010.c b/drivers/net/ethernet/racal/ni5010.c
similarity index 100%
rename from drivers/net/ni5010.c
rename to drivers/net/ethernet/racal/ni5010.c
diff --git a/drivers/net/ni5010.h b/drivers/net/ethernet/racal/ni5010.h
similarity index 100%
rename from drivers/net/ni5010.h
rename to drivers/net/ethernet/racal/ni5010.h
--
1.7.6
^ permalink raw reply related
* Re: [PATCH] net/netlabel/netlabel_kapi.c: add missing cleanup code
From: Dan Carpenter @ 2011-08-11 9:44 UTC (permalink / raw)
To: Julia Lawall
Cc: Paul Moore, kernel-janitors, David S. Miller, netdev,
linux-kernel
In-Reply-To: <1313055633-25327-1-git-send-email-julia@diku.dk>
On Thu, Aug 11, 2011 at 11:40:33AM +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Use the same cleanup code for the failure of kzalloc as for the failure of
> kstrdup just below.
>
That doesn't work. The kfree(entry->domain) would cause an oops.
regards,
dan carpenter
^ permalink raw reply
* [PATCH] net/netlabel/netlabel_kapi.c: add missing cleanup code
From: Julia Lawall @ 2011-08-11 9:40 UTC (permalink / raw)
To: Paul Moore; +Cc: kernel-janitors, David S. Miller, netdev, linux-kernel
From: Julia Lawall <julia@diku.dk>
Use the same cleanup code for the failure of kzalloc as for the failure of
kstrdup just below.
Signed-off-by: Julia Lawall <julia@diku.dk>
---
net/netlabel/netlabel_kapi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 58107d0..225e12c 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -341,7 +341,7 @@ int netlbl_cfg_cipsov4_map_add(u32 doi,
entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
if (entry == NULL)
- return -ENOMEM;
+ goto cfg_cipsov4_map_add_failure;
if (domain != NULL) {
entry->domain = kstrdup(domain, GFP_ATOMIC);
if (entry->domain == NULL)
^ permalink raw reply related
* [PATCH 3/3] net/irda: sh_sir: tidyup compile warning
From: kuninori.morimoto.gx @ 2011-08-11 9:26 UTC (permalink / raw)
To: David Miller; +Cc: Kuninori Morimoto, netdev
In-Reply-To: <877h6kwbiq.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch tidyup below warning
${LINUX}/drivers/net/irda/sh_sir.c:514:6: warning:
'val' may be used uninitialized in this function
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
drivers/net/irda/sh_sir.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index 10b13ea..ed7d7d6 100644
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -513,7 +513,7 @@ static void sh_sir_tx(struct sh_sir_self *self, int phase)
static int sh_sir_read_data(struct sh_sir_self *self)
{
- u16 val;
+ u16 val = 0;
int timeout = 1024;
while (timeout--) {
--
1.7.4.1
^ permalink raw reply related
* [PATCH 2/3 v2] net/irda: sh_sir: add missing header
From: kuninori.morimoto.gx @ 2011-08-11 9:26 UTC (permalink / raw)
To: David Miller; +Cc: Kuninori Morimoto, netdev
In-Reply-To: <877h6kwbiq.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch fixup below build error on sh_sir
sh_sir.c: In function 'sh_sir_write':
sh_sir.c:127:2: error: implicit declaration of function 'iowrite16'
sh_sir.c: In function 'sh_sir_read':
sh_sir.c:132:2: error: implicit declaration of function 'ioread16'
sh_sir.c: At top level:
sh_sir.c:561:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sh_sir_irq'
sh_sir.c: In function 'sh_sir_probe':
sh_sir.c:727:2: error: implicit declaration of function 'ioremap_nocache'
sh_sir.c:727:16: warning: assignment makes pointer from integer without a cast
sh_sir.c:762:2: error: implicit declaration of function 'request_irq'
sh_sir.c:762:23: error: 'sh_sir_irq' undeclared (first use in this function)
sh_sir.c:762:23: note: each undeclared identifier is reported only once for each function it appears in
sh_sir.c:762:35: error: 'IRQF_DISABLED' undeclared (first use in this function)
sh_sir.c:776:2: error: implicit declaration of function 'iounmap'
sh_sir.c: At top level:
sh_sir.c:436:13: warning: 'sh_sir_clear_all_err' defined but not used
sh_sir.c:474:12: warning: 'sh_sir_is_which_phase' defined but not used
sh_sir.c:490:13: warning: 'sh_sir_tx' defined but not used
sh_sir.c:540:13: warning: 'sh_sir_rx' defined but not used
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- just add missing header
- change email subject
drivers/net/irda/sh_sir.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index 52a7c86..10b13ea 100644
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -12,6 +12,8 @@
* published by the Free Software Foundation.
*/
+#include <linux/io.h>
+#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
--
1.7.4.1
^ permalink raw reply related
* [PATCH 1/3 v2] net/irda: sh_irda: add missing header
From: kuninori.morimoto.gx @ 2011-08-11 9:25 UTC (permalink / raw)
To: David Miller; +Cc: Kuninori Morimoto, netdev
In-Reply-To: <877h6kwbiq.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch fixup below build error on sh_irda
sh_irda.c: In function 'sh_irda_write':
sh_irda.c:174: error: implicit declaration of function 'iowrite16'
sh_irda.c: In function 'sh_irda_read':
sh_irda.c:184: error: implicit declaration of function 'ioread16'
sh_irda.c: At top level:
sh_irda.c:492: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sh_irda_irq'
sh_irda.c: In function 'sh_irda_probe':
sh_irda.c:776: error: implicit declaration of function 'ioremap_nocache'
sh_irda.c:776: warning: assignment makes pointer from integer without a cast
sh_irda.c:811: error: implicit declaration of function 'request_irq'
sh_irda.c:811: error: 'sh_irda_irq' undeclared (first use in this function)
sh_irda.c:811: error: (Each undeclared identifier is reported only once
sh_irda.c:811: error: for each function it appears in.)
sh_irda.c:811: error: 'IRQF_DISABLED' undeclared (first use in this function)
sh_irda.c:825: error: implicit declaration of function 'iounmap'
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- just add missing header
- change email subject
drivers/net/irda/sh_irda.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index 4488bd5..8266067 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -22,6 +22,8 @@
* - DMA transfer support
* - FIFO mode support
*/
+#include <linux/io.h>
+#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
--
1.7.4.1
^ permalink raw reply related
* Re: [PATCHv3 0/9] macb: add support for Cadence GEM
From: Jamie Iles @ 2011-08-11 9:21 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: Jamie Iles, netdev, linux-arm-kernel
In-Reply-To: <20110809145940.GP22213@game.jcrosoft.org>
On Tue, Aug 09, 2011 at 04:59:40PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 10:16 Tue 09 Aug , Jamie Iles wrote:
> > This is largely a repost of the series I posted back in March. The only changes
> > since then are rebasing onto 3.1-rc1 and changing the gem conditionals from a
> > boolean in the macb structure to an inline helper as requested by
> > Jean-Christophe.
> >
> > This has been run-tested on picoxcell and compile tested for all AT91 platforms
> > but I couldn't get a working cross compiler for avr32.
> >
> > All patches are available in a git branch at
> >
> > git://github.com/jamieiles/linux-2.6-ji.git macb-gem
> >
> looks good except few comments
>
> I'll test it later this week
I've added your Acked-by's and addressed yours and Joe's comments. If
you let me know once you've tested it I'll see if Arnd can take the
changes through his tree.
Jamie
^ permalink raw reply
* Re: [PATCH v2] net: sh_irda: fixup build error on v3.1
From: Kuninori Morimoto @ 2011-08-11 9:19 UTC (permalink / raw)
To: David Miller; +Cc: kuninori.morimoto.gx, netdev
In-Reply-To: <20110810.231558.2202030270747790994.davem@davemloft.net>
Hi David
These are v2 of sh_irda/sh_sir patches
Kuninori Morimoto (3):
net/irda: sh_irda: add missing header
net/irda: sh_sir: add missing header
net/irda: sh_sir: tidyup compile warning
#1, #2 are v2 of
[PATCH] net: sh_irda: fixup build error on v3.1
[PATCH] net: sh_sir: fixup build error on v3.1
#3 is new patch
Best regards
---
Kuninori Morimoto
^ permalink raw reply
* Re: [net-next 02/10] 3c*/acenic/typhoon: Move 3Com Ethernet drivers
From: Jeff Kirsher @ 2011-08-11 9:13 UTC (permalink / raw)
To: Alan Cox
Cc: davem@davemloft.net, netdev@vger.kernel.org, gospo@tredhat.com,
sassmann@redhat.com, Steffen Klassert, David Dillow, Jes Sorensen,
David Hinds
In-Reply-To: <20110811100255.421a5fbc@bob.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 697 bytes --]
On Thu, 2011-08-11 at 02:02 -0700, Alan Cox wrote:
> On Wed, 10 Aug 2011 20:27:50 -0700
> Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
>
> > Moves the 3Com drivers into drivers/net/ethernet/3com/ and the
> > necessary Kconfig and Makefile changes.
>
> This seems to be repeating one of the problems of the last one
>
> > drivers/net/{ => ethernet/3com}/acenic.c | 0
> > drivers/net/{ => ethernet/3com}/acenic.h | 0
>
> Acenic was not 3com. It was a wide variety of vendors including 3Com who
> rebadged it.
>
> Alan
Alan-
Where would you like to put it? drivers/net/ethernet/alteon/? I am fine
with fixing this up by placing somewhere else.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH] net: sh_irda: fixup build error on v3.1
From: Kuninori Morimoto @ 2011-08-11 9:02 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <20110810.231558.2202030270747790994.davem@davemloft.net>
Hi David
Thank you for your reply
> > spin_lock_irqsave(&self->lock, flags);
> > - iowrite16(data, self->membase + offset);
> > + __raw_writew(data, self->membase + offset);
> > spin_unlock_irqrestore(&self->lock, flags);
>
> Every platform, including "sh", provides ioread16() and iowrite16().
>
> So changing this is not part of "fixup build error" as your commit
> message states.
Thank you I understand.
I send v2 patch
Best regards
---
Kuninori Morimoto
^ permalink raw reply
* Re: [PATCHv3 4/9] macb: convert printk to netdev_ and friends
From: Jamie Iles @ 2011-08-11 9:01 UTC (permalink / raw)
To: Joe Perches; +Cc: Jamie Iles, netdev, linux-arm-kernel, plagnioj
In-Reply-To: <1312921227.11924.35.camel@Joe-Laptop>
On Tue, Aug 09, 2011 at 01:20:27PM -0700, Joe Perches wrote:
> On Tue, 2011-08-09 at 10:16 +0100, Jamie Iles wrote:
> > macb is already using the dev_dbg() and friends helpers so use netdev_()
> > along with a pr_fmt() definition to make the printing a little cleaner.
> []
> > diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> []
> > @@ -8,6 +8,7 @@
> []
> > +#define pr_fmt(fmt) "macb: " fmt
>
> Hi Jamie.
>
> Just trivia.
>
> Please use #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> instead. There would be no output difference.
>
> That'll make it easier to remove later when all of
> of these #defines pr_fmt that use just KBUILD_MODNAME
> can be removed.
I hadn't noticed KBUILD_MODNAME before, thanks for pointing that out
Joe. I'll update with this change.
Jamie
^ permalink raw reply
* Re: [net-next 02/10] 3c*/acenic/typhoon: Move 3Com Ethernet drivers
From: Alan Cox @ 2011-08-11 9:02 UTC (permalink / raw)
To: Jeff Kirsher
Cc: davem, netdev, gospo, sassmann, Steffen Klassert, David Dillow,
Jes Sorensen, David Hinds
In-Reply-To: <1313033278-7337-3-git-send-email-jeffrey.t.kirsher@intel.com>
On Wed, 10 Aug 2011 20:27:50 -0700
Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> Moves the 3Com drivers into drivers/net/ethernet/3com/ and the
> necessary Kconfig and Makefile changes.
This seems to be repeating one of the problems of the last one
> drivers/net/{ => ethernet/3com}/acenic.c | 0
> drivers/net/{ => ethernet/3com}/acenic.h | 0
Acenic was not 3com. It was a wide variety of vendors including 3Com who
rebadged it.
Alan
^ permalink raw reply
* Bridge stays down until a port is added
From: Marc Haber @ 2011-08-11 7:06 UTC (permalink / raw)
To: netdev
Hi,
since a few kernel versions, I think since 2.6.39, I have noticed that
a bridge interface stays in NO CARRIER state unless the first port is
added:
$ sudo brctl show
bridge name bridge id STP enabled interfaces
br0 8000.000000000000 no
$ ip a show dev br0
9: br0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN
link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff
inet6 2001:db8::1/64 scope global tentative
valid_lft forever preferred_lft forever
$ ping6 2001:db8::1
PING 2001:db8::1(2001:db8::1) 56 data bytes
^C
--- 2001:db8::1 ping statistics ---
3 packets transmitted, 0 received, 100% packet loss, time 2016ms
$ sudo modprobe dummy
$ sudo brctl addif br0 dummy0
$ sudo ip link set dev dummy0 up
$ ping6 2001:db8::1
PING 2001:db8::1(2001:db8::1) 56 data bytes
64 bytes from 2001:db8::1: icmp_seq=1 ttl=64 time=0.019 ms
64 bytes from 2001:db8::1: icmp_seq=2 ttl=64 time=0.023 ms
^C
--- 2001:db8::1 ping statistics ---
2 packets transmitted, 2 received, 0% packet loss, time 999ms
rtt min/avg/max/mdev = 0.019/0.021/0.023/0.002 ms
$ ip a show dev br0
9: br0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP
link/ether da:1c:11:bc:3e:54 brd ff:ff:ff:ff:ff:ff
inet6 2001:db8::1/64 scope global
valid_lft forever preferred_lft forever
inet6 fe80::d81c:11ff:febc:3e54/64 scope link
valid_lft forever preferred_lft forever
$
Is that a feature? If so, why does the interface stay pingable after
removing the dummy0 interface from the bridge?
Can I somehow get the old behavior back, that the bridge is
immediately up, and addresses configured on the bridge interfaces are
immediately pingable?
New new behavior is somewhat unhandy when one uses the bridge address
for services that the host offers, to save on IP addresses and
networks (for example, when one has only a single IP address and a
single additional network), since one has to take extra measures to
have the addresses on the bridge interface reachable.
Or am I doing things wrong?
Greetings
Marc
--
-----------------------------------------------------------------------------
Marc Haber | "I don't trust Computers. They | Mailadresse im Header
Mannheim, Germany | lose things." Winona Ryder | Fon: *49 621 72739834
Nordisch by Nature | How to make an American Quilt | Fax: *49 3221 2323190
^ permalink raw reply
* Re: [PATCH v11 4/5] powerpc: Add flexcan device support for p1010rdb.
From: Wolfgang Grandegger @ 2011-08-11 7:35 UTC (permalink / raw)
To: Robin Holt
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, U Bhaskar-B22300, Kumar Gala,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w, Marc Kleine-Budde,
PPC list
In-Reply-To: <20110811035620.GB4926-sJ/iWh9BUns@public.gmane.org>
On 08/11/2011 05:56 AM, Robin Holt wrote:
> On Wed, Aug 10, 2011 at 08:16:33PM +0200, Wolfgang Grandegger wrote:
>> On 08/10/2011 07:01 PM, Kumar Gala wrote:
>>>
>>> On Aug 10, 2011, at 11:27 AM, Robin Holt wrote:
>>>
>>>> I added a simple clock source for the p1010rdb so the flexcan driver
>>>> could determine a clock frequency. The p1010 flexcan device only has
>>>> an oscillator of system bus frequency divided by 2.
>>>>
>>>> Signed-off-by: Robin Holt <holt-sJ/iWh9BUns@public.gmane.org>
>>>> Acked-by: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
>>>> Acked-by: Wolfgang Grandegger <wg-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>,
>>>> Cc: U Bhaskar-B22300 <B22300-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
>>>> Cc: socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org,
>>>> Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
>>>> Cc: PPC list <linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>
>>>> Cc: Kumar Gala <galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
>>>> ---
>>>> arch/powerpc/platforms/85xx/Kconfig | 2 +
>>>> arch/powerpc/platforms/85xx/Makefile | 2 +
>>>> arch/powerpc/platforms/85xx/clock.c | 52 ++++++++++++++++++++++++++++++++
>>>> arch/powerpc/platforms/85xx/p1010rdb.c | 8 +++++
>>>> 4 files changed, 64 insertions(+), 0 deletions(-)
>>>> create mode 100644 arch/powerpc/platforms/85xx/clock.c
>>>
>>> I dont understand how mpc85xx_clk_functions() ends up being associated with the frequency the flexcan is running at.
>>
>> The function mpc85xx_clk_get_rate() returns "fsl_get_sys_freq() / 2" for
>> Flexcan devices.
>>
>>> This either seems to global or I'm missing something.
>>
>> This patch extends the existing Flexcan platform driver for ARM for the
>> PowerPC using the device tree. Due to the nice integration of the device
>> tree (of-platform) into the platform driver and devices, the difference
>> are quite small (see patches 1..3). Apart from the endianess issue, only
>> the clock needs to be handled in a common way. As ARM already uses the
>> clk interface, we found it straight-forward to implement it for the
>> P1010, or more general for the 85xx, as well, instead of using an
>> additional helper function.
>>
>>> I still think the clk / freq info should be in the device tree and handled in the driver and NOT arch/powerpc platform code.
>>
>> If I understand you correctly, you want the boot-loader to provide the
>> relevant information by fixing up the device tree, which then can be
>> handled arch-independently by the driver, right?
>
> Marc and Wolfgang,
>
> This is a very early swag at this which I worked up while driving home from dinner
> this evening. It works with my current config, but that includes at least one
> bogus patch. I will have to do more testing tomorrow. For now, it is something
> to ponder.
Yes, that's what Kumar is proposing. Fine for me with the P1010. It just
needs some proper U-Boot implementation.
> Thanks,
> Robin
> ------------------------------------------------------------------------
>
> flexcan: Prefer device tree clock frequency if available.
>
> If our CAN device's device tree node has a clock-frequency property,
> then use that value for the can devices clock frequency. If not, fall
> back to asking the platform/mach code for the clock frequency associated
> with the flexcan device.
>
> Too-early-to-be-signed-off-by: Robin Holt <holt-sJ/iWh9BUns@public.gmane.org>
>
> diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
> index 662f832..d6a87c9 100644
> --- a/drivers/net/can/flexcan.c
> +++ b/drivers/net/can/flexcan.c
> @@ -33,6 +33,7 @@
> #include <linux/kernel.h>
> #include <linux/list.h>
> #include <linux/module.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
>
> #define DRV_NAME "flexcan"
> @@ -929,12 +930,25 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
> void __iomem *base;
> resource_size_t mem_size;
> int err, irq;
> + u32 clock_freq = 0;
>
> - clk = clk_get(&pdev->dev, NULL);
> - if (IS_ERR(clk)) {
> - dev_err(&pdev->dev, "no clock defined\n");
> - err = PTR_ERR(clk);
> - goto failed_clock;
> + if (pdev->dev.of_node) {
> + u32 *clock_freq_p;
Should be:
const u32 *clock_freq_p;
> +
> + clk = NULL;
> + clock_freq_p = (u32 *)of_get_property(pdev->dev.of_node, "clock-frequency", NULL);
No cast please.
> + if (clock_freq_p)
> + clock_freq = *clock_freq_p;
> + }
Wolfgang.
^ permalink raw reply
* Re: [PATCH v11 4/5] powerpc: Add flexcan device support for p1010rdb.
From: Wolfgang Grandegger @ 2011-08-11 7:26 UTC (permalink / raw)
To: Kumar Gala
Cc: socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA, Marc Kleine-Budde,
U Bhaskar-B22300, PPC list
In-Reply-To: <634AB7A6-1CDA-41B3-8A5D-01F29EF01521-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
On 08/11/2011 06:46 AM, Kumar Gala wrote:
>
> On Aug 10, 2011, at 1:16 PM, Wolfgang Grandegger wrote:
>
>> On 08/10/2011 07:01 PM, Kumar Gala wrote:
>>>
>>> On Aug 10, 2011, at 11:27 AM, Robin Holt wrote:
>>>
>>>> I added a simple clock source for the p1010rdb so the flexcan driver
>>>> could determine a clock frequency. The p1010 flexcan device only has
>>>> an oscillator of system bus frequency divided by 2.
>>>>
>>>> Signed-off-by: Robin Holt <holt-sJ/iWh9BUns@public.gmane.org>
>>>> Acked-by: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
>>>> Acked-by: Wolfgang Grandegger <wg-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>,
>>>> Cc: U Bhaskar-B22300 <B22300-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
>>>> Cc: socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org,
>>>> Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
>>>> Cc: PPC list <linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>
>>>> Cc: Kumar Gala <galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
>>>> ---
>>>> arch/powerpc/platforms/85xx/Kconfig | 2 +
>>>> arch/powerpc/platforms/85xx/Makefile | 2 +
>>>> arch/powerpc/platforms/85xx/clock.c | 52 ++++++++++++++++++++++++++++++++
>>>> arch/powerpc/platforms/85xx/p1010rdb.c | 8 +++++
>>>> 4 files changed, 64 insertions(+), 0 deletions(-)
>>>> create mode 100644 arch/powerpc/platforms/85xx/clock.c
>>>
>>> I dont understand how mpc85xx_clk_functions() ends up being associated with the frequency the flexcan is running at.
>>
>> The function mpc85xx_clk_get_rate() returns "fsl_get_sys_freq() / 2" for
>> Flexcan devices.
>>
>>> This either seems to global or I'm missing something.
>>
>> This patch extends the existing Flexcan platform driver for ARM for the
>> PowerPC using the device tree. Due to the nice integration of the device
>> tree (of-platform) into the platform driver and devices, the difference
>> are quite small (see patches 1..3). Apart from the endianess issue, only
>> the clock needs to be handled in a common way. As ARM already uses the
>> clk interface, we found it straight-forward to implement it for the
>> P1010, or more general for the 85xx, as well, instead of using an
>> additional helper function.
>
> I see, that. What concerns me is there are numerous clocks / frequencies that exist inside a MPC85xx/P1010 SOC. The code I'm seeing does NOT seem to do anything to relate this clock JUST to the flexcan.
The clk interface is not commonly used on PowerPC, I know. It's just to
provide compatibility with ARM. An alternative would be to use some
helper function.
>>> I still think the clk / freq info should be in the device tree and handled in the driver and NOT arch/powerpc platform code.
>>
>> If I understand you correctly, you want the boot-loader to provide the
>> relevant information by fixing up the device tree, which then can be
>> handled arch-independently by the driver, right?
>
> Yes, that is part of what I want.
This works fine if we just have *one* fixed clock source and frequency.
When there are choices (source and divider) it does make sense to allow
the user to select the frequency via DTS file entries for Linux. Then we
need arch-specific code anyway (to set the relevant registers).
Furthermore we rely on the boot-loader (the usual argument) which is not
a problem for new boards (with new boot-loader), of course.
Wolfgang.
^ permalink raw reply
* Re: [PATCH 0/1] OMAP: wlan : To fix wlan issue with kernel 3.0
From: Panduranga @ 2011-08-11 7:15 UTC (permalink / raw)
To: tony
Cc: ohad, Gabay, Benzy, Gurumath, Pradeep, Mahaveer, Vishal,
Boudet, Xavier, Jain, Naveen, Halli, Manjunatha,
Mallireddy, Panduranga, Coelho, Luciano, netdev, linux-omap,
linux-mmc
In-Reply-To: <1311950476-2452-1-git-send-email-panduranga_mallireddy@ti.com>
Hi Tony,
Can you merge this patch series to Kernel 3.1.
It fixes the WLAN issue on Panda board, reported in Kernel 3.0
Regards,
Pandu.
----- Original Message -----
From: "Mallireddy, Panduranga" <panduranga_mallireddy@ti.com>
To: "Coelho, Luciano" <coelho@ti.com>; <netdev@vger.kernel.org>;
<linux-omap@vger.kernel.org>; <linux-mmc@vger.kernel.org>
Cc: <ohad@wizery.com>; "Gabay, Benzy" <benzyg@ti.com>; "Gurumath, Pradeep"
<pradeepgurumath@ti.com>; "Mahaveer, Vishal" <vishalm@ti.com>; "Boudet,
Xavier" <x-boudet@ti.com>; "Jain, Naveen" <naveen_jain@ti.com>; "Halli,
Manjunatha" <manjunatha_halli@ti.com>; "Mallireddy, Panduranga"
<panduranga_mallireddy@ti.com>
Sent: Friday, July 29, 2011 8:11 PM
Subject: [PATCH 0/1] OMAP: wlan : To fix wlan issue with kernel 3.0
From: Panduranga Mallireddy <panduranga_mallireddy@ti.com>
Error reported for wl12xx driver with Kernel 3.0 is
[ 0.181457] error setting wl12xx data
FIX:
For regulator omap4_clk32k used by wlan, set .constraints.always_on to 1
Panduranga Mallireddy (1):
OMAP: wlan: Set the WLAN Regulator to be always on
arch/arm/mach-omap2/twl-common.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply
* Re: Move interface across network namespaces
From: Eric W. Biederman @ 2011-08-11 7:13 UTC (permalink / raw)
To: Renato Westphal; +Cc: netdev
In-Reply-To: <CAChaegkomwjL0X7HnfLi1XH26jDKOL6fCgjfms67cjjU4gRXPg@mail.gmail.com>
Renato Westphal <renatowestphal@gmail.com> writes:
> Hello,
>
> I have two questions regarding the process of moving a network
> interface across different network namespaces:
>
> * When I move an interface, all the virtual interfaces attached to it
> are deleted. Is there any reason for such odd behavior? I would like
> to move some network interfaces and keep the attached vlans untouched.
The defined semantics are that a network device is unregistered from
the networking stack in one network namespace and then registered
with the networking stack in another. It is an unfortunate fact
that when vlan devices see their underlying device being unregistered
they decide to delete themselves.
A different vlan implementation might be able to have different
properties but I can't think of any obvious solution other than
don't do move the device that you have your vlans on top of.
> * The target network namespace sends a RTM_NEWLINK netlink message
> when an interface is moved to it. In the other hand, the source
> network namespace doesn't sends a RTM_DELLINK message when an
> interface is moved from it. This is very annoying because user space
> applications (such as zebra) can't detect some interface moving
> operations and then get into an inconsistent state. Anyone knows if
> there's a workaround for this?
Not getting RTM_DELLINK is a bug. The device registration and
unregistration code has changed since dev_change_net_namespace was
written and apparently one of the changes failed to update
dev_change_net_namespace.
Eric
^ permalink raw reply
* [PATCH RESEND] gianfar: reduce stack usage in gianfar_ethtool.c
From: stufever @ 2011-08-11 7:00 UTC (permalink / raw)
To: linux-kernel; +Cc: netdev, davem, sebastian.poehn, Wang Shaoyan
From: Wang Shaoyan <wangshaoyan.pt@taobao.com>
drivers/net/gianfar_ethtool.c:765: warning: the frame size of 2048 bytes is larger than 1024 bytes
Signed-off-by: Wang Shaoyan <wangshaoyan.pt@taobao.com>
Reviewed-and-tested-by: Sebastian Pöhn <sebastian.poehn@belden.com>
---
drivers/net/gianfar_ethtool.c | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 6e35069..25a8c2a 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -686,10 +686,21 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
{
unsigned int last_rule_idx = priv->cur_filer_idx;
unsigned int cmp_rqfpr;
- unsigned int local_rqfpr[MAX_FILER_IDX + 1];
- unsigned int local_rqfcr[MAX_FILER_IDX + 1];
+ unsigned int *local_rqfpr;
+ unsigned int *local_rqfcr;
int i = 0x0, k = 0x0;
int j = MAX_FILER_IDX, l = 0x0;
+ int ret = 1;
+
+ local_rqfpr = kmalloc(sizeof(unsigned int) * (MAX_FILER_IDX + 1),
+ GFP_KERNEL);
+ local_rqfcr = kmalloc(sizeof(unsigned int) * (MAX_FILER_IDX + 1),
+ GFP_KERNEL);
+ if (!local_rqfpr || !local_rqfcr) {
+ pr_err("Out of memory\n");
+ ret = 0;
+ goto err;
+ }
switch (class) {
case TCP_V4_FLOW:
@@ -706,7 +717,8 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
break;
default:
pr_err("Right now this class is not supported\n");
- return 0;
+ ret = 0;
+ goto err;
}
for (i = 0; i < MAX_FILER_IDX + 1; i++) {
@@ -721,7 +733,8 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
if (i == MAX_FILER_IDX + 1) {
pr_err("No parse rule found, can't create hash rules\n");
- return 0;
+ ret = 0;
+ goto err;
}
/* If a match was found, then it begins the starting of a cluster rule
@@ -765,7 +778,10 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
priv->cur_filer_idx = priv->cur_filer_idx - 1;
}
- return 1;
+err:
+ kfree(local_rqfcr);
+ kfree(local_rqfpr);
+ return ret;
}
static int gfar_set_hash_opts(struct gfar_private *priv, struct ethtool_rxnfc *cmd)
--
1.7.4.1
^ permalink raw reply related
* Re: [RFC PATCH] tcp: Replace possible syn attack msg by counters
From: Eric Dumazet @ 2011-08-11 6:33 UTC (permalink / raw)
To: David Miller; +Cc: therbert, netdev
In-Reply-To: <20110810.231318.959972077845910551.davem@davemloft.net>
Le mercredi 10 août 2011 à 23:13 -0700, David Miller a écrit :
> From: Tom Herbert <therbert@google.com>
> Date: Wed, 10 Aug 2011 22:38:02 -0700 (PDT)
>
> > Rather than printing the message to the log, use a mib counter to keep
> > track of the count of occurences of syn cookies being used or syn
> > being dropped when request queue is full.
> >
> > Rationale is these messages can fill up /var/log/messages on server
> > which is simply under heavy load... I'm not sure how much more useful
> > they would be in identifying a server DOS attack (compared to
> > counters).
> >
> > Signed-off-by: Tom Herbert <therbert@google.com>
>
> Print the message once, and also do the counters.
>
> Say something like "Possible SYN flooding, see SNMP counters." or
> similar.
>
> Because if people are grepping for that message in their logs, they
> will now have a false sense of confidence seeing it not being there
> any more.
An alternative would be to guard the message by net_msg_warn
(/proc/sys/net/core/warnings)
LIMIT_NETDEBUG(KERN_INFO "TCP: Possible SYN flooding on port %d. %s.\n"
...)
^ permalink raw reply
* Re: [PATCH] net: sh_irda: fixup build error on v3.1
From: David Miller @ 2011-08-11 6:15 UTC (permalink / raw)
To: kuninori.morimoto.gx; +Cc: netdev
In-Reply-To: <87aabgwl9y.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>
Date: Wed, 10 Aug 2011 22:49:01 -0700 (PDT)
> @@ -171,7 +173,7 @@ static void sh_irda_write(struct sh_irda_self *self, u32 offset, u16 data)
> unsigned long flags;
>
> spin_lock_irqsave(&self->lock, flags);
> - iowrite16(data, self->membase + offset);
> + __raw_writew(data, self->membase + offset);
> spin_unlock_irqrestore(&self->lock, flags);
Every platform, including "sh", provides ioread16() and iowrite16().
So changing this is not part of "fixup build error" as your commit
message states.
If this change is needed, it should be in a seperate commit and with
a proper explanation in the commit message.
^ permalink raw reply
* Re: [RFC PATCH] tcp: Replace possible syn attack msg by counters
From: David Miller @ 2011-08-11 6:13 UTC (permalink / raw)
To: therbert; +Cc: netdev
In-Reply-To: <alpine.DEB.2.00.1108102229130.5341@pokey.mtv.corp.google.com>
From: Tom Herbert <therbert@google.com>
Date: Wed, 10 Aug 2011 22:38:02 -0700 (PDT)
> Rather than printing the message to the log, use a mib counter to keep
> track of the count of occurences of syn cookies being used or syn
> being dropped when request queue is full.
>
> Rationale is these messages can fill up /var/log/messages on server
> which is simply under heavy load... I'm not sure how much more useful
> they would be in identifying a server DOS attack (compared to
> counters).
>
> Signed-off-by: Tom Herbert <therbert@google.com>
Print the message once, and also do the counters.
Say something like "Possible SYN flooding, see SNMP counters." or
similar.
Because if people are grepping for that message in their logs, they
will now have a false sense of confidence seeing it not being there
any more.
^ permalink raw reply
* [RFC PATCH] tcp: Replace possible syn attack msg by counters
From: Tom Herbert @ 2011-08-11 5:38 UTC (permalink / raw)
To: davem, netdev
Rather than printing the message to the log, use a mib counter to keep
track of the count of occurences of syn cookies being used or syn
being dropped when request queue is full.
Rationale is these messages can fill up /var/log/messages on server
which is simply under heavy load... I'm not sure how much more useful
they would be in identifying a server DOS attack (compared to
counters).
Signed-off-by: Tom Herbert <therbert@google.com>
---
include/linux/snmp.h | 2 ++
net/ipv4/proc.c | 2 ++
net/ipv4/tcp_ipv4.c | 30 +++++++++---------------------
net/ipv6/tcp_ipv6.c | 29 +++++++++--------------------
4 files changed, 22 insertions(+), 41 deletions(-)
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index 12b2b18..e16557a 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -231,6 +231,8 @@ enum
LINUX_MIB_TCPDEFERACCEPTDROP,
LINUX_MIB_IPRPFILTER, /* IP Reverse Path Filter (rp_filter) */
LINUX_MIB_TCPTIMEWAITOVERFLOW, /* TCPTimeWaitOverflow */
+ LINUX_MIB_TCPREQQFULLDOCOOKIES, /* TCPReqQFullDoCookies */
+ LINUX_MIB_TCPREQQFULLDROP, /* TCPReqQFullDrop */
__LINUX_MIB_MAX
};
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index b14ec7d..4bfad5d 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -254,6 +254,8 @@ static const struct snmp_mib snmp4_net_list[] = {
SNMP_MIB_ITEM("TCPDeferAcceptDrop", LINUX_MIB_TCPDEFERACCEPTDROP),
SNMP_MIB_ITEM("IPReversePathFilter", LINUX_MIB_IPRPFILTER),
SNMP_MIB_ITEM("TCPTimeWaitOverflow", LINUX_MIB_TCPTIMEWAITOVERFLOW),
+ SNMP_MIB_ITEM("TCPReqQFullDoCookies", LINUX_MIB_TCPREQQFULLDOCOOKIES),
+ SNMP_MIB_ITEM("TCPReqQFullDrop", LINUX_MIB_TCPREQQFULLDROP),
SNMP_MIB_SENTINEL
};
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 955b8e6..f36ab28 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -807,21 +807,6 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req)
kfree(inet_rsk(req)->opt);
}
-static void syn_flood_warning(const struct sk_buff *skb)
-{
- const char *msg;
-
-#ifdef CONFIG_SYN_COOKIES
- if (sysctl_tcp_syncookies)
- msg = "Sending cookies";
- else
-#endif
- msg = "Dropping request";
-
- pr_info("TCP: Possible SYN flooding on port %d. %s.\n",
- ntohs(tcp_hdr(skb)->dest), msg);
-}
-
/*
* Save and compile IPv4 options into the request_sock if needed.
*/
@@ -1249,14 +1234,17 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
* evidently real one.
*/
if (inet_csk_reqsk_queue_is_full(sk) && !isn) {
- if (net_ratelimit())
- syn_flood_warning(skb);
#ifdef CONFIG_SYN_COOKIES
- if (sysctl_tcp_syncookies) {
- want_cookie = 1;
- } else
+ want_cookie = sysctl_tcp_syncookies;
#endif
- goto drop;
+ if (want_cookie)
+ NET_INC_STATS_BH(sock_net(sk),
+ LINUX_MIB_TCPREQQFULLDOCOOKIES);
+ else {
+ NET_INC_STATS_BH(sock_net(sk),
+ LINUX_MIB_TCPREQQFULLDROP);
+ goto drop;
+ }
}
/* Accept backlog is full. If we have already queued enough
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 78aa534..810ae64 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -530,20 +530,6 @@ static int tcp_v6_rtx_synack(struct sock *sk, struct request_sock *req,
return tcp_v6_send_synack(sk, req, rvp);
}
-static inline void syn_flood_warning(struct sk_buff *skb)
-{
-#ifdef CONFIG_SYN_COOKIES
- if (sysctl_tcp_syncookies)
- printk(KERN_INFO
- "TCPv6: Possible SYN flooding on port %d. "
- "Sending cookies.\n", ntohs(tcp_hdr(skb)->dest));
- else
-#endif
- printk(KERN_INFO
- "TCPv6: Possible SYN flooding on port %d. "
- "Dropping request.\n", ntohs(tcp_hdr(skb)->dest));
-}
-
static void tcp_v6_reqsk_destructor(struct request_sock *req)
{
kfree_skb(inet6_rsk(req)->pktopts);
@@ -1191,14 +1177,17 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
goto drop;
if (inet_csk_reqsk_queue_is_full(sk) && !isn) {
- if (net_ratelimit())
- syn_flood_warning(skb);
#ifdef CONFIG_SYN_COOKIES
- if (sysctl_tcp_syncookies)
- want_cookie = 1;
- else
+ want_cookie = sysctl_tcp_syncookies;
#endif
- goto drop;
+ if (want_cookie)
+ NET_INC_STATS_BH(sock_net(sk),
+ LINUX_MIB_TCPREQQFULLDOCOOKIES);
+ else {
+ NET_INC_STATS_BH(sock_net(sk),
+ LINUX_MIB_TCPREQQFULLDROP);
+ goto drop;
+ }
}
if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1)
--
1.7.3.1
^ permalink raw reply related
* Re: [net-next 00/10] drivers/net/ organize Ethernet drivers
From: Jeff Kirsher @ 2011-08-11 5:24 UTC (permalink / raw)
To: David Miller
Cc: netdev@vger.kernel.org, gospo@tredhat.com, sassmann@redhat.com
In-Reply-To: <20110810.220822.781839847644610294.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 979 bytes --]
On Wed, 2011-08-10 at 22:08 -0700, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed, 10 Aug 2011 20:27:48 -0700
>
> > This is the first of seven 10 patch series to move the Ethernet
> > drivers into drivers/net/ethernet/
> >
> > The following are changes since commit 19fd61785a580c60cba900c5171bfadb57dd5056:
> > Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
> > and are available in the git repository at:
> > master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master
>
> Pulled, thanks Jeff.
>
> I'll push this back out to net-next after some build validation.
As an FYI, I have had Aaron Brown test the Kconfig and compile options
on this series (as well as the remaining 60+ patches) over the last
several days while I was out and so far there have been no issues.
The more eyes the better though, thanks. I will start to prepare the
second 10 patch series.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
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