Skip to content

Commit 4a71df5

Browse files
Frank BlaschkaJeff Garzik
authored andcommitted
qeth: new qeth device driver
List of major changes and improvements: no manipulation of the global ARP constructor clean code split into core, layer 2 and layer 3 functionality better exploitation of the ethtool interface better representation of the various hardware capabilities fix packet socket support (tcpdump), no fake_ll required osasnmpd notification via udev events coding style and beautification Signed-off-by: Frank Blaschka <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
1 parent 0488594 commit 4a71df5

File tree

14 files changed

+13498
-21
lines changed

14 files changed

+13498
-21
lines changed

arch/s390/defconfig

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -537,11 +537,9 @@ CONFIG_CTC=m
537537
# CONFIG_SMSGIUCV is not set
538538
# CONFIG_CLAW is not set
539539
CONFIG_QETH=y
540-
541-
#
542-
# Gigabit Ethernet default settings
543-
#
544-
# CONFIG_QETH_IPV6 is not set
540+
CONFIG_QETH_L2=y
541+
CONFIG_QETH_L3=y
542+
CONFIG_QETH_IPV6=y
545543
CONFIG_CCWGROUP=y
546544
# CONFIG_PPP is not set
547545
# CONFIG_SLIP is not set

drivers/s390/net/Kconfig

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,26 @@ config QETH
6767
To compile this driver as a module, choose M.
6868
The module name is qeth.ko.
6969

70+
config QETH_L2
71+
tristate "qeth layer 2 device support"
72+
depends on QETH
73+
help
74+
Select this option to be able to run qeth devices in layer 2 mode.
75+
To compile as a module, choose M. The module name is qeth_l2.ko.
76+
If unsure, choose y.
7077

71-
comment "Gigabit Ethernet default settings"
72-
depends on QETH
78+
config QETH_L3
79+
tristate "qeth layer 3 device support"
80+
depends on QETH
81+
help
82+
Select this option to be able to run qeth devices in layer 3 mode.
83+
To compile as a module choose M. The module name is qeth_l3.ko.
84+
If unsure, choose Y.
7385

7486
config QETH_IPV6
75-
bool "IPv6 support for gigabit ethernet"
76-
depends on (QETH = IPV6) || (QETH && IPV6 = 'y')
77-
help
78-
If CONFIG_QETH is switched on, this option will include IPv6
79-
support in the qeth device driver.
80-
81-
config QETH_VLAN
82-
bool "VLAN support for gigabit ethernet"
83-
depends on (QETH = VLAN_8021Q) || (QETH && VLAN_8021Q = 'y')
84-
help
85-
If CONFIG_QETH is switched on, this option will include IEEE
86-
802.1q VLAN support in the qeth device driver.
87+
bool
88+
depends on (QETH_L3 = IPV6) || (QETH_L3 && IPV6 = 'y')
89+
default y
8790

8891
config CCWGROUP
8992
tristate

drivers/s390/net/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o
88
obj-$(CONFIG_SMSGIUCV) += smsgiucv.o
99
obj-$(CONFIG_LCS) += lcs.o cu3088.o
1010
obj-$(CONFIG_CLAW) += claw.o cu3088.o
11-
qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o
12-
qeth-$(CONFIG_PROC_FS) += qeth_proc.o
11+
qeth-y += qeth_core_sys.o qeth_core_main.o qeth_core_mpc.o qeth_core_offl.o
1312
obj-$(CONFIG_QETH) += qeth.o
13+
qeth_l2-y += qeth_l2_main.o
14+
obj-$(CONFIG_QETH_L2) += qeth_l2.o
15+
qeth_l3-y += qeth_l3_main.o qeth_l3_sys.o
16+
obj-$(CONFIG_QETH_L3) += qeth_l3.o

0 commit comments

Comments
 (0)