diff options
-rw-r--r-- | MAINTAINERS | 10 | ||||
-rw-r--r-- | drivers/net/Kconfig | 99 | ||||
-rw-r--r-- | drivers/net/Makefile | 7 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/Kconfig | 119 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/Makefile | 11 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/b44.c (renamed from drivers/net/b44.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/b44.h (renamed from drivers/net/b44.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.c (renamed from drivers/net/bcm63xx_enet.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.h (renamed from drivers/net/bcm63xx_enet.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c (renamed from drivers/net/bnx2.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.h (renamed from drivers/net/bnx2.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2_fw.h (renamed from drivers/net/bnx2_fw.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/Makefile (renamed from drivers/net/bnx2x/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x.h (renamed from drivers/net/bnx2x/bnx2x.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c (renamed from drivers/net/bnx2x/bnx2x_cmn.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h (renamed from drivers/net/bnx2x/bnx2x_cmn.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c (renamed from drivers/net/bnx2x/bnx2x_dcb.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h (renamed from drivers/net/bnx2x/bnx2x_dcb.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h (renamed from drivers/net/bnx2x/bnx2x_dump.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c (renamed from drivers/net/bnx2x/bnx2x_ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h (renamed from drivers/net/bnx2x/bnx2x_fw_defs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h (renamed from drivers/net/bnx2x/bnx2x_fw_file_hdr.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h (renamed from drivers/net/bnx2x/bnx2x_hsi.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h (renamed from drivers/net/bnx2x/bnx2x_init.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h (renamed from drivers/net/bnx2x/bnx2x_init_ops.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c (renamed from drivers/net/bnx2x/bnx2x_link.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h (renamed from drivers/net/bnx2x/bnx2x_link.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c (renamed from drivers/net/bnx2x/bnx2x_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h (renamed from drivers/net/bnx2x/bnx2x_reg.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c (renamed from drivers/net/bnx2x/bnx2x_sp.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h (renamed from drivers/net/bnx2x/bnx2x_sp.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c (renamed from drivers/net/bnx2x/bnx2x_stats.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h (renamed from drivers/net/bnx2x/bnx2x_stats.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c (renamed from drivers/net/cnic.c) | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/cnic.h (renamed from drivers/net/cnic.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/cnic_defs.h (renamed from drivers/net/cnic_defs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/cnic_if.h (renamed from drivers/net/cnic_if.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/sb1250-mac.c (renamed from drivers/net/sb1250-mac.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c (renamed from drivers/net/tg3.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.h (renamed from drivers/net/tg3.h) | 0 | ||||
-rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc.h | 2 | ||||
-rw-r--r-- | drivers/scsi/bnx2i/bnx2i.h | 2 |
44 files changed, 141 insertions, 115 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c6945830ea46..af9de64d89aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1526,27 +1526,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER | |||
1526 | M: Gary Zambrano <zambrano@broadcom.com> | 1526 | M: Gary Zambrano <zambrano@broadcom.com> |
1527 | L: netdev@vger.kernel.org | 1527 | L: netdev@vger.kernel.org |
1528 | S: Supported | 1528 | S: Supported |
1529 | F: drivers/net/b44.* | 1529 | F: drivers/net/ethernet/broadcom/b44.* |
1530 | 1530 | ||
1531 | BROADCOM BNX2 GIGABIT ETHERNET DRIVER | 1531 | BROADCOM BNX2 GIGABIT ETHERNET DRIVER |
1532 | M: Michael Chan <mchan@broadcom.com> | 1532 | M: Michael Chan <mchan@broadcom.com> |
1533 | L: netdev@vger.kernel.org | 1533 | L: netdev@vger.kernel.org |
1534 | S: Supported | 1534 | S: Supported |
1535 | F: drivers/net/bnx2.* | 1535 | F: drivers/net/ethernet/broadcom/bnx2.* |
1536 | F: drivers/net/bnx2_* | 1536 | F: drivers/net/ethernet/broadcom/bnx2_* |
1537 | 1537 | ||
1538 | BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER | 1538 | BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER |
1539 | M: Eilon Greenstein <eilong@broadcom.com> | 1539 | M: Eilon Greenstein <eilong@broadcom.com> |
1540 | L: netdev@vger.kernel.org | 1540 | L: netdev@vger.kernel.org |
1541 | S: Supported | 1541 | S: Supported |
1542 | F: drivers/net/bnx2x/ | 1542 | F: drivers/net/ethernet/broadcom/bnx2x/ |
1543 | 1543 | ||
1544 | BROADCOM TG3 GIGABIT ETHERNET DRIVER | 1544 | BROADCOM TG3 GIGABIT ETHERNET DRIVER |
1545 | M: Matt Carlson <mcarlson@broadcom.com> | 1545 | M: Matt Carlson <mcarlson@broadcom.com> |
1546 | M: Michael Chan <mchan@broadcom.com> | 1546 | M: Michael Chan <mchan@broadcom.com> |
1547 | L: netdev@vger.kernel.org | 1547 | L: netdev@vger.kernel.org |
1548 | S: Supported | 1548 | S: Supported |
1549 | F: drivers/net/tg3.* | 1549 | F: drivers/net/ethernet/broadcom/tg3.* |
1550 | 1550 | ||
1551 | BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER | 1551 | BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER |
1552 | M: Brett Rudley <brudley@broadcom.com> | 1552 | M: Brett Rudley <brudley@broadcom.com> |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c877f4114e04..2f9f208472de 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -997,38 +997,6 @@ config APRICOT | |||
997 | To compile this driver as a module, choose M here. The module | 997 | To compile this driver as a module, choose M here. The module |
998 | will be called apricot. | 998 | will be called apricot. |
999 | 999 | ||
1000 | config B44 | ||
1001 | tristate "Broadcom 440x/47xx ethernet support" | ||
1002 | depends on SSB_POSSIBLE && HAS_DMA | ||
1003 | select SSB | ||
1004 | select MII | ||
1005 | help | ||
1006 | If you have a network (Ethernet) controller of this type, say Y | ||
1007 | or M and read the Ethernet-HOWTO, available from | ||
1008 | <http://www.tldp.org/docs.html#howto>. | ||
1009 | |||
1010 | To compile this driver as a module, choose M here. The module | ||
1011 | will be called b44. | ||
1012 | |||
1013 | # Auto-select SSB PCI-HOST support, if possible | ||
1014 | config B44_PCI_AUTOSELECT | ||
1015 | bool | ||
1016 | depends on B44 && SSB_PCIHOST_POSSIBLE | ||
1017 | select SSB_PCIHOST | ||
1018 | default y | ||
1019 | |||
1020 | # Auto-select SSB PCICORE driver, if possible | ||
1021 | config B44_PCICORE_AUTOSELECT | ||
1022 | bool | ||
1023 | depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE | ||
1024 | select SSB_DRIVER_PCICORE | ||
1025 | default y | ||
1026 | |||
1027 | config B44_PCI | ||
1028 | bool | ||
1029 | depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT | ||
1030 | default y | ||
1031 | |||
1032 | config FORCEDETH | 1000 | config FORCEDETH |
1033 | tristate "nForce Ethernet support" | 1001 | tristate "nForce Ethernet support" |
1034 | depends on NET_PCI && PCI | 1002 | depends on NET_PCI && PCI |
@@ -1465,15 +1433,6 @@ config XILINX_EMACLITE | |||
1465 | help | 1433 | help |
1466 | This driver supports the 10/100 Ethernet Lite from Xilinx. | 1434 | This driver supports the 10/100 Ethernet Lite from Xilinx. |
1467 | 1435 | ||
1468 | config BCM63XX_ENET | ||
1469 | tristate "Broadcom 63xx internal mac support" | ||
1470 | depends on BCM63XX | ||
1471 | select MII | ||
1472 | select PHYLIB | ||
1473 | help | ||
1474 | This driver supports the ethernet MACs in the Broadcom 63xx | ||
1475 | MIPS chipset family (BCM63XX). | ||
1476 | |||
1477 | config FTMAC100 | 1436 | config FTMAC100 |
1478 | tristate "Faraday FTMAC100 10/100 Ethernet support" | 1437 | tristate "Faraday FTMAC100 10/100 Ethernet support" |
1479 | depends on ARM | 1438 | depends on ARM |
@@ -1683,19 +1642,6 @@ config R8169 | |||
1683 | To compile this driver as a module, choose M here: the module | 1642 | To compile this driver as a module, choose M here: the module |
1684 | will be called r8169. This is recommended. | 1643 | will be called r8169. This is recommended. |
1685 | 1644 | ||
1686 | config SB1250_MAC | ||
1687 | tristate "SB1250 Gigabit Ethernet support" | ||
1688 | depends on SIBYTE_SB1xxx_SOC | ||
1689 | select PHYLIB | ||
1690 | ---help--- | ||
1691 | This driver supports Gigabit Ethernet interfaces based on the | ||
1692 | Broadcom SiByte family of System-On-a-Chip parts. They include | ||
1693 | the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455 | ||
1694 | and BCM1480 chips. | ||
1695 | |||
1696 | To compile this driver as a module, choose M here: the module | ||
1697 | will be called sb1250-mac. | ||
1698 | |||
1699 | config SIS190 | 1645 | config SIS190 |
1700 | tristate "SiS190/SiS191 gigabit ethernet support" | 1646 | tristate "SiS190/SiS191 gigabit ethernet support" |
1701 | depends on PCI | 1647 | depends on PCI |
@@ -1789,39 +1735,6 @@ config VIA_VELOCITY | |||
1789 | To compile this driver as a module, choose M here. The module | 1735 | To compile this driver as a module, choose M here. The module |
1790 | will be called via-velocity. | 1736 | will be called via-velocity. |
1791 | 1737 | ||
1792 | config TIGON3 | ||
1793 | tristate "Broadcom Tigon3 support" | ||
1794 | depends on PCI | ||
1795 | select PHYLIB | ||
1796 | help | ||
1797 | This driver supports Broadcom Tigon3 based gigabit Ethernet cards. | ||
1798 | |||
1799 | To compile this driver as a module, choose M here: the module | ||
1800 | will be called tg3. This is recommended. | ||
1801 | |||
1802 | config BNX2 | ||
1803 | tristate "Broadcom NetXtremeII support" | ||
1804 | depends on PCI | ||
1805 | select CRC32 | ||
1806 | select FW_LOADER | ||
1807 | help | ||
1808 | This driver supports Broadcom NetXtremeII gigabit Ethernet cards. | ||
1809 | |||
1810 | To compile this driver as a module, choose M here: the module | ||
1811 | will be called bnx2. This is recommended. | ||
1812 | |||
1813 | config CNIC | ||
1814 | tristate "Broadcom CNIC support" | ||
1815 | depends on PCI | ||
1816 | select BNX2 | ||
1817 | select UIO | ||
1818 | help | ||
1819 | This driver supports offload features of Broadcom NetXtremeII | ||
1820 | gigabit Ethernet cards. | ||
1821 | |||
1822 | To compile this driver as a module, choose M here: the module | ||
1823 | will be called cnic. This is recommended. | ||
1824 | |||
1825 | config SPIDER_NET | 1738 | config SPIDER_NET |
1826 | tristate "Spider Gigabit Ethernet driver" | 1739 | tristate "Spider Gigabit Ethernet driver" |
1827 | depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) | 1740 | depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) |
@@ -2327,18 +2240,6 @@ config TEHUTI | |||
2327 | help | 2240 | help |
2328 | Tehuti Networks 10G Ethernet NIC | 2241 | Tehuti Networks 10G Ethernet NIC |
2329 | 2242 | ||
2330 | config BNX2X | ||
2331 | tristate "Broadcom NetXtremeII 10Gb support" | ||
2332 | depends on PCI | ||
2333 | select FW_LOADER | ||
2334 | select ZLIB_INFLATE | ||
2335 | select LIBCRC32C | ||
2336 | select MDIO | ||
2337 | help | ||
2338 | This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards. | ||
2339 | To compile this driver as a module, choose M here: the module | ||
2340 | will be called bnx2x. This is recommended. | ||
2341 | |||
2342 | config QLCNIC | 2243 | config QLCNIC |
2343 | tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support" | 2244 | tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support" |
2344 | depends on PCI | 2245 | depends on PCI |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 4e8fa7372242..4cc2dcd3e0bd 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -77,10 +77,6 @@ obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o | |||
77 | obj-$(CONFIG_NATSEMI) += natsemi.o | 77 | obj-$(CONFIG_NATSEMI) += natsemi.o |
78 | obj-$(CONFIG_NS83820) += ns83820.o | 78 | obj-$(CONFIG_NS83820) += ns83820.o |
79 | obj-$(CONFIG_FEALNX) += fealnx.o | 79 | obj-$(CONFIG_FEALNX) += fealnx.o |
80 | obj-$(CONFIG_TIGON3) += tg3.o | ||
81 | obj-$(CONFIG_BNX2) += bnx2.o | ||
82 | obj-$(CONFIG_CNIC) += cnic.o | ||
83 | obj-$(CONFIG_BNX2X) += bnx2x/ | ||
84 | spidernet-y += spider_net.o spider_net_ethtool.o | 80 | spidernet-y += spider_net.o spider_net_ethtool.o |
85 | obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o | 81 | obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o |
86 | obj-$(CONFIG_GELIC_NET) += ps3_gelic.o | 82 | obj-$(CONFIG_GELIC_NET) += ps3_gelic.o |
@@ -117,10 +113,7 @@ obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o | |||
117 | ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) | 113 | ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) |
118 | obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o | 114 | obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o |
119 | endif | 115 | endif |
120 | obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o | ||
121 | obj-$(CONFIG_B44) += b44.o | ||
122 | obj-$(CONFIG_FORCEDETH) += forcedeth.o | 116 | obj-$(CONFIG_FORCEDETH) += forcedeth.o |
123 | obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o | ||
124 | obj-$(CONFIG_FTGMAC100) += ftgmac100.o | 117 | obj-$(CONFIG_FTGMAC100) += ftgmac100.o |
125 | obj-$(CONFIG_FTMAC100) += ftmac100.o | 118 | obj-$(CONFIG_FTMAC100) += ftmac100.o |
126 | 119 | ||
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 56ed5ec9a503..772fb49b4b3f 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig | |||
@@ -14,5 +14,6 @@ if ETHERNET | |||
14 | source "drivers/net/ethernet/3com/Kconfig" | 14 | source "drivers/net/ethernet/3com/Kconfig" |
15 | source "drivers/net/ethernet/8390/Kconfig" | 15 | source "drivers/net/ethernet/8390/Kconfig" |
16 | source "drivers/net/ethernet/amd/Kconfig" | 16 | source "drivers/net/ethernet/amd/Kconfig" |
17 | source "drivers/net/ethernet/broadcom/Kconfig" | ||
17 | 18 | ||
18 | endif # ETHERNET | 19 | endif # ETHERNET |
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index fc82588fb2f4..3ef49a2bae06 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile | |||
@@ -5,3 +5,4 @@ | |||
5 | obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ | 5 | obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ |
6 | obj-$(CONFIG_NET_VENDOR_8390) += 8390/ | 6 | obj-$(CONFIG_NET_VENDOR_8390) += 8390/ |
7 | obj-$(CONFIG_NET_VENDOR_AMD) += amd/ | 7 | obj-$(CONFIG_NET_VENDOR_AMD) += amd/ |
8 | obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ | ||
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig new file mode 100644 index 000000000000..8986e57d7f9c --- /dev/null +++ b/drivers/net/ethernet/broadcom/Kconfig | |||
@@ -0,0 +1,119 @@ | |||
1 | # | ||
2 | # Broadcom device configuration | ||
3 | # | ||
4 | |||
5 | config NET_VENDOR_BROADCOM | ||
6 | bool "Broadcom devices" | ||
7 | depends on (SSB_POSSIBLE && HAS_DMA) || PCI || BCM63XX || \ | ||
8 | SIBYTE_SB1xxx_SOC | ||
9 | ---help--- | ||
10 | If you have a network (Ethernet) chipset belonging to this class, | ||
11 | say Y. | ||
12 | |||
13 | Note that the answer to this question does not directly affect | ||
14 | the kernel: saying N will just case the configurator to skip all | ||
15 | the questions regarding AMD chipsets. If you say Y, you will be asked | ||
16 | for your specific chipset/driver in the following questions. | ||
17 | |||
18 | if NET_VENDOR_BROADCOM | ||
19 | |||
20 | config B44 | ||
21 | tristate "Broadcom 440x/47xx ethernet support" | ||
22 | depends on SSB_POSSIBLE && HAS_DMA | ||
23 | select SSB | ||
24 | select MII | ||
25 | ---help--- | ||
26 | If you have a network (Ethernet) controller of this type, say Y | ||
27 | or M and read the Ethernet-HOWTO, available from | ||
28 | <http://www.tldp.org/docs.html#howto>. | ||
29 | |||
30 | To compile this driver as a module, choose M here. The module | ||
31 | will be called b44. | ||
32 | |||
33 | # Auto-select SSB PCI-HOST support, if possible | ||
34 | config B44_PCI_AUTOSELECT | ||
35 | bool | ||
36 | depends on B44 && SSB_PCIHOST_POSSIBLE | ||
37 | select SSB_PCIHOST | ||
38 | default y | ||
39 | |||
40 | # Auto-select SSB PCICORE driver, if possible | ||
41 | config B44_PCICORE_AUTOSELECT | ||
42 | bool | ||
43 | depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE | ||
44 | select SSB_DRIVER_PCICORE | ||
45 | default y | ||
46 | |||
47 | config B44_PCI | ||
48 | bool | ||
49 | depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT | ||
50 | default y | ||
51 | |||
52 | config BCM63XX_ENET | ||
53 | tristate "Broadcom 63xx internal mac support" | ||
54 | depends on BCM63XX | ||
55 | select MII | ||
56 | select PHYLIB | ||
57 | help | ||
58 | This driver supports the ethernet MACs in the Broadcom 63xx | ||
59 | MIPS chipset family (BCM63XX). | ||
60 | |||
61 | config BNX2 | ||
62 | tristate "Broadcom NetXtremeII support" | ||
63 | depends on PCI | ||
64 | select CRC32 | ||
65 | select FW_LOADER | ||
66 | ---help--- | ||
67 | This driver supports Broadcom NetXtremeII gigabit Ethernet cards. | ||
68 | |||
69 | To compile this driver as a module, choose M here: the module | ||
70 | will be called bnx2. This is recommended. | ||
71 | |||
72 | config CNIC | ||
73 | tristate "Broadcom CNIC support" | ||
74 | depends on PCI | ||
75 | select BNX2 | ||
76 | select UIO | ||
77 | ---help--- | ||
78 | This driver supports offload features of Broadcom NetXtremeII | ||
79 | gigabit Ethernet cards. | ||
80 | |||
81 | To compile this driver as a module, choose M here: the module | ||
82 | will be called cnic. This is recommended. | ||
83 | |||
84 | config SB1250_MAC | ||
85 | tristate "SB1250 Gigabit Ethernet support" | ||
86 | depends on SIBYTE_SB1xxx_SOC | ||
87 | select PHYLIB | ||
88 | ---help--- | ||
89 | This driver supports Gigabit Ethernet interfaces based on the | ||
90 | Broadcom SiByte family of System-On-a-Chip parts. They include | ||
91 | the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455 | ||
92 | and BCM1480 chips. | ||
93 | |||
94 | To compile this driver as a module, choose M here: the module | ||
95 | will be called sb1250-mac. | ||
96 | |||
97 | config TIGON3 | ||
98 | tristate "Broadcom Tigon3 support" | ||
99 | depends on PCI | ||
100 | select PHYLIB | ||
101 | ---help--- | ||
102 | This driver supports Broadcom Tigon3 based gigabit Ethernet cards. | ||
103 | |||
104 | To compile this driver as a module, choose M here: the module | ||
105 | will be called tg3. This is recommended. | ||
106 | |||
107 | config BNX2X | ||
108 | tristate "Broadcom NetXtremeII 10Gb support" | ||
109 | depends on PCI | ||
110 | select FW_LOADER | ||
111 | select ZLIB_INFLATE | ||
112 | select LIBCRC32C | ||
113 | select MDIO | ||
114 | ---help--- | ||
115 | This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards. | ||
116 | To compile this driver as a module, choose M here: the module | ||
117 | will be called bnx2x. This is recommended. | ||
118 | |||
119 | endif # NET_VENDOR_BROADCOM | ||
diff --git a/drivers/net/ethernet/broadcom/Makefile b/drivers/net/ethernet/broadcom/Makefile new file mode 100644 index 000000000000..b7896051d54e --- /dev/null +++ b/drivers/net/ethernet/broadcom/Makefile | |||
@@ -0,0 +1,11 @@ | |||
1 | # | ||
2 | # Makefile for the Broadcom network device drivers. | ||
3 | # | ||
4 | |||
5 | obj-$(CONFIG_B44) += b44.o | ||
6 | obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o | ||
7 | obj-$(CONFIG_BNX2) += bnx2.o | ||
8 | obj-$(CONFIG_CNIC) += cnic.o | ||
9 | obj-$(CONFIG_BNX2X) += bnx2x/ | ||
10 | obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o | ||
11 | obj-$(CONFIG_TIGON3) += tg3.o | ||
diff --git a/drivers/net/b44.c b/drivers/net/ethernet/broadcom/b44.c index 41ea84e3f69c..41ea84e3f69c 100644 --- a/drivers/net/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c | |||
diff --git a/drivers/net/b44.h b/drivers/net/ethernet/broadcom/b44.h index e1905a49279f..e1905a49279f 100644 --- a/drivers/net/b44.h +++ b/drivers/net/ethernet/broadcom/b44.h | |||
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 1d9b9858067c..1d9b9858067c 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c | |||
diff --git a/drivers/net/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h index 0e3048b788c2..0e3048b788c2 100644 --- a/drivers/net/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h | |||
diff --git a/drivers/net/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 4b2b57018a02..4b2b57018a02 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
diff --git a/drivers/net/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h index fc50d4267df8..fc50d4267df8 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/ethernet/broadcom/bnx2.h | |||
diff --git a/drivers/net/bnx2_fw.h b/drivers/net/ethernet/broadcom/bnx2_fw.h index 940eb91f209d..940eb91f209d 100644 --- a/drivers/net/bnx2_fw.h +++ b/drivers/net/ethernet/broadcom/bnx2_fw.h | |||
diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/ethernet/broadcom/bnx2x/Makefile index 48fbdd48f88f..48fbdd48f88f 100644 --- a/drivers/net/bnx2x/Makefile +++ b/drivers/net/ethernet/broadcom/bnx2x/Makefile | |||
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index c423504a755f..c423504a755f 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index d724a18b5285..d724a18b5285 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |||
diff --git a/drivers/net/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index 223bfeebc597..223bfeebc597 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c index a4ea35f6a456..a4ea35f6a456 100644 --- a/drivers/net/bnx2x/bnx2x_dcb.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | |||
diff --git a/drivers/net/bnx2x/bnx2x_dcb.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h index 2c6a3bca6f28..2c6a3bca6f28 100644 --- a/drivers/net/bnx2x/bnx2x_dcb.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_dump.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h index b983825d0ee9..b983825d0ee9 100644 --- a/drivers/net/bnx2x/bnx2x_dump.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index 221863059dae..221863059dae 100644 --- a/drivers/net/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | |||
diff --git a/drivers/net/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h index 998652a1b858..998652a1b858 100644 --- a/drivers/net/bnx2x/bnx2x_fw_defs.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_fw_file_hdr.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h index f4a07fbaed05..f4a07fbaed05 100644 --- a/drivers/net/bnx2x/bnx2x_fw_file_hdr.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h index dc24de40e336..dc24de40e336 100644 --- a/drivers/net/bnx2x/bnx2x_hsi.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h index 4d748e77d1ac..4d748e77d1ac 100644 --- a/drivers/net/bnx2x/bnx2x_init.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_init_ops.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h index 7ec1724753ad..7ec1724753ad 100644 --- a/drivers/net/bnx2x/bnx2x_init_ops.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index d45b1555a602..d45b1555a602 100644 --- a/drivers/net/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |||
diff --git a/drivers/net/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h index c12db6da213e..c12db6da213e 100644 --- a/drivers/net/bnx2x/bnx2x_link.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 150709111548..150709111548 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h index 27b5ecb11830..27b5ecb11830 100644 --- a/drivers/net/bnx2x/bnx2x_reg.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c index df52f110c6c5..df52f110c6c5 100644 --- a/drivers/net/bnx2x/bnx2x_sp.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | |||
diff --git a/drivers/net/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h index 9a517c2e9f1b..9a517c2e9f1b 100644 --- a/drivers/net/bnx2x/bnx2x_sp.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | |||
diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c index 771f6803b238..771f6803b238 100644 --- a/drivers/net/bnx2x/bnx2x_stats.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | |||
diff --git a/drivers/net/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h index 5d8ce2f6afef..5d8ce2f6afef 100644 --- a/drivers/net/bnx2x/bnx2x_stats.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | |||
diff --git a/drivers/net/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index 94a2e541006d..769816104a6d 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c | |||
@@ -45,8 +45,8 @@ | |||
45 | #include "bnx2x/bnx2x_reg.h" | 45 | #include "bnx2x/bnx2x_reg.h" |
46 | #include "bnx2x/bnx2x_fw_defs.h" | 46 | #include "bnx2x/bnx2x_fw_defs.h" |
47 | #include "bnx2x/bnx2x_hsi.h" | 47 | #include "bnx2x/bnx2x_hsi.h" |
48 | #include "../scsi/bnx2i/57xx_iscsi_constants.h" | 48 | #include "../../../scsi/bnx2i/57xx_iscsi_constants.h" |
49 | #include "../scsi/bnx2i/57xx_iscsi_hsi.h" | 49 | #include "../../../scsi/bnx2i/57xx_iscsi_hsi.h" |
50 | #include "cnic.h" | 50 | #include "cnic.h" |
51 | #include "cnic_defs.h" | 51 | #include "cnic_defs.h" |
52 | 52 | ||
diff --git a/drivers/net/cnic.h b/drivers/net/ethernet/broadcom/cnic.h index 7a2928f82d40..7a2928f82d40 100644 --- a/drivers/net/cnic.h +++ b/drivers/net/ethernet/broadcom/cnic.h | |||
diff --git a/drivers/net/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h index e47d21076767..e47d21076767 100644 --- a/drivers/net/cnic_defs.h +++ b/drivers/net/ethernet/broadcom/cnic_defs.h | |||
diff --git a/drivers/net/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h index 79443e0dbf96..79443e0dbf96 100644 --- a/drivers/net/cnic_if.h +++ b/drivers/net/ethernet/broadcom/cnic_if.h | |||
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c index ea65f7ec360a..ea65f7ec360a 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c | |||
diff --git a/drivers/net/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index dc3fbf61910b..dc3fbf61910b 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
diff --git a/drivers/net/tg3.h b/drivers/net/ethernet/broadcom/tg3.h index 2ea456dd5880..2ea456dd5880 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h | |||
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h index 42228ca5a9d2..5613e8afffb0 100644 --- a/drivers/scsi/bnx2fc/bnx2fc.h +++ b/drivers/scsi/bnx2fc/bnx2fc.h | |||
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | #include "57xx_hsi_bnx2fc.h" | 59 | #include "57xx_hsi_bnx2fc.h" |
60 | #include "bnx2fc_debug.h" | 60 | #include "bnx2fc_debug.h" |
61 | #include "../../net/cnic_if.h" | 61 | #include "../../net/ethernet/broadcom/cnic_if.h" |
62 | #include "bnx2fc_constants.h" | 62 | #include "bnx2fc_constants.h" |
63 | 63 | ||
64 | #define BNX2FC_NAME "bnx2fc" | 64 | #define BNX2FC_NAME "bnx2fc" |
diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h index dc5700765db4..0bd70e80efe4 100644 --- a/drivers/scsi/bnx2i/bnx2i.h +++ b/drivers/scsi/bnx2i/bnx2i.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <scsi/libiscsi.h> | 40 | #include <scsi/libiscsi.h> |
41 | #include <scsi/scsi_transport_iscsi.h> | 41 | #include <scsi/scsi_transport_iscsi.h> |
42 | 42 | ||
43 | #include "../../net/cnic_if.h" | 43 | #include "../../net/ethernet/broadcom/cnic_if.h" |
44 | #include "57xx_iscsi_hsi.h" | 44 | #include "57xx_iscsi_hsi.h" |
45 | #include "57xx_iscsi_constants.h" | 45 | #include "57xx_iscsi_constants.h" |
46 | 46 | ||