| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1309010363-22750-22-git-send-email-jeffrey.t.kirsher@intel.com>
Date: Sat, 25 Jun 2011 06:58:32 -0700
From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To: davem@...emloft.net
Cc: Jeff Kirsher <jeffrey.t.kirsher@...el.com>, netdev@...r.kernel.org,
Alexander Indenbaum <baum@...utinetworks.net>,
Andy Gospodarek <andy@...yhouse.net>
Subject: [RFC 21/72] tehuti: Move the Tehuti driver
Move the Tehuti driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.
CC: Alexander Indenbaum <baum@...utinetworks.net>
CC: Andy Gospodarek <andy@...yhouse.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 6 ------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 6 ++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/tehuti.c | 0
drivers/net/{ => ethernet}/tehuti.h | 0
7 files changed, 8 insertions(+), 8 deletions(-)
rename drivers/net/{ => ethernet}/tehuti.c (100%)
rename drivers/net/{ => ethernet}/tehuti.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 65f1282..015e658 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6129,7 +6129,7 @@ M: Alexander Indenbaum <baum@...utinetworks.net>
M: Andy Gospodarek <andy@...yhouse.net>
L: netdev@...r.kernel.org
S: Supported
-F: drivers/net/tehuti*
+F: drivers/net/ethernet/tehuti*
Telecom Clock Driver for MCPL0010
M: Mark Gross <mark.gross@...el.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index de6ff15..1e157e7 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1625,12 +1625,6 @@ if NETDEV_10000
config MDIO
tristate
-config TEHUTI
- tristate "Tehuti Networks 10G Ethernet"
- depends on PCI
- help
- Tehuti Networks 10G Ethernet NIC
-
endif # NETDEV_10000
source "drivers/net/tokenring/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a7bbf98..2c90508 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ATL1E) += atl1e/
obj-$(CONFIG_ATL1C) += atl1c/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
-obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 3174234..74573fa 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -40,4 +40,10 @@ source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/smc/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
+config TEHUTI
+ tristate "Tehuti Networks 10G Ethernet"
+ depends on PCI
+ ---help---
+ Tehuti Networks 10G Ethernet NIC
+
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a7eee02..d98ae32 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SMC) += smc/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
+obj-$(CONFIG_TEHUTI) += tehuti.o
diff --git a/drivers/net/tehuti.c b/drivers/net/ethernet/tehuti.c
similarity index 100%
rename from drivers/net/tehuti.c
rename to drivers/net/ethernet/tehuti.c
diff --git a/drivers/net/tehuti.h b/drivers/net/ethernet/tehuti.h
similarity index 100%
rename from drivers/net/tehuti.h
rename to drivers/net/ethernet/tehuti.h
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists