diff options
-rw-r--r-- | MAINTAINERS | 4 | ||||
-rw-r--r-- | drivers/net/Kconfig | 26 | ||||
-rw-r--r-- | drivers/net/Makefile | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/Kconfig | 47 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/Makefile | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/Makefile (renamed from drivers/net/ehea/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea.h (renamed from drivers/net/ehea/ehea.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_ethtool.c (renamed from drivers/net/ehea/ehea_ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_hw.h (renamed from drivers/net/ehea/ehea_hw.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c (renamed from drivers/net/ehea/ehea_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_phyp.c (renamed from drivers/net/ehea/ehea_phyp.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_phyp.h (renamed from drivers/net/ehea/ehea_phyp.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_qmr.c (renamed from drivers/net/ehea/ehea_qmr.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_qmr.h (renamed from drivers/net/ehea/ehea_qmr.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/Kconfig (renamed from drivers/net/ibm_newemac/Kconfig) | 40 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/Makefile (renamed from drivers/net/ibm_newemac/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/core.c (renamed from drivers/net/ibm_newemac/core.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/core.h (renamed from drivers/net/ibm_newemac/core.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/debug.c (renamed from drivers/net/ibm_newemac/debug.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/debug.h (renamed from drivers/net/ibm_newemac/debug.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/emac.h (renamed from drivers/net/ibm_newemac/emac.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/mal.c (renamed from drivers/net/ibm_newemac/mal.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/mal.h (renamed from drivers/net/ibm_newemac/mal.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/phy.c (renamed from drivers/net/ibm_newemac/phy.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/phy.h (renamed from drivers/net/ibm_newemac/phy.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/rgmii.c (renamed from drivers/net/ibm_newemac/rgmii.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/rgmii.h (renamed from drivers/net/ibm_newemac/rgmii.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/tah.c (renamed from drivers/net/ibm_newemac/tah.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/tah.h (renamed from drivers/net/ibm_newemac/tah.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/zmii.c (renamed from drivers/net/ibm_newemac/zmii.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/zmii.h (renamed from drivers/net/ibm_newemac/zmii.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ibmveth.c (renamed from drivers/net/ibmveth.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ibmveth.h (renamed from drivers/net/ibmveth.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/iseries_veth.c (renamed from drivers/net/iseries_veth.c) | 0 |
36 files changed, 79 insertions, 52 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bcfc144e96a1..2fcfa8b02d90 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2465,7 +2465,7 @@ EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER | |||
2465 | M: Breno Leitao <leitao@linux.vnet.ibm.com> | 2465 | M: Breno Leitao <leitao@linux.vnet.ibm.com> |
2466 | L: netdev@vger.kernel.org | 2466 | L: netdev@vger.kernel.org |
2467 | S: Maintained | 2467 | S: Maintained |
2468 | F: drivers/net/ehea/ | 2468 | F: drivers/net/ethernet/ibm/ehea/ |
2469 | 2469 | ||
2470 | EMBEDDED LINUX | 2470 | EMBEDDED LINUX |
2471 | M: Paul Gortmaker <paul.gortmaker@windriver.com> | 2471 | M: Paul Gortmaker <paul.gortmaker@windriver.com> |
@@ -3163,7 +3163,7 @@ IBM Power Virtual Ethernet Device Driver | |||
3163 | M: Santiago Leon <santil@linux.vnet.ibm.com> | 3163 | M: Santiago Leon <santil@linux.vnet.ibm.com> |
3164 | L: netdev@vger.kernel.org | 3164 | L: netdev@vger.kernel.org |
3165 | S: Supported | 3165 | S: Supported |
3166 | F: drivers/net/ibmveth.* | 3166 | F: drivers/net/ethernet/ibm/ibmveth.* |
3167 | 3167 | ||
3168 | IBM ServeRAID RAID DRIVER | 3168 | IBM ServeRAID RAID DRIVER |
3169 | P: Jack Hammer | 3169 | P: Jack Hammer |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3e216b3ed100..116f7442e70c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -627,18 +627,6 @@ config IBMLANA | |||
627 | boards with this driver should be possible, but has not been tested | 627 | boards with this driver should be possible, but has not been tested |
628 | up to now due to lack of hardware. | 628 | up to now due to lack of hardware. |
629 | 629 | ||
630 | config IBMVETH | ||
631 | tristate "IBM LAN Virtual Ethernet support" | ||
632 | depends on PPC_PSERIES | ||
633 | ---help--- | ||
634 | This driver supports virtual ethernet adapters on newer IBM iSeries | ||
635 | and pSeries systems. | ||
636 | |||
637 | To compile this driver as a module, choose M here. The module will | ||
638 | be called ibmveth. | ||
639 | |||
640 | source "drivers/net/ibm_newemac/Kconfig" | ||
641 | |||
642 | config NET_PCI | 630 | config NET_PCI |
643 | bool "EISA, VLB, PCI and on board controllers" | 631 | bool "EISA, VLB, PCI and on board controllers" |
644 | depends on ISA || EISA || PCI | 632 | depends on ISA || EISA || PCI |
@@ -1469,16 +1457,6 @@ if NETDEV_10000 | |||
1469 | config MDIO | 1457 | config MDIO |
1470 | tristate | 1458 | tristate |
1471 | 1459 | ||
1472 | config EHEA | ||
1473 | tristate "eHEA Ethernet support" | ||
1474 | depends on IBMEBUS && INET && SPARSEMEM | ||
1475 | select INET_LRO | ||
1476 | ---help--- | ||
1477 | This driver supports the IBM pSeries eHEA ethernet adapter. | ||
1478 | |||
1479 | To compile the driver as a module, choose M here. The module | ||
1480 | will be called ehea. | ||
1481 | |||
1482 | config ENIC | 1460 | config ENIC |
1483 | tristate "Cisco VIC Ethernet NIC Support" | 1461 | tristate "Cisco VIC Ethernet NIC Support" |
1484 | depends on PCI && INET | 1462 | depends on PCI && INET |
@@ -1573,10 +1551,6 @@ config XEN_NETDEV_BACKEND | |||
1573 | compile this driver as a module, chose M here: the module | 1551 | compile this driver as a module, chose M here: the module |
1574 | will be called xen-netback. | 1552 | will be called xen-netback. |
1575 | 1553 | ||
1576 | config ISERIES_VETH | ||
1577 | tristate "iSeries Virtual Ethernet driver support" | ||
1578 | depends on PPC_ISERIES | ||
1579 | |||
1580 | config RIONET | 1554 | config RIONET |
1581 | tristate "RapidIO Ethernet over messaging driver support" | 1555 | tristate "RapidIO Ethernet over messaging driver support" |
1582 | depends on RAPIDIO | 1556 | depends on RAPIDIO |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index d28c153e2143..54146ed625b7 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -10,9 +10,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o | |||
10 | obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o | 10 | obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o |
11 | obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o | 11 | obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o |
12 | 12 | ||
13 | obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/ | ||
14 | obj-$(CONFIG_IP1000) += ipg.o | 13 | obj-$(CONFIG_IP1000) += ipg.o |
15 | obj-$(CONFIG_EHEA) += ehea/ | ||
16 | obj-$(CONFIG_CAN) += can/ | 14 | obj-$(CONFIG_CAN) += can/ |
17 | obj-$(CONFIG_BONDING) += bonding/ | 15 | obj-$(CONFIG_BONDING) += bonding/ |
18 | obj-$(CONFIG_ATL1) += atlx/ | 16 | obj-$(CONFIG_ATL1) += atlx/ |
@@ -50,7 +48,6 @@ obj-$(CONFIG_SIS190) += sis190.o | |||
50 | obj-$(CONFIG_SIS900) += sis900.o | 48 | obj-$(CONFIG_SIS900) += sis900.o |
51 | obj-$(CONFIG_R6040) += r6040.o | 49 | obj-$(CONFIG_R6040) += r6040.o |
52 | obj-$(CONFIG_YELLOWFIN) += yellowfin.o | 50 | obj-$(CONFIG_YELLOWFIN) += yellowfin.o |
53 | obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o | ||
54 | obj-$(CONFIG_NATSEMI) += natsemi.o | 51 | obj-$(CONFIG_NATSEMI) += natsemi.o |
55 | obj-$(CONFIG_NS83820) += ns83820.o | 52 | obj-$(CONFIG_NS83820) += ns83820.o |
56 | obj-$(CONFIG_FEALNX) += fealnx.o | 53 | obj-$(CONFIG_FEALNX) += fealnx.o |
@@ -148,7 +145,6 @@ obj-$(CONFIG_VETH) += veth.o | |||
148 | obj-$(CONFIG_NET_NETX) += netx-eth.o | 145 | obj-$(CONFIG_NET_NETX) += netx-eth.o |
149 | obj-$(CONFIG_DL2K) += dl2k.o | 146 | obj-$(CONFIG_DL2K) += dl2k.o |
150 | obj-$(CONFIG_R8169) += r8169.o | 147 | obj-$(CONFIG_R8169) += r8169.o |
151 | obj-$(CONFIG_IBMVETH) += ibmveth.o | ||
152 | obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o | 148 | obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o |
153 | obj-$(CONFIG_BFIN_MAC) += bfin_mac.o | 149 | obj-$(CONFIG_BFIN_MAC) += bfin_mac.o |
154 | obj-$(CONFIG_DM9000) += dm9000.o | 150 | obj-$(CONFIG_DM9000) += dm9000.o |
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 1a39ec07b025..f23f1b26b64e 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig | |||
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/brocade/Kconfig" | |||
19 | source "drivers/net/ethernet/chelsio/Kconfig" | 19 | source "drivers/net/ethernet/chelsio/Kconfig" |
20 | source "drivers/net/ethernet/emulex/Kconfig" | 20 | source "drivers/net/ethernet/emulex/Kconfig" |
21 | source "drivers/net/ethernet/neterion/Kconfig" | 21 | source "drivers/net/ethernet/neterion/Kconfig" |
22 | source "drivers/net/ethernet/ibm/Kconfig" | ||
22 | source "drivers/net/ethernet/intel/Kconfig" | 23 | source "drivers/net/ethernet/intel/Kconfig" |
23 | source "drivers/net/ethernet/i825xx/Kconfig" | 24 | source "drivers/net/ethernet/i825xx/Kconfig" |
24 | source "drivers/net/ethernet/mellanox/Kconfig" | 25 | source "drivers/net/ethernet/mellanox/Kconfig" |
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 4c21e8fac51d..27e4da658136 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile | |||
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/ | |||
10 | obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ | 10 | obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ |
11 | obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/ | 11 | obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/ |
12 | obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/ | 12 | obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/ |
13 | obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ | ||
13 | obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ | 14 | obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ |
14 | obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ | 15 | obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ |
15 | obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ | 16 | obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ |
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig new file mode 100644 index 000000000000..4c7ef980f1c6 --- /dev/null +++ b/drivers/net/ethernet/ibm/Kconfig | |||
@@ -0,0 +1,47 @@ | |||
1 | # | ||
2 | # IBM device configuration. | ||
3 | # | ||
4 | |||
5 | config NET_VENDOR_IBM | ||
6 | bool "IBM devices" | ||
7 | depends on MCA || PPC_PSERIES || PPC_PSERIES || PPC_DCR || \ | ||
8 | (IBMEBUS && INET && SPARSEMEM) | ||
9 | ---help--- | ||
10 | If you have a network (Ethernet) card belonging to this class, say Y | ||
11 | and read the Ethernet-HOWTO, available from | ||
12 | <http://www.tldp.org/docs.html#howto>. | ||
13 | |||
14 | Note that the answer to this question doesn't directly affect the | ||
15 | kernel: saying N will just cause the configurator to skip all | ||
16 | the questions about IBM devices. If you say Y, you will be asked for | ||
17 | your specific card in the following questions. | ||
18 | |||
19 | if NET_VENDOR_IBM | ||
20 | |||
21 | config IBMVETH | ||
22 | tristate "IBM LAN Virtual Ethernet support" | ||
23 | depends on PPC_PSERIES | ||
24 | ---help--- | ||
25 | This driver supports virtual ethernet adapters on newer IBM iSeries | ||
26 | and pSeries systems. | ||
27 | |||
28 | To compile this driver as a module, choose M here. The module will | ||
29 | be called ibmveth. | ||
30 | |||
31 | config ISERIES_VETH | ||
32 | tristate "iSeries Virtual Ethernet driver support" | ||
33 | depends on PPC_ISERIES | ||
34 | |||
35 | source "drivers/net/ethernet/ibm/emac/Kconfig" | ||
36 | |||
37 | config EHEA | ||
38 | tristate "eHEA Ethernet support" | ||
39 | depends on IBMEBUS && INET && SPARSEMEM | ||
40 | select INET_LRO | ||
41 | ---help--- | ||
42 | This driver supports the IBM pSeries eHEA ethernet adapter. | ||
43 | |||
44 | To compile the driver as a module, choose M here. The module | ||
45 | will be called ehea. | ||
46 | |||
47 | endif # NET_VENDOR_IBM | ||
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile new file mode 100644 index 000000000000..5a7d4e9ac803 --- /dev/null +++ b/drivers/net/ethernet/ibm/Makefile | |||
@@ -0,0 +1,8 @@ | |||
1 | # | ||
2 | # Makefile for th IBM network device drivers. | ||
3 | # | ||
4 | |||
5 | obj-$(CONFIG_IBMVETH) += ibmveth.o | ||
6 | obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o | ||
7 | obj-$(CONFIG_IBM_EMAC) += emac/ | ||
8 | obj-$(CONFIG_EHEA) += ehea/ | ||
diff --git a/drivers/net/ehea/Makefile b/drivers/net/ethernet/ibm/ehea/Makefile index 775d9969b5c2..775d9969b5c2 100644 --- a/drivers/net/ehea/Makefile +++ b/drivers/net/ethernet/ibm/ehea/Makefile | |||
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h index 7dd5e6a0d998..7dd5e6a0d998 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ethernet/ibm/ehea/ehea.h | |||
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c index 7f642aef5e82..7f642aef5e82 100644 --- a/drivers/net/ehea/ehea_ethtool.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | |||
diff --git a/drivers/net/ehea/ehea_hw.h b/drivers/net/ethernet/ibm/ehea/ehea_hw.h index 567981b4b2cc..567981b4b2cc 100644 --- a/drivers/net/ehea/ehea_hw.h +++ b/drivers/net/ethernet/ibm/ehea/ehea_hw.h | |||
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index be2cb4ab8b4f..be2cb4ab8b4f 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c index 0506967b9044..0506967b9044 100644 --- a/drivers/net/ehea/ehea_phyp.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c | |||
diff --git a/drivers/net/ehea/ehea_phyp.h b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h index 2f8174c248bc..2f8174c248bc 100644 --- a/drivers/net/ehea/ehea_phyp.h +++ b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h | |||
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c index 95b9f4fa811e..95b9f4fa811e 100644 --- a/drivers/net/ehea/ehea_qmr.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c | |||
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h index fddff8ec8cfd..fddff8ec8cfd 100644 --- a/drivers/net/ehea/ehea_qmr.h +++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h | |||
diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ethernet/ibm/emac/Kconfig index 78a1628c9892..3f44a30e0615 100644 --- a/drivers/net/ibm_newemac/Kconfig +++ b/drivers/net/ethernet/ibm/emac/Kconfig | |||
@@ -1,4 +1,4 @@ | |||
1 | config IBM_NEW_EMAC | 1 | config IBM_EMAC |
2 | tristate "IBM EMAC Ethernet support" | 2 | tristate "IBM EMAC Ethernet support" |
3 | depends on PPC_DCR | 3 | depends on PPC_DCR |
4 | select CRC32 | 4 | select CRC32 |
@@ -7,29 +7,29 @@ config IBM_NEW_EMAC | |||
7 | typically found on 4xx embedded PowerPC chips, but also on the | 7 | typically found on 4xx embedded PowerPC chips, but also on the |
8 | Axon southbridge for Cell. | 8 | Axon southbridge for Cell. |
9 | 9 | ||
10 | config IBM_NEW_EMAC_RXB | 10 | config IBM_EMAC_RXB |
11 | int "Number of receive buffers" | 11 | int "Number of receive buffers" |
12 | depends on IBM_NEW_EMAC | 12 | depends on IBM_EMAC |
13 | default "128" | 13 | default "128" |
14 | 14 | ||
15 | config IBM_NEW_EMAC_TXB | 15 | config IBM_EMAC_TXB |
16 | int "Number of transmit buffers" | 16 | int "Number of transmit buffers" |
17 | depends on IBM_NEW_EMAC | 17 | depends on IBM_EMAC |
18 | default "64" | 18 | default "64" |
19 | 19 | ||
20 | config IBM_NEW_EMAC_POLL_WEIGHT | 20 | config IBM_EMAC_POLL_WEIGHT |
21 | int "MAL NAPI polling weight" | 21 | int "MAL NAPI polling weight" |
22 | depends on IBM_NEW_EMAC | 22 | depends on IBM_EMAC |
23 | default "32" | 23 | default "32" |
24 | 24 | ||
25 | config IBM_NEW_EMAC_RX_COPY_THRESHOLD | 25 | config IBM_EMAC_RX_COPY_THRESHOLD |
26 | int "RX skb copy threshold (bytes)" | 26 | int "RX skb copy threshold (bytes)" |
27 | depends on IBM_NEW_EMAC | 27 | depends on IBM_EMAC |
28 | default "256" | 28 | default "256" |
29 | 29 | ||
30 | config IBM_NEW_EMAC_RX_SKB_HEADROOM | 30 | config IBM_EMAC_RX_SKB_HEADROOM |
31 | int "Additional RX skb headroom (bytes)" | 31 | int "Additional RX skb headroom (bytes)" |
32 | depends on IBM_NEW_EMAC | 32 | depends on IBM_EMAC |
33 | default "0" | 33 | default "0" |
34 | help | 34 | help |
35 | Additional receive skb headroom. Note, that driver | 35 | Additional receive skb headroom. Note, that driver |
@@ -39,38 +39,38 @@ config IBM_NEW_EMAC_RX_SKB_HEADROOM | |||
39 | 39 | ||
40 | If unsure, set to 0. | 40 | If unsure, set to 0. |
41 | 41 | ||
42 | config IBM_NEW_EMAC_DEBUG | 42 | config IBM_EMAC_DEBUG |
43 | bool "Debugging" | 43 | bool "Debugging" |
44 | depends on IBM_NEW_EMAC | 44 | depends on IBM_EMAC |
45 | default n | 45 | default n |
46 | 46 | ||
47 | # The options below has to be select'ed by the respective | 47 | # The options below has to be select'ed by the respective |
48 | # processor types or platforms | 48 | # processor types or platforms |
49 | 49 | ||
50 | config IBM_NEW_EMAC_ZMII | 50 | config IBM_EMAC_ZMII |
51 | bool | 51 | bool |
52 | default n | 52 | default n |
53 | 53 | ||
54 | config IBM_NEW_EMAC_RGMII | 54 | config IBM_EMAC_RGMII |
55 | bool | 55 | bool |
56 | default n | 56 | default n |
57 | 57 | ||
58 | config IBM_NEW_EMAC_TAH | 58 | config IBM_EMAC_TAH |
59 | bool | 59 | bool |
60 | default n | 60 | default n |
61 | 61 | ||
62 | config IBM_NEW_EMAC_EMAC4 | 62 | config IBM_EMAC_EMAC4 |
63 | bool | 63 | bool |
64 | default n | 64 | default n |
65 | 65 | ||
66 | config IBM_NEW_EMAC_NO_FLOW_CTRL | 66 | config IBM_EMAC_NO_FLOW_CTRL |
67 | bool | 67 | bool |
68 | default n | 68 | default n |
69 | 69 | ||
70 | config IBM_NEW_EMAC_MAL_CLR_ICINTSTAT | 70 | config IBM_EMAC_MAL_CLR_ICINTSTAT |
71 | bool | 71 | bool |
72 | default n | 72 | default n |
73 | 73 | ||
74 | config IBM_NEW_EMAC_MAL_COMMON_ERR | 74 | config IBM_EMAC_MAL_COMMON_ERR |
75 | bool | 75 | bool |
76 | default n | 76 | default n |
diff --git a/drivers/net/ibm_newemac/Makefile b/drivers/net/ethernet/ibm/emac/Makefile index 0b5c99512762..0b5c99512762 100644 --- a/drivers/net/ibm_newemac/Makefile +++ b/drivers/net/ethernet/ibm/emac/Makefile | |||
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ethernet/ibm/emac/core.c index 70cb7d8a3b53..70cb7d8a3b53 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c | |||
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ethernet/ibm/emac/core.h index 4fec0844d59d..4fec0844d59d 100644 --- a/drivers/net/ibm_newemac/core.h +++ b/drivers/net/ethernet/ibm/emac/core.h | |||
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ethernet/ibm/emac/debug.c index 8c6c1e2a8750..8c6c1e2a8750 100644 --- a/drivers/net/ibm_newemac/debug.c +++ b/drivers/net/ethernet/ibm/emac/debug.c | |||
diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ethernet/ibm/emac/debug.h index e596c77ccdf7..e596c77ccdf7 100644 --- a/drivers/net/ibm_newemac/debug.h +++ b/drivers/net/ethernet/ibm/emac/debug.h | |||
diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ethernet/ibm/emac/emac.h index 1568278d759a..1568278d759a 100644 --- a/drivers/net/ibm_newemac/emac.h +++ b/drivers/net/ethernet/ibm/emac/emac.h | |||
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c index d268f404b7b0..d268f404b7b0 100644 --- a/drivers/net/ibm_newemac/mal.c +++ b/drivers/net/ethernet/ibm/emac/mal.c | |||
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ethernet/ibm/emac/mal.h index 66084214bf45..66084214bf45 100644 --- a/drivers/net/ibm_newemac/mal.h +++ b/drivers/net/ethernet/ibm/emac/mal.h | |||
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ethernet/ibm/emac/phy.c index ab4e5969fe65..ab4e5969fe65 100644 --- a/drivers/net/ibm_newemac/phy.c +++ b/drivers/net/ethernet/ibm/emac/phy.c | |||
diff --git a/drivers/net/ibm_newemac/phy.h b/drivers/net/ethernet/ibm/emac/phy.h index 5d2bf4cbe50b..5d2bf4cbe50b 100644 --- a/drivers/net/ibm_newemac/phy.h +++ b/drivers/net/ethernet/ibm/emac/phy.h | |||
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c index 4fa53f3def64..4fa53f3def64 100644 --- a/drivers/net/ibm_newemac/rgmii.c +++ b/drivers/net/ethernet/ibm/emac/rgmii.c | |||
diff --git a/drivers/net/ibm_newemac/rgmii.h b/drivers/net/ethernet/ibm/emac/rgmii.h index d69799049865..d69799049865 100644 --- a/drivers/net/ibm_newemac/rgmii.h +++ b/drivers/net/ethernet/ibm/emac/rgmii.h | |||
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c index 5f51bf7c9dc5..5f51bf7c9dc5 100644 --- a/drivers/net/ibm_newemac/tah.c +++ b/drivers/net/ethernet/ibm/emac/tah.c | |||
diff --git a/drivers/net/ibm_newemac/tah.h b/drivers/net/ethernet/ibm/emac/tah.h index 61dbeca006d1..61dbeca006d1 100644 --- a/drivers/net/ibm_newemac/tah.h +++ b/drivers/net/ethernet/ibm/emac/tah.h | |||
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ethernet/ibm/emac/zmii.c index 97449e786d61..97449e786d61 100644 --- a/drivers/net/ibm_newemac/zmii.c +++ b/drivers/net/ethernet/ibm/emac/zmii.c | |||
diff --git a/drivers/net/ibm_newemac/zmii.h b/drivers/net/ethernet/ibm/emac/zmii.h index 1333fa2b2781..1333fa2b2781 100644 --- a/drivers/net/ibm_newemac/zmii.h +++ b/drivers/net/ethernet/ibm/emac/zmii.h | |||
diff --git a/drivers/net/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index ba99af05bf62..ba99af05bf62 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c | |||
diff --git a/drivers/net/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h index 43a794fab9ff..43a794fab9ff 100644 --- a/drivers/net/ibmveth.h +++ b/drivers/net/ethernet/ibm/ibmveth.h | |||
diff --git a/drivers/net/iseries_veth.c b/drivers/net/ethernet/ibm/iseries_veth.c index 53dd39e9130e..53dd39e9130e 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/ethernet/ibm/iseries_veth.c | |||