Skip to content

Commit

Permalink
acenic: Move the Alteon driver
Browse files Browse the repository at this point in the history
Based on feedback from Alan Cox, the acenic driver moved to
drivers/net/ethernet/alteon/ and made the necessary Kconfig and
Makefile changes.

CC: Jes Sorensen <jes@trained-monkey.org>
CC: Alan Cox <alan@linux.intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Jeff Kirsher committed Aug 13, 2011
1 parent cdd80bd commit 531c4f8
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 29 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ ACENIC DRIVER
M: Jes Sorensen <jes@trained-monkey.org>
L: linux-acenic@sunsite.dk
S: Maintained
F: drivers/net/ethernet/3com/acenic*
F: drivers/net/ethernet/alteon/acenic*

ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
M: Peter Feuerer <peter@piie.net>
Expand Down
27 changes: 0 additions & 27 deletions drivers/net/ethernet/3com/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -117,31 +117,4 @@ config TYPHOON
To compile this driver as a module, choose M here. The module
will be called typhoon.

config ACENIC
tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
depends on PCI
---help---
Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
adapter. The driver allows for using the Jumbo Frame option (9000
bytes/frame) however it requires that your switches can handle this
as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
line.

To compile this driver as a module, choose M here: the
module will be called acenic.

config ACENIC_OMIT_TIGON_I
bool "Omit support for old Tigon I based AceNICs"
depends on ACENIC
---help---
Say Y here if you only have Tigon II based AceNICs and want to leave
out support for the older Tigon I based cards which are no longer
being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
version)). This will reduce the size of the driver object by
app. 100KB. If you are not sure whether your card is a Tigon I or a
Tigon II, say N here.

The safe and default value for this is N.

endif # NET_VENDOR_3COM
1 change: 0 additions & 1 deletion drivers/net/ethernet/3com/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ obj-$(CONFIG_3C515) += 3c515.o
obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o
obj-$(CONFIG_VORTEX) += 3c59x.o
obj-$(CONFIG_ACENIC) += acenic.o
obj-$(CONFIG_TYPHOON) += typhoon.o
1 change: 1 addition & 0 deletions drivers/net/ethernet/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ if ETHERNET
source "drivers/net/ethernet/3com/Kconfig"
source "drivers/net/ethernet/adaptec/Kconfig"
source "drivers/net/ethernet/aeroflex/Kconfig"
source "drivers/net/ethernet/alteon/Kconfig"
source "drivers/net/ethernet/amd/Kconfig"
source "drivers/net/ethernet/apple/Kconfig"
source "drivers/net/ethernet/atheros/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/net/ethernet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
obj-$(CONFIG_NET_VENDOR_8390) += 8390/
obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/
obj-$(CONFIG_GRETH) += aeroflex/
obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
Expand Down
47 changes: 47 additions & 0 deletions drivers/net/ethernet/alteon/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#
# Alteon network device configuration
#

config NET_VENDOR_ALTEON
bool "Alteon devices"
depends on PCI
---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 Alteon cards. If you say Y, you will be asked for
your specific card in the following questions.

if NET_VENDOR_ALTEON

config ACENIC
tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
depends on PCI
---help---
Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
adapter. The driver allows for using the Jumbo Frame option (9000
bytes/frame) however it requires that your switches can handle this
as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
line.

To compile this driver as a module, choose M here: the
module will be called acenic.

config ACENIC_OMIT_TIGON_I
bool "Omit support for old Tigon I based AceNICs"
depends on ACENIC
---help---
Say Y here if you only have Tigon II based AceNICs and want to leave
out support for the older Tigon I based cards which are no longer
being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
version)). This will reduce the size of the driver object by
app. 100KB. If you are not sure whether your card is a Tigon I or a
Tigon II, say N here.

The safe and default value for this is N.

endif # NET_VENDOR_ALTEON
5 changes: 5 additions & 0 deletions drivers/net/ethernet/alteon/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# Makefile for the Alteon network device drivers.
#

obj-$(CONFIG_ACENIC) += acenic.o
File renamed without changes.
File renamed without changes.

0 comments on commit 531c4f8

Please sign in to comment.