All of lore.kernel.org
 help / color / mirror / Atom feed
* [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/
@ 2011-06-25 13:58 Jeff Kirsher
  2011-06-25 13:58 ` [RFC 01/72] drivers/net/ethernet: Add ethernet dir and config option Jeff Kirsher
                   ` (74 more replies)
  0 siblings, 75 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev

The following series is the first attempt to organize the drivers/net
directory.  This process was started a year ago, and the emphasis was
on making the drivers/net/ easier to maintain and to group similar
drivers into the appropriate sub-directory.

The next steps are to move all the FIDDI drivers into drivers/net/fiddi,
and like so.  In addition, look at splitting the PS3 driver so that the
wireless portion can be moved into /drivers/net/wireless.

The following are changes since commit c6af9c406ceb3434281cf230938453931dcbab75:
  net: wimax: Remove of unused 'rfkill_input' pointer
and are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master

Jeff Kirsher (72):
  drivers/net/ethernet: Add ethernet dir and config option
  3c*/acenic/typhoon: Move 3Com Ethernet drivers
  amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers
  8390: Move the 8390 related drivers
  broadcom: Move the Broadcom drivers
  chelsio: Move the Chelsio drivers
  intel: Move the Intel wired LAN drivers
  qlogic: Move the QLogic drivers
  smc: Move the SMC drivers
  ni5*/ni65: Move the Racal-Interlan (Micom) drivers
  cassini/niu/sun*: Move the Sun drivers
  sfc: Move the Solarflare drivers
  be2net: Move the Emulex driver
  bna: Move the Brocade driver
  mlx4: Move the Mellanox driver
  myri*: Move the Myricom drivers
  s2io/vxge: Move the Exar drivers
  ehea/ibm*: Move the IBM drivers
  enic: Move the Cisco driver
  pasemic_mac*: Move the PA Semi driver
  tehuti: Move the Tehuti driver
  stmmac: Move the STMicroelectronics driver
  bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
  *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
  smsc*/smc911x: Move the SMSC drivers
  arm: Move the ARM/ACORN drivers
  ftgmac100/ftmac100: Move the Faraday drivers
  8139*/atp/r8169: Move the Realtek drivers
  de6*/dl2k: Move the D-Link drivers
  atl*: Move the Atheros drivers
  tulip: Move the tulip drivers
  ioc3-eth/meth/sgiseeq: Move the SGI drivers
  pch_gbe: Move the OKI driver
  skge/sky2: Move the SysKonnect Ethernet drivers
  via-*: Move the VIA drivers
  eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA
    drivers
  fsl_*/gianfar*/ucc_*: Move the Freescale drivers
  ks8*/ksz8*: Move the Micrel drivers
  mv643xx/pxa168: Move the Marvell drivers
  spider_net: Move the spider_net (IBM) driver
  sis*: Move the Silicon Integrated Systems (SiS) drivers
  82586.c/fec*: Move the Motorola drivers
  a2065/ariadne: Move the a2065/ariadne drivers
  s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
  tlan/cpmac: Move the TI drivers
  ixp2000: Move the Radisys driver
  hamachi/yellowfin: Move the packet engine drivers
  octeon: Move the Cavium driver
  jme: Move the JME driver
  xilinx/ll_temac: Move the Xilinx drivers
  ipg: Move the IC Plus driver
  ps3_gelic*: Move the Sony (PS3) drivers
  korina: Move the IDT driver
  au1000_eth/mipsnet/tc35815: Move the MIPS drivers
  bfin_mac: Move the Blackfin driver
  macb: Move the Atmel driver
  sc92031: Move the Silan driver
  sundance: Move the sundance driver
  r6040: Move the RDC driver
  fealnx: Move the Myson driver
  forcedeth: Move the NVIDIA nForce driver
  starfire: Move the starfire driver
  hp100/depca: Move the HP and Digital drivers
  at1700: Move the Allied Telesis driver
  dnet: Move the Dave Ethernet driver
  ethoc: Move the Avionic driver
  greth: Move the Aeroflex Gaisler driver
  enc28j60: Move the enc28j60 driver
  dm9000: Move the Davicom driver
  netx: Move the netx driver
  sh_eth: Move the Renesas SuperH driver
  drivers/net: Kconfig and Makefile cleanup

 MAINTAINERS                                        |  153 +-
 drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
 drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
 drivers/net/Kconfig                                | 2738 +-------------------
 drivers/net/Makefile                               |  233 +--
 drivers/net/arm/Kconfig                            |   74 -
 drivers/net/benet/Kconfig                          |    6 -
 drivers/net/{ => ethernet/3com}/3c501.c            |    0
 drivers/net/{ => ethernet/3com}/3c501.h            |    0
 drivers/net/{ => ethernet/3com}/3c503.c            |    0
 drivers/net/{ => ethernet/3com}/3c503.h            |    0
 drivers/net/{ => ethernet/3com}/3c505.c            |    0
 drivers/net/{ => ethernet/3com}/3c505.h            |    0
 drivers/net/{ => ethernet/3com}/3c507.c            |    0
 drivers/net/{ => ethernet/3com}/3c509.c            |    0
 drivers/net/{ => ethernet/3com}/3c515.c            |    0
 drivers/net/{ => ethernet/3com}/3c523.c            |    0
 drivers/net/{ => ethernet/3com}/3c523.h            |    0
 drivers/net/{ => ethernet/3com}/3c527.c            |    0
 drivers/net/{ => ethernet/3com}/3c527.h            |    0
 drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    0
 drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    0
 drivers/net/{ => ethernet/3com}/3c59x.c            |    0
 drivers/net/ethernet/3com/Kconfig                  |  200 ++
 drivers/net/ethernet/3com/Makefile                 |   17 +
 drivers/net/{ => ethernet/3com}/acenic.c           |    0
 drivers/net/{ => ethernet/3com}/acenic.h           |    0
 drivers/net/{ => ethernet/3com}/typhoon.c          |    0
 drivers/net/{ => ethernet/3com}/typhoon.h          |    0
 drivers/net/{ => ethernet/8390}/8390.c             |    0
 drivers/net/{ => ethernet/8390}/8390.h             |    0
 drivers/net/{ => ethernet/8390}/8390p.c            |    0
 drivers/net/ethernet/8390/Kconfig                  |  312 +++
 drivers/net/ethernet/8390/Makefile                 |   27 +
 drivers/net/{ => ethernet/8390}/ac3200.c           |    0
 drivers/net/{ => ethernet/8390}/apne.c             |    0
 drivers/net/{ => ethernet/8390}/ax88796.c          |    0
 drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    2 +-
 drivers/net/{ => ethernet/8390}/e2100.c            |    0
 drivers/net/{ => ethernet/8390}/es3210.c           |    0
 drivers/net/{ => ethernet/8390}/hp-plus.c          |    0
 drivers/net/{ => ethernet/8390}/hp.c               |    0
 drivers/net/{ => ethernet/8390}/hydra.c            |    0
 drivers/net/{ => ethernet/8390}/lib8390.c          |    0
 drivers/net/{ => ethernet/8390}/lne390.c           |    0
 drivers/net/{ => ethernet/8390}/mac8390.c          |    0
 drivers/net/{ => ethernet/8390}/ne-h8300.c         |    0
 drivers/net/{ => ethernet/8390}/ne.c               |    0
 drivers/net/{ => ethernet/8390}/ne2.c              |    0
 drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    0
 drivers/net/{ => ethernet/8390}/ne3210.c           |    0
 drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    2 +-
 drivers/net/{ => ethernet/8390}/smc-mca.c          |    0
 drivers/net/{ => ethernet/8390}/smc-ultra.c        |    0
 drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    0
 drivers/net/{ => ethernet/8390}/stnic.c            |    0
 drivers/net/{ => ethernet/8390}/wd.c               |    0
 drivers/net/{ => ethernet/8390}/zorro8390.c        |    0
 drivers/net/ethernet/Kconfig                       |  324 +++
 drivers/net/ethernet/Makefile                      |   76 +
 drivers/net/{ => ethernet}/a2065.c                 |    0
 drivers/net/{ => ethernet}/a2065.h                 |    0
 drivers/net/ethernet/aeroflex/Kconfig              |   11 +
 drivers/net/ethernet/aeroflex/Makefile             |    5 +
 drivers/net/{ => ethernet/aeroflex}/greth.c        |    0
 drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
 drivers/net/{ => ethernet/amd}/7990.c              |    0
 drivers/net/{ => ethernet/amd}/7990.h              |    0
 drivers/net/ethernet/amd/Kconfig                   |  115 +
 drivers/net/ethernet/amd/Makefile                  |   13 +
 drivers/net/{ => ethernet/amd}/amd8111e.c          |    0
 drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
 drivers/net/{ => ethernet/amd}/atarilance.c        |    0
 drivers/net/{ => ethernet/amd}/declance.c          |    0
 drivers/net/{ => ethernet/amd}/hplance.c           |    0
 drivers/net/{ => ethernet/amd}/hplance.h           |    0
 drivers/net/{ => ethernet/amd}/lance.c             |    0
 drivers/net/{ => ethernet/amd}/mvme147.c           |    0
 drivers/net/{ => ethernet/amd}/pcnet32.c           |    0
 drivers/net/{ => ethernet/amd}/sun3lance.c         |    0
 drivers/net/{ => ethernet/amd}/sunlance.c          |    0
 drivers/net/ethernet/apple/Kconfig                 |   92 +
 drivers/net/ethernet/apple/Makefile                |    9 +
 drivers/net/{ => ethernet/apple}/bmac.c            |    0
 drivers/net/{ => ethernet/apple}/bmac.h            |    0
 drivers/net/{ => ethernet/apple}/cs89x0.c          |    0
 drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
 drivers/net/{ => ethernet/apple}/mac89x0.c         |    0
 drivers/net/{ => ethernet/apple}/mace.c            |    0
 drivers/net/{ => ethernet/apple}/mace.h            |    0
 drivers/net/{ => ethernet/apple}/macmace.c         |    0
 drivers/net/{ => ethernet}/ariadne.c               |    0
 drivers/net/{ => ethernet}/ariadne.h               |    0
 drivers/net/ethernet/arm/Kconfig                   |  120 +
 drivers/net/{ => ethernet}/arm/Makefile            |    4 +-
 drivers/net/{ => ethernet}/arm/am79c961a.c         |    0
 drivers/net/{ => ethernet}/arm/am79c961a.h         |    0
 drivers/net/{ => ethernet}/arm/at91_ether.c        |    0
 drivers/net/{ => ethernet}/arm/at91_ether.h        |    0
 drivers/net/{ => ethernet/arm}/davinci_cpdma.c     |    0
 drivers/net/{ => ethernet/arm}/davinci_cpdma.h     |    0
 drivers/net/{ => ethernet/arm}/davinci_emac.c      |    0
 drivers/net/{ => ethernet/arm}/davinci_mdio.c      |    0
 drivers/net/{ => ethernet}/arm/ep93xx_eth.c        |    0
 drivers/net/{ => ethernet}/arm/ether1.c            |    0
 drivers/net/{ => ethernet}/arm/ether1.h            |    0
 drivers/net/{ => ethernet}/arm/ether3.c            |    0
 drivers/net/{ => ethernet}/arm/ether3.h            |    0
 drivers/net/{ => ethernet}/arm/etherh.c            |    0
 drivers/net/{ => ethernet}/arm/ixp4xx_eth.c        |    0
 drivers/net/{ => ethernet}/arm/ks8695net.c         |    0
 drivers/net/{ => ethernet}/arm/ks8695net.h         |    0
 drivers/net/{ => ethernet}/arm/w90p910_ether.c     |    0
 drivers/net/{ => ethernet}/at1700.c                |    0
 drivers/net/ethernet/atheros/Kconfig               |   61 +
 drivers/net/ethernet/atheros/Makefile              |    8 +
 drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
 drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
 .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
 .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |    0
 drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
 drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
 .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
 .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |    0
 .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
 drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
 drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
 drivers/net/ethernet/atmel/Kconfig                 |   32 +
 drivers/net/ethernet/atmel/Makefile                |    5 +
 drivers/net/{ => ethernet/atmel}/macb.c            |    0
 drivers/net/{ => ethernet/atmel}/macb.h            |    0
 drivers/net/ethernet/blackfin/Kconfig              |   65 +
 drivers/net/ethernet/blackfin/Makefile             |    5 +
 drivers/net/{ => ethernet/blackfin}/bfin_mac.c     |    0
 drivers/net/{ => ethernet/blackfin}/bfin_mac.h     |    0
 drivers/net/ethernet/broadcom/Kconfig              |  114 +
 drivers/net/ethernet/broadcom/Makefile             |   11 +
 drivers/net/{ => ethernet/broadcom}/b44.c          |    0
 drivers/net/{ => ethernet/broadcom}/b44.h          |    0
 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    0
 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
 drivers/net/{ => ethernet/broadcom}/bnx2.c         |    0
 drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
 drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
 drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
 drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
 .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
 drivers/net/{ => ethernet/broadcom}/cnic.c         |    4 +-
 drivers/net/{ => ethernet/broadcom}/cnic.h         |    0
 drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    0
 drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
 drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    0
 drivers/net/{ => ethernet/broadcom}/tg3.c          |    0
 drivers/net/{ => ethernet/broadcom}/tg3.h          |    0
 drivers/net/ethernet/brocade/Kconfig               |   18 +
 drivers/net/ethernet/brocade/Makefile              |    5 +
 drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
 drivers/net/{ => ethernet/brocade}/bna/Makefile    |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |    0
 .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
 .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |    0
 .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |    0
 .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_sm.h    |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_wc.h    |    0
 drivers/net/{ => ethernet/brocade}/bna/bfi.h       |    0
 drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h |    0
 drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h    |    0
 drivers/net/{ => ethernet/brocade}/bna/bna.h       |    0
 drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c  |    0
 drivers/net/{ => ethernet/brocade}/bna/bna_hw.h    |    0
 drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c  |    0
 drivers/net/{ => ethernet/brocade}/bna/bna_types.h |    0
 drivers/net/{ => ethernet/brocade}/bna/bnad.c      |    0
 drivers/net/{ => ethernet/brocade}/bna/bnad.h      |    0
 .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |    0
 drivers/net/{ => ethernet/brocade}/bna/cna.h       |    0
 drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
 drivers/net/ethernet/chelsio/Kconfig               |  102 +
 drivers/net/ethernet/chelsio/Makefile              |    8 +
 .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
 .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
 .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    0
 .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
 .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
 .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
 .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
 .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
 .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
 .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
 .../chelsio/cxgb}/vsc7326_reg.h                    |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
 .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    0
 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
 .../chelsio}/cxgb3/firmware_exports.h              |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
 .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    0
 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
 .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
 .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
 .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
 .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
 .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
 drivers/net/ethernet/cisco/Kconfig                 |   18 +
 drivers/net/ethernet/cisco/Makefile                |    5 +
 drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
 drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
 drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
 .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
 .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
 .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
 .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
 .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
 drivers/net/ethernet/davicom/Kconfig               |   31 +
 drivers/net/ethernet/davicom/Makefile              |    5 +
 drivers/net/{ => ethernet/davicom}/dm9000.c        |    0
 drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
 drivers/net/{ => ethernet}/depca.c                 |    0
 drivers/net/{ => ethernet}/depca.h                 |    0
 drivers/net/ethernet/dlink/Kconfig                 |   60 +
 drivers/net/ethernet/dlink/Makefile                |    7 +
 drivers/net/{ => ethernet/dlink}/de600.c           |    0
 drivers/net/{ => ethernet/dlink}/de600.h           |    0
 drivers/net/{ => ethernet/dlink}/de620.c           |    0
 drivers/net/{ => ethernet/dlink}/de620.h           |    0
 drivers/net/{ => ethernet/dlink}/dl2k.c            |    0
 drivers/net/{ => ethernet/dlink}/dl2k.h            |    0
 drivers/net/{ => ethernet}/dnet.c                  |    0
 drivers/net/{ => ethernet}/dnet.h                  |    0
 drivers/net/ethernet/emulex/Kconfig                |   18 +
 drivers/net/ethernet/emulex/Makefile               |    5 +
 drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
 drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
 drivers/net/{ => ethernet/emulex}/benet/be.h       |    0
 drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |    0
 drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |    0
 .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |    0
 drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |    0
 drivers/net/{ => ethernet/emulex}/benet/be_main.c  |    0
 drivers/net/{ => ethernet}/enc28j60.c              |    0
 drivers/net/{ => ethernet}/enc28j60_hw.h           |    0
 drivers/net/{ => ethernet}/ethoc.c                 |    0
 drivers/net/ethernet/faraday/Kconfig               |   34 +
 drivers/net/ethernet/faraday/Makefile              |    6 +
 drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
 drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
 drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
 drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
 drivers/net/{ => ethernet}/fealnx.c                |    0
 drivers/net/{ => ethernet}/forcedeth.c             |    0
 drivers/net/ethernet/freescale/Kconfig             |   48 +
 drivers/net/ethernet/freescale/Makefile            |   13 +
 .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
 .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
 drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
 .../freescale}/fs_enet/fs_enet-main.c              |    0
 .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
 .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
 .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
 .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
 .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
 .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
 drivers/net/{ => ethernet/freescale}/gianfar.c     |    0
 drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
 .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
 drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
 .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
 drivers/net/{ => ethernet/freescale}/ucc_geth.c    |    0
 drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
 .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
 drivers/net/{ => ethernet}/hp100.c                 |    0
 drivers/net/{ => ethernet}/hp100.h                 |    0
 drivers/net/ethernet/ibm/Kconfig                   |   62 +
 drivers/net/ethernet/ibm/Makefile                  |   10 +
 drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig |    2 +-
 .../net/{ => ethernet/ibm}/ibm_newemac/Makefile    |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c  |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h  |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h  |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c  |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h  |    0
 drivers/net/{ => ethernet/ibm}/ibmlana.c           |    0
 drivers/net/{ => ethernet/ibm}/ibmlana.h           |    0
 drivers/net/{ => ethernet/ibm}/ibmveth.c           |    0
 drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
 drivers/net/{ => ethernet/ibm}/spider_net.c        |    0
 drivers/net/{ => ethernet/ibm}/spider_net.h        |    2 +-
 .../net/{ => ethernet/ibm}/spider_net_ethtool.c    |    0
 drivers/net/ethernet/icplus/Kconfig                |   13 +
 drivers/net/ethernet/icplus/Makefile               |    5 +
 drivers/net/{ => ethernet/icplus}/ipg.c            |    0
 drivers/net/{ => ethernet/icplus}/ipg.h            |    0
 drivers/net/ethernet/intel/Kconfig                 |  216 ++
 drivers/net/ethernet/intel/Makefile                |   12 +
 drivers/net/{ => ethernet/intel}/e100.c            |    0
 drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
 drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    0
 .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
 .../net/{ => ethernet/intel}/e1000/e1000_main.c    |    0
 .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
 .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
 .../intel/e1000e/80003es2lan.c}                    |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    4 +-
 drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
 .../e1000.h => ethernet/intel/e1000e/e1000e.h}     |    0
 .../intel/e1000e/e1000e_main.c}                    |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
 drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/param.c    |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    2 +-
 drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
 .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
 drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
 drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
 drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    0
 drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
 drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
 drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
 drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
 drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
 drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
 drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    0
 drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
 drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
 drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
 drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
 .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
 drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    0
 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    0
 .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
 drivers/net/ethernet/isa/Kconfig                   |  101 +
 drivers/net/ethernet/isa/Makefile                  |   11 +
 drivers/net/{ => ethernet/isa}/eepro.c             |    0
 drivers/net/{ => ethernet/isa}/eexpress.c          |    0
 drivers/net/{ => ethernet/isa}/eexpress.h          |    0
 drivers/net/{ => ethernet/isa}/eth16i.c            |    0
 drivers/net/{ => ethernet/isa}/ewrk3.c             |    0
 drivers/net/{ => ethernet/isa}/ewrk3.h             |    0
 drivers/net/{ => ethernet/isa}/lp486e.c            |    0
 drivers/net/{ => ethernet/isa}/seeq8005.c          |    0
 drivers/net/{ => ethernet/isa}/seeq8005.h          |    0
 drivers/net/{ => ethernet/isa}/znet.c              |    0
 drivers/net/{ => ethernet}/jme.c                   |    0
 drivers/net/{ => ethernet}/jme.h                   |    0
 drivers/net/{ => ethernet}/korina.c                |    0
 drivers/net/ethernet/marvell/Kconfig               |   40 +
 drivers/net/ethernet/marvell/Makefile              |    6 +
 drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |    0
 drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
 drivers/net/ethernet/mellanox/Kconfig              |   18 +
 drivers/net/ethernet/mellanox/Makefile             |    5 +
 drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
 drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
 .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
 .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
 .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
 .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
 drivers/net/ethernet/micrel/Kconfig                |   51 +
 drivers/net/ethernet/micrel/Makefile               |    8 +
 drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
 drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
 drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
 drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
 drivers/net/{ => ethernet/micrel}/ksz884x.c        |    0
 drivers/net/ethernet/mips/Kconfig                  |   61 +
 drivers/net/ethernet/mips/Makefile                 |   10 +
 drivers/net/{ => ethernet/mips}/au1000_eth.c       |    0
 drivers/net/{ => ethernet/mips}/au1000_eth.h       |    0
 drivers/net/{ => ethernet/mips}/lasi_82596.c       |    0
 drivers/net/{ => ethernet/mips}/mipsnet.c          |    0
 drivers/net/{ => ethernet/mips}/sni_82596.c        |    0
 drivers/net/{ => ethernet/mips}/tc35815.c          |    0
 drivers/net/{ => ethernet/motorola}/82596.c        |    0
 drivers/net/ethernet/motorola/Kconfig              |   88 +
 drivers/net/ethernet/motorola/Makefile             |   13 +
 drivers/net/{ => ethernet/motorola}/fec.c          |    0
 drivers/net/{ => ethernet/motorola}/fec.h          |    0
 drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c  |    0
 drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h  |    0
 .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c  |    0
 drivers/net/ethernet/myricom/Kconfig               |   42 +
 drivers/net/ethernet/myricom/Makefile              |    5 +
 .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
 .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    0
 .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
 .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
 drivers/net/ethernet/natsemi/Kconfig               |   63 +
 drivers/net/ethernet/natsemi/Makefile              |    9 +
 drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    0
 drivers/net/{ => ethernet/natsemi}/macsonic.c      |    0
 drivers/net/{ => ethernet/natsemi}/natsemi.c       |    0
 drivers/net/{ => ethernet/natsemi}/ns83820.c       |    0
 drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
 drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
 drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    0
 drivers/net/ethernet/neterion/Kconfig              |   50 +
 drivers/net/ethernet/neterion/Makefile             |    6 +
 drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
 drivers/net/{ => ethernet/neterion}/s2io.c         |    0
 drivers/net/{ => ethernet/neterion}/s2io.h         |    0
 drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
 .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
 .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
 .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
 .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
 .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
 drivers/net/{ => ethernet}/netx-eth.c              |    0
 drivers/net/{ => ethernet}/octeon/Kconfig          |    0
 drivers/net/{ => ethernet}/octeon/Makefile         |    0
 drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    0
 drivers/net/ethernet/oki/Kconfig                   |   18 +
 drivers/net/ethernet/oki/Makefile                  |    5 +
 drivers/net/ethernet/oki/pch_gbe/Kconfig           |   20 +
 drivers/net/{ => ethernet/oki}/pch_gbe/Makefile    |    0
 drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe.h   |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.c   |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.h   |    0
 .../{ => ethernet/oki}/pch_gbe/pch_gbe_ethtool.c   |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_main.c  |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_param.c |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.c   |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.h   |    0
 drivers/net/ethernet/packetengines/Kconfig         |   42 +
 drivers/net/ethernet/packetengines/Makefile        |    6 +
 drivers/net/{ => ethernet/packetengines}/hamachi.c |    0
 .../net/{ => ethernet/packetengines}/yellowfin.c   |    0
 drivers/net/{ => ethernet}/pasemi_mac.c            |    0
 drivers/net/{ => ethernet}/pasemi_mac.h            |    0
 drivers/net/{ => ethernet}/pasemi_mac_ethtool.c    |    0
 drivers/net/ethernet/qlogic/Kconfig                |   49 +
 drivers/net/ethernet/qlogic/Makefile               |    8 +
 drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
 .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
 .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |    0
 drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    0
 drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
 drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
 drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |    0
 .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |    0
 drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
 drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
 drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
 .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
 drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    0
 drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
 drivers/net/{ => ethernet}/r6040.c                 |    0
 drivers/net/ethernet/racal/Kconfig                 |   50 +
 drivers/net/ethernet/racal/Makefile                |    7 +
 drivers/net/{ => ethernet/racal}/ni5010.c          |    0
 drivers/net/{ => ethernet/racal}/ni5010.h          |    0
 drivers/net/{ => ethernet/racal}/ni52.c            |    0
 drivers/net/{ => ethernet/racal}/ni52.h            |    0
 drivers/net/{ => ethernet/racal}/ni65.c            |    0
 drivers/net/{ => ethernet/racal}/ni65.h            |    0
 drivers/net/ethernet/radisys/Kconfig               |   16 +
 drivers/net/ethernet/radisys/Makefile              |    5 +
 drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig |    2 +-
 .../net/{ => ethernet/radisys}/ixp2000/Makefile    |    0
 drivers/net/{ => ethernet/radisys}/ixp2000/caleb.c |    0
 drivers/net/{ => ethernet/radisys}/ixp2000/caleb.h |    0
 .../net/{ => ethernet/radisys}/ixp2000/enp2611.c   |    0
 .../{ => ethernet/radisys}/ixp2000/ixp2400-msf.c   |    0
 .../{ => ethernet/radisys}/ixp2000/ixp2400-msf.h   |    0
 .../{ => ethernet/radisys}/ixp2000/ixp2400_rx.uc   |    0
 .../radisys}/ixp2000/ixp2400_rx.ucode              |    0
 .../{ => ethernet/radisys}/ixp2000/ixp2400_tx.uc   |    0
 .../radisys}/ixp2000/ixp2400_tx.ucode              |    0
 .../net/{ => ethernet/radisys}/ixp2000/ixpdev.c    |    0
 .../net/{ => ethernet/radisys}/ixp2000/ixpdev.h    |    0
 .../{ => ethernet/radisys}/ixp2000/ixpdev_priv.h   |    0
 .../net/{ => ethernet/radisys}/ixp2000/pm3386.c    |    0
 .../net/{ => ethernet/radisys}/ixp2000/pm3386.h    |    0
 drivers/net/{ => ethernet/realtek}/8139cp.c        |    0
 drivers/net/{ => ethernet/realtek}/8139too.c       |    0
 drivers/net/ethernet/realtek/Kconfig               |  110 +
 drivers/net/ethernet/realtek/Makefile              |    8 +
 drivers/net/{ => ethernet/realtek}/atp.c           |    0
 drivers/net/{ => ethernet/realtek}/atp.h           |    0
 drivers/net/{ => ethernet/realtek}/r8169.c         |    0
 drivers/net/ethernet/renesas/Kconfig               |   18 +
 drivers/net/ethernet/renesas/Makefile              |    5 +
 drivers/net/{ => ethernet/renesas}/sh_eth.c        |    0
 drivers/net/{ => ethernet/renesas}/sh_eth.h        |    0
 drivers/net/{ => ethernet}/s6gmac.c                |    0
 drivers/net/{ => ethernet}/sc92031.c               |    0
 drivers/net/{ => ethernet}/sfc/Kconfig             |    0
 drivers/net/{ => ethernet}/sfc/Makefile            |    0
 drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
 drivers/net/{ => ethernet}/sfc/efx.c               |    0
 drivers/net/{ => ethernet}/sfc/efx.h               |    0
 drivers/net/{ => ethernet}/sfc/enum.h              |    0
 drivers/net/{ => ethernet}/sfc/ethtool.c           |    0
 drivers/net/{ => ethernet}/sfc/falcon.c            |    0
 drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
 drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
 drivers/net/{ => ethernet}/sfc/filter.c            |    0
 drivers/net/{ => ethernet}/sfc/filter.h            |    0
 drivers/net/{ => ethernet}/sfc/io.h                |    0
 drivers/net/{ => ethernet}/sfc/mac.h               |    0
 drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
 drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
 drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
 drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
 drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
 drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
 drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
 drivers/net/{ => ethernet}/sfc/mtd.c               |    0
 drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
 drivers/net/{ => ethernet}/sfc/nic.c               |    0
 drivers/net/{ => ethernet}/sfc/nic.h               |    0
 drivers/net/{ => ethernet}/sfc/phy.h               |    0
 drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
 drivers/net/{ => ethernet}/sfc/regs.h              |    0
 drivers/net/{ => ethernet}/sfc/rx.c                |    0
 drivers/net/{ => ethernet}/sfc/selftest.c          |    0
 drivers/net/{ => ethernet}/sfc/selftest.h          |    0
 drivers/net/{ => ethernet}/sfc/siena.c             |    0
 drivers/net/{ => ethernet}/sfc/spi.h               |    0
 drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
 drivers/net/{ => ethernet}/sfc/tx.c                |    0
 drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
 drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
 drivers/net/ethernet/sgi/Kconfig                   |   37 +
 drivers/net/ethernet/sgi/Makefile                  |    7 +
 drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    0
 drivers/net/{ => ethernet/sgi}/meth.c              |    0
 drivers/net/{ => ethernet/sgi}/meth.h              |    0
 drivers/net/{ => ethernet/sgi}/sgiseeq.c           |    0
 drivers/net/{ => ethernet/sgi}/sgiseeq.h           |    0
 drivers/net/ethernet/sis/Kconfig                   |   46 +
 drivers/net/ethernet/sis/Makefile                  |    6 +
 drivers/net/{ => ethernet/sis}/sis190.c            |    0
 drivers/net/{ => ethernet/sis}/sis900.c            |    0
 drivers/net/{ => ethernet/sis}/sis900.h            |    0
 drivers/net/ethernet/smc/Kconfig                   |   61 +
 drivers/net/ethernet/smc/Makefile                  |    7 +
 drivers/net/{ => ethernet/smc}/epic100.c           |    0
 drivers/net/{ => ethernet/smc}/smc9194.c           |    0
 drivers/net/{ => ethernet/smc}/smc9194.h           |    0
 drivers/net/{ => ethernet/smc}/smc91x.c            |    0
 drivers/net/{ => ethernet/smc}/smc91x.h            |    0
 drivers/net/ethernet/smsc/Kconfig                  |   71 +
 drivers/net/ethernet/smsc/Makefile                 |    7 +
 drivers/net/{ => ethernet/smsc}/smc911x.c          |    0
 drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
 drivers/net/{ => ethernet/smsc}/smsc911x.c         |    0
 drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
 drivers/net/{ => ethernet/smsc}/smsc9420.c         |    0
 drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
 drivers/net/ethernet/sony/Kconfig                  |   38 +
 drivers/net/ethernet/sony/Makefile                 |    7 +
 drivers/net/{ => ethernet/sony}/ps3_gelic_net.c    |    0
 drivers/net/{ => ethernet/sony}/ps3_gelic_net.h    |    0
 .../net/{ => ethernet/sony}/ps3_gelic_wireless.c   |    0
 .../net/{ => ethernet/sony}/ps3_gelic_wireless.h   |    0
 drivers/net/{ => ethernet}/starfire.c              |    0
 drivers/net/ethernet/stmicro/Kconfig               |   18 +
 drivers/net/ethernet/stmicro/Makefile              |    5 +
 drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +-
 drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
 drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
 drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
 .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
 .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
 .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
 .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
 .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
 .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
 .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
 .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
 .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
 .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
 drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
 drivers/net/ethernet/sun/Kconfig                   |   91 +
 drivers/net/ethernet/sun/Makefile                  |   12 +
 drivers/net/{ => ethernet/sun}/cassini.c           |    0
 drivers/net/{ => ethernet/sun}/cassini.h           |    0
 drivers/net/{ => ethernet/sun}/niu.c               |    0
 drivers/net/{ => ethernet/sun}/niu.h               |    0
 drivers/net/{ => ethernet/sun}/sun3_82586.c        |    0
 drivers/net/{ => ethernet/sun}/sun3_82586.h        |    0
 drivers/net/{ => ethernet/sun}/sunbmac.c           |    0
 drivers/net/{ => ethernet/sun}/sunbmac.h           |    0
 drivers/net/{ => ethernet/sun}/sungem.c            |    0
 drivers/net/{ => ethernet/sun}/sungem.h            |    0
 drivers/net/{ => ethernet/sun}/sungem_phy.c        |    0
 drivers/net/{ => ethernet/sun}/sungem_phy.h        |    0
 drivers/net/{ => ethernet/sun}/sunhme.c            |    0
 drivers/net/{ => ethernet/sun}/sunhme.h            |    0
 drivers/net/{ => ethernet/sun}/sunqe.c             |    0
 drivers/net/{ => ethernet/sun}/sunqe.h             |    0
 drivers/net/{ => ethernet/sun}/sunvnet.c           |    0
 drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
 drivers/net/{ => ethernet}/sundance.c              |    0
 drivers/net/ethernet/syskonnect/Kconfig            |   74 +
 drivers/net/ethernet/syskonnect/Makefile           |    6 +
 drivers/net/{ => ethernet/syskonnect}/skge.c       |    0
 drivers/net/{ => ethernet/syskonnect}/skge.h       |    0
 drivers/net/{ => ethernet/syskonnect}/sky2.c       |    0
 drivers/net/{ => ethernet/syskonnect}/sky2.h       |    0
 drivers/net/{ => ethernet}/tehuti.c                |    0
 drivers/net/{ => ethernet}/tehuti.h                |    0
 drivers/net/ethernet/ti/Kconfig                    |   41 +
 drivers/net/ethernet/ti/Makefile                   |    6 +
 drivers/net/{ => ethernet/ti}/cpmac.c              |    0
 drivers/net/{ => ethernet/ti}/tlan.c               |    0
 drivers/net/{ => ethernet/ti}/tlan.h               |    0
 drivers/net/{ => ethernet}/tsi108_eth.c            |    0
 drivers/net/{ => ethernet}/tsi108_eth.h            |    0
 drivers/net/{ => ethernet}/tulip/21142.c           |    0
 drivers/net/{ => ethernet}/tulip/Kconfig           |   34 +-
 drivers/net/{ => ethernet}/tulip/Makefile          |    0
 drivers/net/{ => ethernet}/tulip/de2104x.c         |    0
 drivers/net/{ => ethernet}/tulip/de4x5.c           |    0
 drivers/net/{ => ethernet}/tulip/de4x5.h           |    0
 drivers/net/{ => ethernet}/tulip/dmfe.c            |    0
 drivers/net/{ => ethernet}/tulip/eeprom.c          |    0
 drivers/net/{ => ethernet}/tulip/interrupt.c       |    0
 drivers/net/{ => ethernet}/tulip/media.c           |    0
 drivers/net/{ => ethernet}/tulip/pnic.c            |    0
 drivers/net/{ => ethernet}/tulip/pnic2.c           |    0
 drivers/net/{ => ethernet}/tulip/timer.c           |    0
 drivers/net/{ => ethernet}/tulip/tulip.h           |    0
 drivers/net/{ => ethernet}/tulip/tulip_core.c      |    0
 drivers/net/{ => ethernet}/tulip/uli526x.c         |    0
 drivers/net/{ => ethernet}/tulip/winbond-840.c     |    0
 drivers/net/{ => ethernet}/tulip/xircom_cb.c       |    0
 drivers/net/ethernet/via/Kconfig                   |   52 +
 drivers/net/ethernet/via/Makefile                  |    6 +
 drivers/net/{ => ethernet/via}/via-rhine.c         |    0
 drivers/net/{ => ethernet/via}/via-velocity.c      |    0
 drivers/net/{ => ethernet/via}/via-velocity.h      |    0
 drivers/net/ethernet/xilinx/Kconfig                |   31 +
 drivers/net/ethernet/xilinx/Makefile               |    7 +
 drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
 drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    0
 drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
 .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
 drivers/net/pcmcia/Kconfig                         |   39 -
 drivers/net/pcmcia/Makefile                        |    4 -
 drivers/scsi/bnx2fc/bnx2fc.h                       |    2 +-
 drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
 drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
 drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
 872 files changed, 4096 insertions(+), 3223 deletions(-)
 delete mode 100644 drivers/net/arm/Kconfig
 delete mode 100644 drivers/net/benet/Kconfig
 rename drivers/net/{ => ethernet/3com}/3c501.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
 rename drivers/net/{ => ethernet/3com}/3c503.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c503.h (100%)
 rename drivers/net/{ => ethernet/3com}/3c505.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c505.h (100%)
 rename drivers/net/{ => ethernet/3com}/3c507.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c509.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c515.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c523.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c523.h (100%)
 rename drivers/net/{ => ethernet/3com}/3c527.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c527.h (100%)
 rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (100%)
 rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c59x.c (100%)
 create mode 100644 drivers/net/ethernet/3com/Kconfig
 create mode 100644 drivers/net/ethernet/3com/Makefile
 rename drivers/net/{ => ethernet/3com}/acenic.c (100%)
 rename drivers/net/{ => ethernet/3com}/acenic.h (100%)
 rename drivers/net/{ => ethernet/3com}/typhoon.c (100%)
 rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
 rename drivers/net/{ => ethernet/8390}/8390.c (100%)
 rename drivers/net/{ => ethernet/8390}/8390.h (100%)
 rename drivers/net/{ => ethernet/8390}/8390p.c (100%)
 create mode 100644 drivers/net/ethernet/8390/Kconfig
 create mode 100644 drivers/net/ethernet/8390/Makefile
 rename drivers/net/{ => ethernet/8390}/ac3200.c (100%)
 rename drivers/net/{ => ethernet/8390}/apne.c (100%)
 rename drivers/net/{ => ethernet/8390}/ax88796.c (100%)
 rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
 rename drivers/net/{ => ethernet/8390}/e2100.c (100%)
 rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
 rename drivers/net/{ => ethernet/8390}/hp-plus.c (100%)
 rename drivers/net/{ => ethernet/8390}/hp.c (100%)
 rename drivers/net/{ => ethernet/8390}/hydra.c (100%)
 rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
 rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
 rename drivers/net/{ => ethernet/8390}/mac8390.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne-h8300.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
 rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
 rename drivers/net/{ => ethernet/8390}/smc-mca.c (100%)
 rename drivers/net/{ => ethernet/8390}/smc-ultra.c (100%)
 rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (100%)
 rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
 rename drivers/net/{ => ethernet/8390}/wd.c (100%)
 rename drivers/net/{ => ethernet/8390}/zorro8390.c (100%)
 create mode 100644 drivers/net/ethernet/Kconfig
 create mode 100644 drivers/net/ethernet/Makefile
 rename drivers/net/{ => ethernet}/a2065.c (100%)
 rename drivers/net/{ => ethernet}/a2065.h (100%)
 create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
 create mode 100644 drivers/net/ethernet/aeroflex/Makefile
 rename drivers/net/{ => ethernet/aeroflex}/greth.c (100%)
 rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
 rename drivers/net/{ => ethernet/amd}/7990.c (100%)
 rename drivers/net/{ => ethernet/amd}/7990.h (100%)
 create mode 100644 drivers/net/ethernet/amd/Kconfig
 create mode 100644 drivers/net/ethernet/amd/Makefile
 rename drivers/net/{ => ethernet/amd}/amd8111e.c (100%)
 rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
 rename drivers/net/{ => ethernet/amd}/atarilance.c (100%)
 rename drivers/net/{ => ethernet/amd}/declance.c (100%)
 rename drivers/net/{ => ethernet/amd}/hplance.c (100%)
 rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
 rename drivers/net/{ => ethernet/amd}/lance.c (100%)
 rename drivers/net/{ => ethernet/amd}/mvme147.c (100%)
 rename drivers/net/{ => ethernet/amd}/pcnet32.c (100%)
 rename drivers/net/{ => ethernet/amd}/sun3lance.c (100%)
 rename drivers/net/{ => ethernet/amd}/sunlance.c (100%)
 create mode 100644 drivers/net/ethernet/apple/Kconfig
 create mode 100644 drivers/net/ethernet/apple/Makefile
 rename drivers/net/{ => ethernet/apple}/bmac.c (100%)
 rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
 rename drivers/net/{ => ethernet/apple}/cs89x0.c (100%)
 rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
 rename drivers/net/{ => ethernet/apple}/mac89x0.c (100%)
 rename drivers/net/{ => ethernet/apple}/mace.c (100%)
 rename drivers/net/{ => ethernet/apple}/mace.h (100%)
 rename drivers/net/{ => ethernet/apple}/macmace.c (100%)
 rename drivers/net/{ => ethernet}/ariadne.c (100%)
 rename drivers/net/{ => ethernet}/ariadne.h (100%)
 create mode 100644 drivers/net/ethernet/arm/Kconfig
 rename drivers/net/{ => ethernet}/arm/Makefile (74%)
 rename drivers/net/{ => ethernet}/arm/am79c961a.c (100%)
 rename drivers/net/{ => ethernet}/arm/am79c961a.h (100%)
 rename drivers/net/{ => ethernet}/arm/at91_ether.c (100%)
 rename drivers/net/{ => ethernet}/arm/at91_ether.h (100%)
 rename drivers/net/{ => ethernet/arm}/davinci_cpdma.c (100%)
 rename drivers/net/{ => ethernet/arm}/davinci_cpdma.h (100%)
 rename drivers/net/{ => ethernet/arm}/davinci_emac.c (100%)
 rename drivers/net/{ => ethernet/arm}/davinci_mdio.c (100%)
 rename drivers/net/{ => ethernet}/arm/ep93xx_eth.c (100%)
 rename drivers/net/{ => ethernet}/arm/ether1.c (100%)
 rename drivers/net/{ => ethernet}/arm/ether1.h (100%)
 rename drivers/net/{ => ethernet}/arm/ether3.c (100%)
 rename drivers/net/{ => ethernet}/arm/ether3.h (100%)
 rename drivers/net/{ => ethernet}/arm/etherh.c (100%)
 rename drivers/net/{ => ethernet}/arm/ixp4xx_eth.c (100%)
 rename drivers/net/{ => ethernet}/arm/ks8695net.c (100%)
 rename drivers/net/{ => ethernet}/arm/ks8695net.h (100%)
 rename drivers/net/{ => ethernet}/arm/w90p910_ether.c (100%)
 rename drivers/net/{ => ethernet}/at1700.c (100%)
 create mode 100644 drivers/net/ethernet/atheros/Kconfig
 create mode 100644 drivers/net/ethernet/atheros/Makefile
 rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
 create mode 100644 drivers/net/ethernet/atmel/Kconfig
 create mode 100644 drivers/net/ethernet/atmel/Makefile
 rename drivers/net/{ => ethernet/atmel}/macb.c (100%)
 rename drivers/net/{ => ethernet/atmel}/macb.h (100%)
 create mode 100644 drivers/net/ethernet/blackfin/Kconfig
 create mode 100644 drivers/net/ethernet/blackfin/Makefile
 rename drivers/net/{ => ethernet/blackfin}/bfin_mac.c (100%)
 rename drivers/net/{ => ethernet/blackfin}/bfin_mac.h (100%)
 create mode 100644 drivers/net/ethernet/broadcom/Kconfig
 create mode 100644 drivers/net/ethernet/broadcom/Makefile
 rename drivers/net/{ => ethernet/broadcom}/b44.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
 rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/tg3.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%)
 create mode 100644 drivers/net/ethernet/brocade/Kconfig
 create mode 100644 drivers/net/ethernet/brocade/Makefile
 create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
 rename drivers/net/{ => ethernet/brocade}/bna/Makefile (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_sm.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_wc.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna_hw.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/cna.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
 create mode 100644 drivers/net/ethernet/chelsio/Kconfig
 create mode 100644 drivers/net/ethernet/chelsio/Makefile
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
 create mode 100644 drivers/net/ethernet/cisco/Kconfig
 create mode 100644 drivers/net/ethernet/cisco/Makefile
 create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
 rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
 create mode 100644 drivers/net/ethernet/davicom/Kconfig
 create mode 100644 drivers/net/ethernet/davicom/Makefile
 rename drivers/net/{ => ethernet/davicom}/dm9000.c (100%)
 rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
 rename drivers/net/{ => ethernet}/depca.c (100%)
 rename drivers/net/{ => ethernet}/depca.h (100%)
 create mode 100644 drivers/net/ethernet/dlink/Kconfig
 create mode 100644 drivers/net/ethernet/dlink/Makefile
 rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
 rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
 rename drivers/net/{ => ethernet/dlink}/de620.c (100%)
 rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
 rename drivers/net/{ => ethernet/dlink}/dl2k.c (100%)
 rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)
 rename drivers/net/{ => ethernet}/dnet.c (100%)
 rename drivers/net/{ => ethernet}/dnet.h (100%)
 create mode 100644 drivers/net/ethernet/emulex/Kconfig
 create mode 100644 drivers/net/ethernet/emulex/Makefile
 create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
 rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be.h (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (100%)
 rename drivers/net/{ => ethernet}/enc28j60.c (100%)
 rename drivers/net/{ => ethernet}/enc28j60_hw.h (100%)
 rename drivers/net/{ => ethernet}/ethoc.c (100%)
 create mode 100644 drivers/net/ethernet/faraday/Kconfig
 create mode 100644 drivers/net/ethernet/faraday/Makefile
 rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
 rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
 rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
 rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
 rename drivers/net/{ => ethernet}/fealnx.c (100%)
 rename drivers/net/{ => ethernet}/forcedeth.c (100%)
 create mode 100644 drivers/net/ethernet/freescale/Kconfig
 create mode 100644 drivers/net/ethernet/freescale/Makefile
 rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar.c (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
 rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (100%)
 rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
 rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
 rename drivers/net/{ => ethernet}/hp100.c (100%)
 rename drivers/net/{ => ethernet}/hp100.h (100%)
 create mode 100644 drivers/net/ethernet/ibm/Kconfig
 create mode 100644 drivers/net/ethernet/ibm/Makefile
 rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig (97%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/Makefile (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibmlana.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibmlana.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
 rename drivers/net/{ => ethernet/ibm}/spider_net.c (100%)
 rename drivers/net/{ => ethernet/ibm}/spider_net.h (99%)
 rename drivers/net/{ => ethernet/ibm}/spider_net_ethtool.c (100%)
 create mode 100644 drivers/net/ethernet/icplus/Kconfig
 create mode 100644 drivers/net/ethernet/icplus/Makefile
 rename drivers/net/{ => ethernet/icplus}/ipg.c (100%)
 rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
 create mode 100644 drivers/net/ethernet/intel/Kconfig
 create mode 100644 drivers/net/ethernet/intel/Makefile
 rename drivers/net/{ => ethernet/intel}/e100.c (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
 rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (92%)
 rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
 rename drivers/net/{e1000e/e1000.h => ethernet/intel/e1000e/e1000e.h} (100%)
 rename drivers/net/{e1000e/netdev.c => ethernet/intel/e1000e/e1000e_main.c} (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
 rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/param.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (99%)
 rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
 create mode 100644 drivers/net/ethernet/isa/Kconfig
 create mode 100644 drivers/net/ethernet/isa/Makefile
 rename drivers/net/{ => ethernet/isa}/eepro.c (100%)
 rename drivers/net/{ => ethernet/isa}/eexpress.c (100%)
 rename drivers/net/{ => ethernet/isa}/eexpress.h (100%)
 rename drivers/net/{ => ethernet/isa}/eth16i.c (100%)
 rename drivers/net/{ => ethernet/isa}/ewrk3.c (100%)
 rename drivers/net/{ => ethernet/isa}/ewrk3.h (100%)
 rename drivers/net/{ => ethernet/isa}/lp486e.c (100%)
 rename drivers/net/{ => ethernet/isa}/seeq8005.c (100%)
 rename drivers/net/{ => ethernet/isa}/seeq8005.h (100%)
 rename drivers/net/{ => ethernet/isa}/znet.c (100%)
 rename drivers/net/{ => ethernet}/jme.c (100%)
 rename drivers/net/{ => ethernet}/jme.h (100%)
 rename drivers/net/{ => ethernet}/korina.c (100%)
 create mode 100644 drivers/net/ethernet/marvell/Kconfig
 create mode 100644 drivers/net/ethernet/marvell/Makefile
 rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (100%)
 rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
 create mode 100644 drivers/net/ethernet/mellanox/Kconfig
 create mode 100644 drivers/net/ethernet/mellanox/Makefile
 create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
 rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
 create mode 100644 drivers/net/ethernet/micrel/Kconfig
 create mode 100644 drivers/net/ethernet/micrel/Makefile
 rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
 rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
 rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
 rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
 rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
 create mode 100644 drivers/net/ethernet/mips/Kconfig
 create mode 100644 drivers/net/ethernet/mips/Makefile
 rename drivers/net/{ => ethernet/mips}/au1000_eth.c (100%)
 rename drivers/net/{ => ethernet/mips}/au1000_eth.h (100%)
 rename drivers/net/{ => ethernet/mips}/lasi_82596.c (100%)
 rename drivers/net/{ => ethernet/mips}/mipsnet.c (100%)
 rename drivers/net/{ => ethernet/mips}/sni_82596.c (100%)
 rename drivers/net/{ => ethernet/mips}/tc35815.c (100%)
 rename drivers/net/{ => ethernet/motorola}/82596.c (100%)
 create mode 100644 drivers/net/ethernet/motorola/Kconfig
 create mode 100644 drivers/net/ethernet/motorola/Makefile
 rename drivers/net/{ => ethernet/motorola}/fec.c (100%)
 rename drivers/net/{ => ethernet/motorola}/fec.h (100%)
 rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c (100%)
 rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h (100%)
 rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx_phy.c (100%)
 create mode 100644 drivers/net/ethernet/myricom/Kconfig
 create mode 100644 drivers/net/ethernet/myricom/Makefile
 rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
 create mode 100644 drivers/net/ethernet/natsemi/Kconfig
 create mode 100644 drivers/net/ethernet/natsemi/Makefile
 rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/macsonic.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/natsemi.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/ns83820.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
 rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (100%)
 create mode 100644 drivers/net/ethernet/neterion/Kconfig
 create mode 100644 drivers/net/ethernet/neterion/Makefile
 rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
 rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
 rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
 rename drivers/net/{ => ethernet}/netx-eth.c (100%)
 rename drivers/net/{ => ethernet}/octeon/Kconfig (100%)
 rename drivers/net/{ => ethernet}/octeon/Makefile (100%)
 rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
 create mode 100644 drivers/net/ethernet/oki/Kconfig
 create mode 100644 drivers/net/ethernet/oki/Makefile
 create mode 100644 drivers/net/ethernet/oki/pch_gbe/Kconfig
 rename drivers/net/{ => ethernet/oki}/pch_gbe/Makefile (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe.h (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.h (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_ethtool.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_main.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_param.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.h (100%)
 create mode 100644 drivers/net/ethernet/packetengines/Kconfig
 create mode 100644 drivers/net/ethernet/packetengines/Makefile
 rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
 rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)
 rename drivers/net/{ => ethernet}/pasemi_mac.c (100%)
 rename drivers/net/{ => ethernet}/pasemi_mac.h (100%)
 rename drivers/net/{ => ethernet}/pasemi_mac_ethtool.c (100%)
 create mode 100644 drivers/net/ethernet/qlogic/Kconfig
 create mode 100644 drivers/net/ethernet/qlogic/Makefile
 rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
 rename drivers/net/{ => ethernet}/r6040.c (100%)
 create mode 100644 drivers/net/ethernet/racal/Kconfig
 create mode 100644 drivers/net/ethernet/racal/Makefile
 rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
 rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
 rename drivers/net/{ => ethernet/racal}/ni52.c (100%)
 rename drivers/net/{ => ethernet/racal}/ni52.h (100%)
 rename drivers/net/{ => ethernet/racal}/ni65.c (100%)
 rename drivers/net/{ => ethernet/racal}/ni65.h (100%)
 create mode 100644 drivers/net/ethernet/radisys/Kconfig
 create mode 100644 drivers/net/ethernet/radisys/Makefile
 rename drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig (80%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/Makefile (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/caleb.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/caleb.h (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/enp2611.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400-msf.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400-msf.h (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_rx.uc (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_rx.ucode (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_tx.uc (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_tx.ucode (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev.h (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev_priv.h (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/pm3386.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/pm3386.h (100%)
 rename drivers/net/{ => ethernet/realtek}/8139cp.c (100%)
 rename drivers/net/{ => ethernet/realtek}/8139too.c (100%)
 create mode 100644 drivers/net/ethernet/realtek/Kconfig
 create mode 100644 drivers/net/ethernet/realtek/Makefile
 rename drivers/net/{ => ethernet/realtek}/atp.c (100%)
 rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
 rename drivers/net/{ => ethernet/realtek}/r8169.c (100%)
 create mode 100644 drivers/net/ethernet/renesas/Kconfig
 create mode 100644 drivers/net/ethernet/renesas/Makefile
 rename drivers/net/{ => ethernet/renesas}/sh_eth.c (100%)
 rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
 rename drivers/net/{ => ethernet}/s6gmac.c (100%)
 rename drivers/net/{ => ethernet}/sc92031.c (100%)
 rename drivers/net/{ => ethernet}/sfc/Kconfig (100%)
 rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
 rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
 rename drivers/net/{ => ethernet}/sfc/efx.c (100%)
 rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
 rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
 rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
 rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
 rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
 rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
 rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
 rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
 rename drivers/net/{ => ethernet}/sfc/io.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
 rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
 rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
 rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
 rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
 rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
 rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
 rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
 rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
 rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
 rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
 rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
 rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
 rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
 rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
 rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
 rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
 rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
 create mode 100644 drivers/net/ethernet/sgi/Kconfig
 create mode 100644 drivers/net/ethernet/sgi/Makefile
 rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (100%)
 rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
 rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
 rename drivers/net/{ => ethernet/sgi}/sgiseeq.c (100%)
 rename drivers/net/{ => ethernet/sgi}/sgiseeq.h (100%)
 create mode 100644 drivers/net/ethernet/sis/Kconfig
 create mode 100644 drivers/net/ethernet/sis/Makefile
 rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
 rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
 rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
 create mode 100644 drivers/net/ethernet/smc/Kconfig
 create mode 100644 drivers/net/ethernet/smc/Makefile
 rename drivers/net/{ => ethernet/smc}/epic100.c (100%)
 rename drivers/net/{ => ethernet/smc}/smc9194.c (100%)
 rename drivers/net/{ => ethernet/smc}/smc9194.h (100%)
 rename drivers/net/{ => ethernet/smc}/smc91x.c (100%)
 rename drivers/net/{ => ethernet/smc}/smc91x.h (100%)
 create mode 100644 drivers/net/ethernet/smsc/Kconfig
 create mode 100644 drivers/net/ethernet/smsc/Makefile
 rename drivers/net/{ => ethernet/smsc}/smc911x.c (100%)
 rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
 rename drivers/net/{ => ethernet/smsc}/smsc911x.c (100%)
 rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
 rename drivers/net/{ => ethernet/smsc}/smsc9420.c (100%)
 rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
 create mode 100644 drivers/net/ethernet/sony/Kconfig
 create mode 100644 drivers/net/ethernet/sony/Makefile
 rename drivers/net/{ => ethernet/sony}/ps3_gelic_net.c (100%)
 rename drivers/net/{ => ethernet/sony}/ps3_gelic_net.h (100%)
 rename drivers/net/{ => ethernet/sony}/ps3_gelic_wireless.c (100%)
 rename drivers/net/{ => ethernet/sony}/ps3_gelic_wireless.h (100%)
 rename drivers/net/{ => ethernet}/starfire.c (100%)
 create mode 100644 drivers/net/ethernet/stmicro/Kconfig
 create mode 100644 drivers/net/ethernet/stmicro/Makefile
 rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (92%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
 create mode 100644 drivers/net/ethernet/sun/Kconfig
 create mode 100644 drivers/net/ethernet/sun/Makefile
 rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
 rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
 rename drivers/net/{ => ethernet/sun}/niu.c (100%)
 rename drivers/net/{ => ethernet/sun}/niu.h (100%)
 rename drivers/net/{ => ethernet/sun}/sun3_82586.c (100%)
 rename drivers/net/{ => ethernet/sun}/sun3_82586.h (100%)
 rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
 rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
 rename drivers/net/{ => ethernet/sun}/sungem.c (100%)
 rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
 rename drivers/net/{ => ethernet/sun}/sungem_phy.c (100%)
 rename drivers/net/{ => ethernet/sun}/sungem_phy.h (100%)
 rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
 rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
 rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
 rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
 rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
 rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
 rename drivers/net/{ => ethernet}/sundance.c (100%)
 create mode 100644 drivers/net/ethernet/syskonnect/Kconfig
 create mode 100644 drivers/net/ethernet/syskonnect/Makefile
 rename drivers/net/{ => ethernet/syskonnect}/skge.c (100%)
 rename drivers/net/{ => ethernet/syskonnect}/skge.h (100%)
 rename drivers/net/{ => ethernet/syskonnect}/sky2.c (100%)
 rename drivers/net/{ => ethernet/syskonnect}/sky2.h (100%)
 rename drivers/net/{ => ethernet}/tehuti.c (100%)
 rename drivers/net/{ => ethernet}/tehuti.h (100%)
 create mode 100644 drivers/net/ethernet/ti/Kconfig
 create mode 100644 drivers/net/ethernet/ti/Makefile
 rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
 rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
 rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
 rename drivers/net/{ => ethernet}/tsi108_eth.c (100%)
 rename drivers/net/{ => ethernet}/tsi108_eth.h (100%)
 rename drivers/net/{ => ethernet}/tulip/21142.c (100%)
 rename drivers/net/{ => ethernet}/tulip/Kconfig (93%)
 rename drivers/net/{ => ethernet}/tulip/Makefile (100%)
 rename drivers/net/{ => ethernet}/tulip/de2104x.c (100%)
 rename drivers/net/{ => ethernet}/tulip/de4x5.c (100%)
 rename drivers/net/{ => ethernet}/tulip/de4x5.h (100%)
 rename drivers/net/{ => ethernet}/tulip/dmfe.c (100%)
 rename drivers/net/{ => ethernet}/tulip/eeprom.c (100%)
 rename drivers/net/{ => ethernet}/tulip/interrupt.c (100%)
 rename drivers/net/{ => ethernet}/tulip/media.c (100%)
 rename drivers/net/{ => ethernet}/tulip/pnic.c (100%)
 rename drivers/net/{ => ethernet}/tulip/pnic2.c (100%)
 rename drivers/net/{ => ethernet}/tulip/timer.c (100%)
 rename drivers/net/{ => ethernet}/tulip/tulip.h (100%)
 rename drivers/net/{ => ethernet}/tulip/tulip_core.c (100%)
 rename drivers/net/{ => ethernet}/tulip/uli526x.c (100%)
 rename drivers/net/{ => ethernet}/tulip/winbond-840.c (100%)
 rename drivers/net/{ => ethernet}/tulip/xircom_cb.c (100%)
 create mode 100644 drivers/net/ethernet/via/Kconfig
 create mode 100644 drivers/net/ethernet/via/Makefile
 rename drivers/net/{ => ethernet/via}/via-rhine.c (100%)
 rename drivers/net/{ => ethernet/via}/via-velocity.c (100%)
 rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
 create mode 100644 drivers/net/ethernet/xilinx/Kconfig
 create mode 100644 drivers/net/ethernet/xilinx/Makefile
 rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
 rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
 rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
 rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)

-- 
1.7.5.4


^ permalink raw reply	[flat|nested] 135+ messages in thread
* [RFC 01/72] drivers/net/ethernet: Add ethernet dir and config option
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers Jeff Kirsher
                   ` (73 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev

This is the initial patch to organize the drivers/net directory
structure and networking device driver config options.  This patch
does the following:
  - add drivers/net/ethernet/Kconfig
  - integrate the new files into the existing config

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig           |    2 ++
 drivers/net/Makefile          |    2 +-
 drivers/net/ethernet/Kconfig  |   14 ++++++++++++++
 drivers/net/ethernet/Makefile |    4 ++++
 4 files changed, 21 insertions(+), 1 deletions(-)
 create mode 100644 drivers/net/ethernet/Kconfig
 create mode 100644 drivers/net/ethernet/Makefile

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f5919c2..32aa191 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -193,6 +193,8 @@ source "drivers/net/phy/Kconfig"
 #	Ethernet
 #
 
+source "drivers/net/ethernet/Kconfig"
+
 menuconfig NET_ETHERNET
 	bool "Ethernet (10 or 100Mbit)"
 	depends on !UML
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 86f6c8d..848f95a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the Linux network (ethercard) device drivers.
+# Makefile for the Linux network device drivers.
 #
 
 obj-$(CONFIG_MII) += mii.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
new file mode 100644
index 0000000..d59e4f2
--- /dev/null
+++ b/drivers/net/ethernet/Kconfig
@@ -0,0 +1,14 @@
+#
+# Ethernet LAN device configuration
+#
+
+menuconfig ETHERNET
+	bool "Ethernet driver support"
+	depends on NET
+	default y
+	---help---
+	  This section contains all the Ethernet device drivers.
+
+if ETHERNET
+
+endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
new file mode 100644
index 0000000..d52694b
--- /dev/null
+++ b/drivers/net/ethernet/Makefile
@@ -0,0 +1,4 @@
+#
+# Makefile for the Linux network Ethernet device drivers.
+#
+
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
  2011-06-25 13:58 ` [RFC 01/72] drivers/net/ethernet: Add ethernet dir and config option Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 16:11   ` David Dillow
  2011-06-28  8:22   ` Alan Cox
  2011-06-25 13:58 ` [RFC 03/72] amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers Jeff Kirsher
                   ` (72 subsequent siblings)
  74 siblings, 2 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Philip Blundell, Steffen Klassert,
	David Dillow, Jes Sorensen, Alan Cox, Donald Becker,
	Craig Southeren, David Hinds

Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
Kconfig and Makefile changes.

CC: Philip Blundell <philb@gnu.org>
CC: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
CC: David Dillow <dave@thedillows.org>
CC: Jes Sorensen <jes@trained-monkey.org>
CC: Alan Cox <alan@linux.intel.com>
CC: Donald Becker <becker@scyld.com>
CC: Craig Southeren <craigs@ineluki.apana.org.au>
CC: David Hinds <dahinds@users.sourceforge.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                      |    8 +-
 drivers/net/Kconfig                              |  177 -------------------
 drivers/net/Makefile                             |   12 +--
 drivers/net/{ => ethernet/3com}/3c501.c          |    0
 drivers/net/{ => ethernet/3com}/3c501.h          |    0
 drivers/net/{ => ethernet/3com}/3c503.c          |    0
 drivers/net/{ => ethernet/3com}/3c503.h          |    0
 drivers/net/{ => ethernet/3com}/3c505.c          |    0
 drivers/net/{ => ethernet/3com}/3c505.h          |    0
 drivers/net/{ => ethernet/3com}/3c507.c          |    0
 drivers/net/{ => ethernet/3com}/3c509.c          |    0
 drivers/net/{ => ethernet/3com}/3c515.c          |    0
 drivers/net/{ => ethernet/3com}/3c523.c          |    0
 drivers/net/{ => ethernet/3com}/3c523.h          |    0
 drivers/net/{ => ethernet/3com}/3c527.c          |    0
 drivers/net/{ => ethernet/3com}/3c527.h          |    0
 drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c |    0
 drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c |    0
 drivers/net/{ => ethernet/3com}/3c59x.c          |    0
 drivers/net/ethernet/3com/Kconfig                |  200 ++++++++++++++++++++++
 drivers/net/ethernet/3com/Makefile               |   17 ++
 drivers/net/{ => ethernet/3com}/acenic.c         |    0
 drivers/net/{ => ethernet/3com}/acenic.h         |    0
 drivers/net/{ => ethernet/3com}/typhoon.c        |    0
 drivers/net/{ => ethernet/3com}/typhoon.h        |    0
 drivers/net/ethernet/Kconfig                     |    2 +
 drivers/net/ethernet/Makefile                    |    1 +
 drivers/net/pcmcia/Kconfig                       |   18 --
 drivers/net/pcmcia/Makefile                      |    2 -
 29 files changed, 225 insertions(+), 212 deletions(-)
 rename drivers/net/{ => ethernet/3com}/3c501.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
 rename drivers/net/{ => ethernet/3com}/3c503.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c503.h (100%)
 rename drivers/net/{ => ethernet/3com}/3c505.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c505.h (100%)
 rename drivers/net/{ => ethernet/3com}/3c507.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c509.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c515.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c523.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c523.h (100%)
 rename drivers/net/{ => ethernet/3com}/3c527.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c527.h (100%)
 rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (100%)
 rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (100%)
 rename drivers/net/{ => ethernet/3com}/3c59x.c (100%)
 create mode 100644 drivers/net/ethernet/3com/Kconfig
 create mode 100644 drivers/net/ethernet/3com/Makefile
 rename drivers/net/{ => ethernet/3com}/acenic.c (100%)
 rename drivers/net/{ => ethernet/3com}/acenic.h (100%)
 rename drivers/net/{ => ethernet/3com}/typhoon.c (100%)
 rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index f0358cd..e4ac504 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -116,20 +116,20 @@ Maintainers List (try to look for most precise areas first)
 M:	Philip Blundell <philb@gnu.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/3c505*
+F:	drivers/net/ethernet/3com/3c505*
 
 3C59X NETWORK DRIVER
 M:	Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
 L:	netdev@vger.kernel.org
 S:	Maintained
 F:	Documentation/networking/vortex.txt
-F:	drivers/net/3c59x.c
+F:	drivers/net/ethernet/3com/3c59x.c
 
 3CR990 NETWORK DRIVER
 M:	David Dillow <dave@thedillows.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/typhoon*
+F:	drivers/net/ethernet/3com/typhoon*
 
 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
 M:	Adam Radford <linuxraid@lsi.com>
@@ -213,7 +213,7 @@ ACENIC DRIVER
 M:	Jes Sorensen <jes@trained-monkey.org>
 L:	linux-acenic@sunsite.dk
 S:	Maintained
-F:	drivers/net/acenic*
+F:	drivers/net/ethernet/3com/acenic*
 
 ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
 M:	Peter Feuerer <peter@piie.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 32aa191..b5248ce 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -616,156 +616,6 @@ config SUNVNET
 	help
 	  Support for virtual network devices under Sun Logical Domains.
 
-config NET_VENDOR_3COM
-	bool "3COM cards"
-	depends on ISA || EISA || MCA || 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 3COM cards. If you say Y, you will be asked for
-	  your specific card in the following questions.
-
-config EL1
-	tristate "3c501 \"EtherLink\" support"
-	depends on NET_VENDOR_3COM && ISA
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.  Also, consider buying a
-	  new card, since the 3c501 is slow, broken, and obsolete: you will
-	  have problems.  Some people suggest to ping ("man ping") a nearby
-	  machine every minute ("man cron") when using this card.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c501.
-
-config EL2
-	tristate "3c503 \"EtherLink II\" support"
-	depends on NET_VENDOR_3COM && ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c503.
-
-config ELPLUS
-	tristate "3c505 \"EtherLink Plus\" support"
-	depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
-	---help---
-	  Information about this network (Ethernet) card can be found in
-	  <file:Documentation/networking/3c505.txt>.  If you have a card of
-	  this type, say Y and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c505.
-
-config EL16
-	tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
-	depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c507.
-
-config EL3
-	tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
-	depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
-	---help---
-	  If you have a network (Ethernet) card belonging to the 3Com
-	  EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
-	  from <http://www.tldp.org/docs.html#howto>.
-
-	  If your card is not working you may need to use the DOS
-	  setup disk to disable Plug & Play mode, and to select the default
-	  media type.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c509.
-
-config 3C515
-	tristate "3c515 ISA \"Fast EtherLink\""
-	depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
-	help
-	  If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
-	  network card, say Y and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c515.
-
-config ELMC
-	tristate "3c523 \"EtherLink/MC\" support"
-	depends on NET_VENDOR_3COM && MCA_LEGACY
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c523.
-
-config ELMC_II
-	tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
-	depends on NET_VENDOR_3COM && MCA && MCA_LEGACY
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called 3c527.
-
-config VORTEX
-	tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
-	depends on NET_VENDOR_3COM && (PCI || EISA)
-	select MII
-	---help---
-	  This option enables driver support for a large number of 10Mbps and
-	  10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
-
-	  "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
-	  "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI
-	  "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
-	  "Tornado"   (3c905)                                  PCI
-	  "Hurricane" (3c555/3cSOHO)                           PCI
-
-	  If you have such a card, say Y and read the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>. More
-	  specific information is in
-	  <file:Documentation/networking/vortex.txt> and in the comments at
-	  the beginning of <file:drivers/net/3c59x.c>.
-
-	  To compile this support as a module, choose M here.
-
-config TYPHOON
-	tristate "3cr990 series \"Typhoon\" support"
-	depends on NET_VENDOR_3COM && PCI
-	select CRC32
-	---help---
-	  This option enables driver support for the 3cr990 series of cards:
-
-	  3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
-	  3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
-	  3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
-
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called typhoon.
-
 config LANCE
 	tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
 	depends on ISA && ISA_DMA_API
@@ -2053,33 +1903,6 @@ menuconfig NETDEV_1000
 
 if NETDEV_1000
 
-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.
-
 config DL2K
 	tristate "DL2000/TC902x-based Gigabit Ethernet support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 848f95a..376a30d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -66,8 +66,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 
-obj-$(CONFIG_VORTEX) += 3c59x.o
-obj-$(CONFIG_TYPHOON) += typhoon.o
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_PCNET32) += pcnet32.o
 obj-$(CONFIG_E100) += e100.o
@@ -78,7 +76,6 @@ obj-$(CONFIG_SIS190) += sis190.o
 obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
-obj-$(CONFIG_ACENIC) += acenic.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
@@ -129,7 +126,6 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
 endif
 obj-$(CONFIG_68360_ENET) += 68360enet.o
 obj-$(CONFIG_WD80x3) += wd.o 8390.o
-obj-$(CONFIG_EL2) += 3c503.o 8390p.o
 obj-$(CONFIG_NE2000) += ne.o 8390p.o
 obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
 obj-$(CONFIG_HPLAN) += hp.o 8390p.o
@@ -188,13 +184,7 @@ obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_EL1) += 3c501.o
-obj-$(CONFIG_EL16) += 3c507.o
-obj-$(CONFIG_ELMC) += 3c523.o
 obj-$(CONFIG_IBMLANA) += ibmlana.o
-obj-$(CONFIG_ELMC_II) += 3c527.o
-obj-$(CONFIG_EL3) += 3c509.o
-obj-$(CONFIG_3C515) += 3c515.o
 obj-$(CONFIG_EEXPRESS) += eexpress.o
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
 obj-$(CONFIG_8139CP) += 8139cp.o
@@ -207,7 +197,6 @@ obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_NI5010) += ni5010.o
 obj-$(CONFIG_NI52) += ni52.o
 obj-$(CONFIG_NI65) += ni65.o
-obj-$(CONFIG_ELPLUS) += 3c505.o
 obj-$(CONFIG_AC3200) += ac3200.o 8390.o
 obj-$(CONFIG_APRICOT) += 82596.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
@@ -270,6 +259,7 @@ obj-$(CONFIG_S6GMAC) += s6gmac.o
 
 obj-$(CONFIG_ARM) += arm/
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
+obj-$(CONFIG_ETHERNET) += ethernet/
 obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_ARCNET) += arcnet/
diff --git a/drivers/net/3c501.c b/drivers/net/ethernet/3com/3c501.c
similarity index 100%
rename from drivers/net/3c501.c
rename to drivers/net/ethernet/3com/3c501.c
diff --git a/drivers/net/3c501.h b/drivers/net/ethernet/3com/3c501.h
similarity index 100%
rename from drivers/net/3c501.h
rename to drivers/net/ethernet/3com/3c501.h
diff --git a/drivers/net/3c503.c b/drivers/net/ethernet/3com/3c503.c
similarity index 100%
rename from drivers/net/3c503.c
rename to drivers/net/ethernet/3com/3c503.c
diff --git a/drivers/net/3c503.h b/drivers/net/ethernet/3com/3c503.h
similarity index 100%
rename from drivers/net/3c503.h
rename to drivers/net/ethernet/3com/3c503.h
diff --git a/drivers/net/3c505.c b/drivers/net/ethernet/3com/3c505.c
similarity index 100%
rename from drivers/net/3c505.c
rename to drivers/net/ethernet/3com/3c505.c
diff --git a/drivers/net/3c505.h b/drivers/net/ethernet/3com/3c505.h
similarity index 100%
rename from drivers/net/3c505.h
rename to drivers/net/ethernet/3com/3c505.h
diff --git a/drivers/net/3c507.c b/drivers/net/ethernet/3com/3c507.c
similarity index 100%
rename from drivers/net/3c507.c
rename to drivers/net/ethernet/3com/3c507.c
diff --git a/drivers/net/3c509.c b/drivers/net/ethernet/3com/3c509.c
similarity index 100%
rename from drivers/net/3c509.c
rename to drivers/net/ethernet/3com/3c509.c
diff --git a/drivers/net/3c515.c b/drivers/net/ethernet/3com/3c515.c
similarity index 100%
rename from drivers/net/3c515.c
rename to drivers/net/ethernet/3com/3c515.c
diff --git a/drivers/net/3c523.c b/drivers/net/ethernet/3com/3c523.c
similarity index 100%
rename from drivers/net/3c523.c
rename to drivers/net/ethernet/3com/3c523.c
diff --git a/drivers/net/3c523.h b/drivers/net/ethernet/3com/3c523.h
similarity index 100%
rename from drivers/net/3c523.h
rename to drivers/net/ethernet/3com/3c523.h
diff --git a/drivers/net/3c527.c b/drivers/net/ethernet/3com/3c527.c
similarity index 100%
rename from drivers/net/3c527.c
rename to drivers/net/ethernet/3com/3c527.c
diff --git a/drivers/net/3c527.h b/drivers/net/ethernet/3com/3c527.h
similarity index 100%
rename from drivers/net/3c527.h
rename to drivers/net/ethernet/3com/3c527.h
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
similarity index 100%
rename from drivers/net/pcmcia/3c574_cs.c
rename to drivers/net/ethernet/3com/3c574_cs.c
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
similarity index 100%
rename from drivers/net/pcmcia/3c589_cs.c
rename to drivers/net/ethernet/3com/3c589_cs.c
diff --git a/drivers/net/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
similarity index 100%
rename from drivers/net/3c59x.c
rename to drivers/net/ethernet/3com/3c59x.c
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
new file mode 100644
index 0000000..9b343d9
--- /dev/null
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -0,0 +1,200 @@
+#
+# 3Com Ethernet device configuration
+#
+
+config NET_VENDOR_3COM
+	bool "3Com devices"
+	depends on ISA || EISA || MCA || PCI || PCMCIA
+	---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 3COM cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config EL1
+	tristate "3c501 \"EtherLink\" support"
+	depends on NET_VENDOR_3COM && ISA
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.  Also, consider buying a
+	  new card, since the 3c501 is slow, broken, and obsolete: you will
+	  have problems.  Some people suggest to ping ("man ping") a nearby
+	  machine every minute ("man cron") when using this card.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c501.
+
+config EL2
+	tristate "3c503 \"EtherLink II\" support"
+	depends on NET_VENDOR_3COM && ISA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c503.
+
+config ELPLUS
+	tristate "3c505 \"EtherLink Plus\" support"
+	depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
+	---help---
+	  Information about this network (Ethernet) card can be found in
+	  <file:Documentation/networking/3c505.txt>.  If you have a card of
+	  this type, say Y and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c505.
+
+config EL16
+	tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
+	depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c507.
+
+config EL3
+	tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
+	depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
+	---help---
+	  If you have a network (Ethernet) card belonging to the 3Com
+	  EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
+	  from <http://www.tldp.org/docs.html#howto>.
+
+	  If your card is not working you may need to use the DOS
+	  setup disk to disable Plug & Play mode, and to select the default
+	  media type.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c509.
+
+config 3C515
+	tristate "3c515 ISA \"Fast EtherLink\""
+	depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
+	---help---
+	  If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
+	  network card, say Y and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c515.
+
+config ELMC
+	tristate "3c523 \"EtherLink/MC\" support"
+	depends on NET_VENDOR_3COM && MCA_LEGACY
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c523.
+
+config ELMC_II
+	tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
+	depends on NET_VENDOR_3COM && MCA && MCA_LEGACY
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called 3c527.
+
+config PCMCIA_3C574
+	tristate "3Com 3c574 PCMCIA support"
+	depends on NET_VENDOR_3COM && PCMCIA
+	---help---
+	  Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA
+	  (PC-card) Fast Ethernet card to your computer.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called 3c574_cs.  If unsure, say N.
+
+config PCMCIA_3C589
+	tristate "3Com 3c589 PCMCIA support"
+	depends on NET_VENDOR_3COM && PCMCIA
+	---help---
+	  Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA
+	  (PC-card) Ethernet card to your computer.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called 3c589_cs.  If unsure, say N.
+
+config VORTEX
+	tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
+	depends on NET_VENDOR_3COM && (PCI || EISA)
+	select MII
+	---help---
+	  This option enables driver support for a large number of 10Mbps and
+	  10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
+
+	  "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
+	  "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI
+	  "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
+	  "Tornado"   (3c905)                                  PCI
+	  "Hurricane" (3c555/3cSOHO)                           PCI
+
+	  If you have such a card, say Y and read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>. More
+	  specific information is in
+	  <file:Documentation/networking/vortex.txt> and in the comments at
+	  the beginning of <file:drivers/net/3c59x.c>.
+
+	  To compile this support as a module, choose M here.
+
+config TYPHOON
+	tristate "3cr990 series \"Typhoon\" support"
+	depends on NET_VENDOR_3COM && PCI
+	select CRC32
+	---help---
+	  This option enables driver support for the 3cr990 series of cards:
+
+	  3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
+	  3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
+	  3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
+
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  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 NET_VENDOR_3COM && 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.
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
new file mode 100644
index 0000000..a86fdac
--- /dev/null
+++ b/drivers/net/ethernet/3com/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile for the 3Com Ethernet device drivers
+#
+
+obj-$(CONFIG_EL1) += 3c501.o
+obj-$(CONFIG_EL2) += 3c503.o ../../8390p.o
+obj-$(CONFIG_ELPLUS) += 3c505.o
+obj-$(CONFIG_EL16) += 3c507.o
+obj-$(CONFIG_EL3) += 3c509.o
+obj-$(CONFIG_3C515) += 3c515.o
+obj-$(CONFIG_ELMC) += 3c523.o
+obj-$(CONFIG_ELMC_II) += 3c527.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
diff --git a/drivers/net/acenic.c b/drivers/net/ethernet/3com/acenic.c
similarity index 100%
rename from drivers/net/acenic.c
rename to drivers/net/ethernet/3com/acenic.c
diff --git a/drivers/net/acenic.h b/drivers/net/ethernet/3com/acenic.h
similarity index 100%
rename from drivers/net/acenic.h
rename to drivers/net/ethernet/3com/acenic.h
diff --git a/drivers/net/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
similarity index 100%
rename from drivers/net/typhoon.c
rename to drivers/net/ethernet/3com/typhoon.c
diff --git a/drivers/net/typhoon.h b/drivers/net/ethernet/3com/typhoon.h
similarity index 100%
rename from drivers/net/typhoon.h
rename to drivers/net/ethernet/3com/typhoon.h
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index d59e4f2..18193ec 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -11,4 +11,6 @@ menuconfig ETHERNET
 
 if ETHERNET
 
+source "drivers/net/ethernet/3com/Kconfig"
+
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index d52694b..07766ba 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -2,3 +2,4 @@
 # Makefile for the Linux network Ethernet device drivers.
 #
 
+obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 9b8f793..b67c5ed 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -21,24 +21,6 @@ menuconfig NET_PCMCIA
 
 if NET_PCMCIA && PCMCIA
 
-config PCMCIA_3C589
-	tristate "3Com 3c589 PCMCIA support"
-	help
-	  Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA
-	  (PC-card) Ethernet card to your computer.
-
-	  To compile this driver as a module, choose M here: the module will be
-	  called 3c589_cs.  If unsure, say N.
-
-config PCMCIA_3C574
-	tristate "3Com 3c574 PCMCIA support"
-	help
-	  Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA
-	  (PC-card) Fast Ethernet card to your computer.
-
-	  To compile this driver as a module, choose M here: the module will be
-	  called 3c574_cs.  If unsure, say N.
-
 config PCMCIA_FMVJ18X
 	tristate "Fujitsu FMV-J18x PCMCIA support"
 	select CRC32
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 87d2d99..2f2ab3b 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -3,8 +3,6 @@
 #
 
 # 16-bit client drivers
-obj-$(CONFIG_PCMCIA_3C589)	+= 3c589_cs.o
-obj-$(CONFIG_PCMCIA_3C574)	+= 3c574_cs.o
 obj-$(CONFIG_PCMCIA_FMVJ18X)	+= fmvj18x_cs.o
 obj-$(CONFIG_PCMCIA_NMCLAN)	+= nmclan_cs.o
 obj-$(CONFIG_PCMCIA_PCNET)	+= pcnet_cs.o
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 03/72] amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
  2011-06-25 13:58 ` [RFC 01/72] drivers/net/ethernet: Add ethernet dir and config option Jeff Kirsher
  2011-06-25 13:58 ` [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 04/72] 8390: Move the 8390 related drivers Jeff Kirsher
                   ` (71 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Peter Maydell, Roman Hodek,
	Maciej W. Rozycki, Donald Becker, Sam Creasey, Miguel de Icaza,
	Thomas Bogendoerfer, Don Fry

Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/
and the necessary Kconfig and Makfile changes.

CC: Peter Maydell <pmaydell@chiark.greenend.org.uk>
CC: Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
CC: "Maciej W. Rozycki" <macro@linux-mips.org>
CC: Donald Becker <becker@scyld.com>
CC: Sam Creasey <sammy@users.qual.net>
CC: Miguel de Icaza <miguel@nuclecu.unam.mx>
CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
CC: Don Fry <pcnet32@frontier.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                 |    2 +-
 drivers/net/Kconfig                         |   99 -----------------------
 drivers/net/Makefile                        |    9 --
 drivers/net/ethernet/Kconfig                |    1 +
 drivers/net/ethernet/Makefile               |    1 +
 drivers/net/{ => ethernet/amd}/7990.c       |    0
 drivers/net/{ => ethernet/amd}/7990.h       |    0
 drivers/net/ethernet/amd/Kconfig            |  115 +++++++++++++++++++++++++++
 drivers/net/ethernet/amd/Makefile           |   13 +++
 drivers/net/{ => ethernet/amd}/amd8111e.c   |    0
 drivers/net/{ => ethernet/amd}/amd8111e.h   |    0
 drivers/net/{ => ethernet/amd}/atarilance.c |    0
 drivers/net/{ => ethernet/amd}/declance.c   |    0
 drivers/net/{ => ethernet/amd}/hplance.c    |    0
 drivers/net/{ => ethernet/amd}/hplance.h    |    0
 drivers/net/{ => ethernet/amd}/lance.c      |    0
 drivers/net/{ => ethernet/amd}/mvme147.c    |    0
 drivers/net/{ => ethernet/amd}/pcnet32.c    |    0
 drivers/net/{ => ethernet/amd}/sun3lance.c  |    0
 drivers/net/{ => ethernet/amd}/sunlance.c   |    0
 20 files changed, 131 insertions(+), 109 deletions(-)
 rename drivers/net/{ => ethernet/amd}/7990.c (100%)
 rename drivers/net/{ => ethernet/amd}/7990.h (100%)
 create mode 100644 drivers/net/ethernet/amd/Kconfig
 create mode 100644 drivers/net/ethernet/amd/Makefile
 rename drivers/net/{ => ethernet/amd}/amd8111e.c (100%)
 rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
 rename drivers/net/{ => ethernet/amd}/atarilance.c (100%)
 rename drivers/net/{ => ethernet/amd}/declance.c (100%)
 rename drivers/net/{ => ethernet/amd}/hplance.c (100%)
 rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
 rename drivers/net/{ => ethernet/amd}/lance.c (100%)
 rename drivers/net/{ => ethernet/amd}/mvme147.c (100%)
 rename drivers/net/{ => ethernet/amd}/pcnet32.c (100%)
 rename drivers/net/{ => ethernet/amd}/sun3lance.c (100%)
 rename drivers/net/{ => ethernet/amd}/sunlance.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index e4ac504..e155522 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4875,7 +4875,7 @@ PCNET32 NETWORK DRIVER
 M:	Don Fry <pcnet32@frontier.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/pcnet32.c
+F:	drivers/net/ethernet/amd/pcnet32.c
 
 PCRYPT PARALLEL CRYPTO ENGINE
 M:	Steffen Klassert <steffen.klassert@secunet.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b5248ce..28abb09 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -387,16 +387,6 @@ config MACMACE
 	  say Y and read the Ethernet-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.
 
-config MVME147_NET
-	tristate "MVME147 (Lance) Ethernet support"
-	depends on MVME147
-	select CRC32
-	help
-	  Support for the on-board Ethernet interface on the Motorola MVME147
-	  single-board computer.  Say Y here to include the
-	  driver for this chip in your kernel.
-	  To compile this driver as a module, choose M here.
-
 config MVME16x_NET
 	tristate "MVME16x Ethernet support"
 	depends on MVME16x
@@ -415,27 +405,6 @@ config BVME6000_NET
 	  in your kernel.
 	  To compile this driver as a module, choose M here.
 
-config ATARILANCE
-	tristate "Atari Lance support"
-	depends on ATARI
-	help
-	  Say Y to include support for several Atari Ethernet adapters based
-	  on the AMD Lance chipset: RieblCard (with or without battery), or
-	  PAMCard VME (also the version by Rhotron, with different addresses).
-
-config SUN3LANCE
-	tristate "Sun3/Sun3x on-board LANCE support"
-	depends on SUN3 || SUN3X
-	help
-	  Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
-	  featured an AMD Lance 10Mbit Ethernet controller on board; say Y
-	  here to compile in the Linux driver for this and enable Ethernet.
-	  General Linux information on the Sun 3 and 3x series (now
-	  discontinued) is at
-	  <http://www.angelfire.com/ca2/tech68k/sun3.html>.
-
-	  If you're not building a kernel for a Sun 3, say N.
-
 config SUN3_82586
 	bool "Sun3 on-board Intel 82586 support"
 	depends on SUN3
@@ -445,14 +414,6 @@ config SUN3_82586
 	  that this driver does not support 82586-based adapters on additional
 	  VME boards.
 
-config HPLANCE
-	bool "HP on-board LANCE support"
-	depends on DIO
-	select CRC32
-	help
-	  If you want to use the builtin "LANCE" Ethernet controller on an
-	  HP300 machine, say Y here.
-
 config LASI_82596
 	tristate "Lasi ethernet"
 	depends on GSC
@@ -545,19 +506,6 @@ config SH_ETH
 	  This driver supporting CPUs are:
 		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
 
-config SUNLANCE
-	tristate "Sun LANCE support"
-	depends on SBUS
-	select CRC32
-	help
-	  This driver supports the "le" interface present on all 32-bit Sparc
-	  systems, on some older Ultra systems and as an Sbus option.  These
-	  cards are based on the AMD Lance chipset, which is better known
-	  via the NE2100 cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sunlance.
-
 config HAPPYMEAL
 	tristate "Sun Happy Meal 10/100baseT support"
 	depends on SBUS || PCI
@@ -616,18 +564,6 @@ config SUNVNET
 	help
 	  Support for virtual network devices under Sun Logical Domains.
 
-config LANCE
-	tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
-	depends on ISA && ISA_DMA_API
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>. Some LinkSys cards are
-	  of this type.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called lance.  This is recommended.
-
 config NET_VENDOR_SMC
 	bool "Western Digital/SMC cards"
 	depends on ISA || MCA || EISA || MAC
@@ -1230,32 +1166,6 @@ config NET_PCI
 	  will be asked for your specific card in the following questions. If
 	  you are unsure, say Y.
 
-config PCNET32
-	tristate "AMD PCnet32 PCI support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
-	  answer Y here and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called pcnet32.
-
-config AMD8111_ETH
-	tristate "AMD 8111 (new PCI lance) support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  If you have an AMD 8111-based PCI lance ethernet card,
-	  answer Y here and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called amd8111e.
-
 config ADAPTEC_STARFIRE
 	tristate "Adaptec Starfire/DuraLAN support"
 	depends on NET_PCI && PCI
@@ -1777,15 +1687,6 @@ config SGISEEQ
 	  Say Y here if you have an Seeq based Ethernet network card. This is
 	  used in many Silicon Graphics machines.
 
-config DECLANCE
-	tristate "DEC LANCE ethernet controller support"
-	depends on MACH_DECSTATION
-	select CRC32
-	help
-	  This driver is for the series of Ethernet controllers produced by
-	  DEC (now Compaq) based on the AMD Lance chipset, including the
-	  DEPCA series.  (This chipset is better known via the NE2100 cards.)
-
 config 68360_ENET
 	bool "Motorola 68360 ethernet controller"
 	depends on M68360
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 376a30d..f70087d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -56,7 +56,6 @@ obj-$(CONFIG_PLIP) += plip.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
 obj-$(CONFIG_HAPPYMEAL) += sunhme.o
-obj-$(CONFIG_SUNLANCE) += sunlance.o
 obj-$(CONFIG_SUNQE) += sunqe.o
 obj-$(CONFIG_SUNBMAC) += sunbmac.o
 obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
@@ -67,7 +66,6 @@ obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
-obj-$(CONFIG_PCNET32) += pcnet32.o
 obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
@@ -177,9 +175,7 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DE600) += de600.o
 obj-$(CONFIG_DE620) += de620.o
-obj-$(CONFIG_LANCE) += lance.o
 obj-$(CONFIG_SUN3_82586) += sun3_82586.o
-obj-$(CONFIG_SUN3LANCE) += sun3lance.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
@@ -210,16 +206,12 @@ obj-$(CONFIG_LP486E) += lp486e.o
 
 obj-$(CONFIG_ETH16I) += eth16i.o
 obj-$(CONFIG_ZORRO8390) += zorro8390.o
-obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
-obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
-obj-$(CONFIG_DECLANCE) += declance.o
-obj-$(CONFIG_ATARILANCE) += atarilance.o
 obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_HYDRA) += hydra.o
 obj-$(CONFIG_ARIADNE) += ariadne.o
@@ -232,7 +224,6 @@ obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_S2IO) += s2io.o
 obj-$(CONFIG_VXGE) += vxge/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 18193ec..5e62efd 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -12,5 +12,6 @@ menuconfig ETHERNET
 if ETHERNET
 
 source "drivers/net/ethernet/3com/Kconfig"
+source "drivers/net/ethernet/amd/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 07766ba..1bc2ac2 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -3,3 +3,4 @@
 #
 
 obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
+obj-$(CONFIG_NET_VENDOR_AMD) += amd/
diff --git a/drivers/net/7990.c b/drivers/net/ethernet/amd/7990.c
similarity index 100%
rename from drivers/net/7990.c
rename to drivers/net/ethernet/amd/7990.c
diff --git a/drivers/net/7990.h b/drivers/net/ethernet/amd/7990.h
similarity index 100%
rename from drivers/net/7990.h
rename to drivers/net/ethernet/amd/7990.h
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
new file mode 100644
index 0000000..0b1e591
--- /dev/null
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -0,0 +1,115 @@
+#
+# AMD network device configuration
+#
+
+config NET_VENDOR_AMD
+	bool "AMD devices"
+	depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \
+		   SUN3X || SBUS || PCI || (ISA && ISA_DMA_API)
+	---help---
+	  If you have a network (Ethernet) chipset belonging to this class,
+	  say Y.
+
+	  Note that the answer to this question does not directly affect
+	  the kernel: saying N will just case the configurator to skip all
+	  the questions regarding AMD chipsets. If you say Y, you will be asked
+	  for your specific chipset/driver in the following questions.
+
+config AMD8111_ETH
+	tristate "AMD 8111 (new PCI LANCE) support"
+	depends on PCI && NET_VENDOR_AMD
+	select CRC32
+	select MII
+	---help---
+	  If you have an AMD 8111-based PCI LANCE ethernet card,
+	  answer Y here and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called amd8111e.
+
+config ATARILANCE
+	tristate "Atari LANCE support"
+	depends on ATARI && NET_VENDOR_AMD
+	---help---
+	  Say Y to include support for several Atari Ethernet adapters based
+	  on the AMD LANCE chipset: RieblCard (with or without battery), or
+	  PAMCard VME (also the version by Rhotron, with different addresses).
+
+config DECLANCE
+	tristate "DEC LANCE ethernet controller support"
+	depends on MACH_DECSTATION && NET_VENDOR_AMD
+	select CRC32
+	---help---
+	  This driver is for the series of Ethernet controllers produced by
+	  DEC (now Compaq) based on the AMD LANCE chipset, including the
+	  DEPCA series.  (This chipset is better known via the NE2100 cards.)
+
+config HPLANCE
+	bool "HP on-board LANCE support"
+	depends on DIO && NET_VENDOR_AMD
+	select CRC32
+	---help---
+	  If you want to use the builtin "LANCE" Ethernet controller on an
+	  HP300 machine, say Y here.
+
+config LANCE
+	tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
+	depends on ISA && ISA_DMA_API && NET_VENDOR_AMD
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>. Some LinkSys cards are
+	  of this type.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called lance.  This is recommended.
+
+config MVME147_NET
+	tristate "MVME147 (LANCE) Ethernet support"
+	depends on MVME147 && NET_VENDOR_AMD
+	select CRC32
+	---help---
+	  Support for the on-board Ethernet interface on the Motorola MVME147
+	  single-board computer.  Say Y here to include the
+	  driver for this chip in your kernel.
+	  To compile this driver as a module, choose M here.
+
+config PCNET32
+	tristate "AMD PCnet32 PCI support"
+	depends on PCI && NET_VENDOR_AMD
+	select CRC32
+	select MII
+	---help---
+	  If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
+	  answer Y here and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called pcnet32.
+
+config SUN3LANCE
+	tristate "Sun3/Sun3x on-board LANCE support"
+	depends on (SUN3 || SUN3X) && NET_VENDOR_AMD
+	---help---
+	  Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
+	  featured an AMD LANCE 10Mbit Ethernet controller on board; say Y
+	  here to compile in the Linux driver for this and enable Ethernet.
+	  General Linux information on the Sun 3 and 3x series (now
+	  discontinued) is at
+	  <http://www.angelfire.com/ca2/tech68k/sun3.html>.
+
+	  If you're not building a kernel for a Sun 3, say N.
+
+config SUNLANCE
+	tristate "Sun LANCE support"
+	depends on SBUS && NET_VENDOR_AMD
+	select CRC32
+	---help---
+	  This driver supports the "le" interface present on all 32-bit Sparc
+	  systems, on some older Ultra systems and as an Sbus option.  These
+	  cards are based on the AMD LANCE chipset, which is better known
+	  via the NE2100 cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunlance.
diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
new file mode 100644
index 0000000..54042f0
--- /dev/null
+++ b/drivers/net/ethernet/amd/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the AMD network device drivers.
+#
+
+obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
+obj-$(CONFIG_ATARILANCE) += atarilance.o
+obj-$(CONFIG_DECLANCE) += declance.o
+obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
+obj-$(CONFIG_LANCE) += lance.o
+obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
+obj-$(CONFIG_PCNET32) += pcnet32.o
+obj-$(CONFIG_SUN3LANCE) += sun3lance.o
+obj-$(CONFIG_SUNLANCE) += sunlance.o
diff --git a/drivers/net/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
similarity index 100%
rename from drivers/net/amd8111e.c
rename to drivers/net/ethernet/amd/amd8111e.c
diff --git a/drivers/net/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h
similarity index 100%
rename from drivers/net/amd8111e.h
rename to drivers/net/ethernet/amd/amd8111e.h
diff --git a/drivers/net/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
similarity index 100%
rename from drivers/net/atarilance.c
rename to drivers/net/ethernet/amd/atarilance.c
diff --git a/drivers/net/declance.c b/drivers/net/ethernet/amd/declance.c
similarity index 100%
rename from drivers/net/declance.c
rename to drivers/net/ethernet/amd/declance.c
diff --git a/drivers/net/hplance.c b/drivers/net/ethernet/amd/hplance.c
similarity index 100%
rename from drivers/net/hplance.c
rename to drivers/net/ethernet/amd/hplance.c
diff --git a/drivers/net/hplance.h b/drivers/net/ethernet/amd/hplance.h
similarity index 100%
rename from drivers/net/hplance.h
rename to drivers/net/ethernet/amd/hplance.h
diff --git a/drivers/net/lance.c b/drivers/net/ethernet/amd/lance.c
similarity index 100%
rename from drivers/net/lance.c
rename to drivers/net/ethernet/amd/lance.c
diff --git a/drivers/net/mvme147.c b/drivers/net/ethernet/amd/mvme147.c
similarity index 100%
rename from drivers/net/mvme147.c
rename to drivers/net/ethernet/amd/mvme147.c
diff --git a/drivers/net/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
similarity index 100%
rename from drivers/net/pcnet32.c
rename to drivers/net/ethernet/amd/pcnet32.c
diff --git a/drivers/net/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
similarity index 100%
rename from drivers/net/sun3lance.c
rename to drivers/net/ethernet/amd/sun3lance.c
diff --git a/drivers/net/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
similarity index 100%
rename from drivers/net/sunlance.c
rename to drivers/net/ethernet/amd/sunlance.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 04/72] 8390: Move the 8390 related drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (2 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 03/72] amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 05/72] broadcom: Move the Broadcom drivers Jeff Kirsher
                   ` (70 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Donald Becker, Paul Gortmaker, Alain Malek,
	Peter De Schrijver, David Huggins-Daines, Wim Dumon,
	Yoshinori Sato, David Hinds

Moves the drivers for the National Semi-conductor 8390 chipset into
drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile
changes.

CC: Donald Becker <becker@scyld.com>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Alain Malek <alain.malek@cryogen.com>
CC: Peter De Schrijver <p2@mind.be>
CC: "David Huggins-Daines" <dhd@debian.org>
CC: Wim Dumon <wimpie@kotnet.org>
CC: Yoshinori Sato <ysato@users.sourceforge.jp>
CC: David Hinds <dahinds@users.sourceforge.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                      |    5 +-
 drivers/net/Kconfig                              |  283 -------------------
 drivers/net/Makefile                             |   22 --
 drivers/net/ethernet/3com/Makefile               |    2 +-
 drivers/net/{ => ethernet/8390}/8390.c           |    0
 drivers/net/{ => ethernet/8390}/8390.h           |    0
 drivers/net/{ => ethernet/8390}/8390p.c          |    0
 drivers/net/ethernet/8390/Kconfig                |  324 ++++++++++++++++++++++
 drivers/net/ethernet/8390/Makefile               |   27 ++
 drivers/net/{ => ethernet/8390}/ac3200.c         |    0
 drivers/net/{ => ethernet/8390}/apne.c           |    0
 drivers/net/{ => ethernet/8390}/ax88796.c        |    0
 drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c |    2 +-
 drivers/net/{ => ethernet/8390}/e2100.c          |    0
 drivers/net/{ => ethernet/8390}/es3210.c         |    0
 drivers/net/{ => ethernet/8390}/hp-plus.c        |    0
 drivers/net/{ => ethernet/8390}/hp.c             |    0
 drivers/net/{ => ethernet/8390}/hydra.c          |    0
 drivers/net/{ => ethernet/8390}/lib8390.c        |    0
 drivers/net/{ => ethernet/8390}/lne390.c         |    0
 drivers/net/{ => ethernet/8390}/mac8390.c        |    0
 drivers/net/{ => ethernet/8390}/ne-h8300.c       |    0
 drivers/net/{ => ethernet/8390}/ne.c             |    0
 drivers/net/{ => ethernet/8390}/ne2.c            |    0
 drivers/net/{ => ethernet/8390}/ne2k-pci.c       |    0
 drivers/net/{ => ethernet/8390}/ne3210.c         |    0
 drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c |    2 +-
 drivers/net/{ => ethernet/8390}/smc-mca.c        |    0
 drivers/net/{ => ethernet/8390}/smc-ultra.c      |    0
 drivers/net/{ => ethernet/8390}/smc-ultra32.c    |    0
 drivers/net/{ => ethernet/8390}/stnic.c          |    0
 drivers/net/{ => ethernet/8390}/wd.c             |    0
 drivers/net/{ => ethernet/8390}/zorro8390.c      |    0
 drivers/net/ethernet/Kconfig                     |    1 +
 drivers/net/ethernet/Makefile                    |    1 +
 drivers/net/pcmcia/Kconfig                       |   21 --
 drivers/net/pcmcia/Makefile                      |    2 -
 37 files changed, 358 insertions(+), 334 deletions(-)
 rename drivers/net/{ => ethernet/8390}/8390.c (100%)
 rename drivers/net/{ => ethernet/8390}/8390.h (100%)
 rename drivers/net/{ => ethernet/8390}/8390p.c (100%)
 create mode 100644 drivers/net/ethernet/8390/Kconfig
 create mode 100644 drivers/net/ethernet/8390/Makefile
 rename drivers/net/{ => ethernet/8390}/ac3200.c (100%)
 rename drivers/net/{ => ethernet/8390}/apne.c (100%)
 rename drivers/net/{ => ethernet/8390}/ax88796.c (100%)
 rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
 rename drivers/net/{ => ethernet/8390}/e2100.c (100%)
 rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
 rename drivers/net/{ => ethernet/8390}/hp-plus.c (100%)
 rename drivers/net/{ => ethernet/8390}/hp.c (100%)
 rename drivers/net/{ => ethernet/8390}/hydra.c (100%)
 rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
 rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
 rename drivers/net/{ => ethernet/8390}/mac8390.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne-h8300.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (100%)
 rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
 rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
 rename drivers/net/{ => ethernet/8390}/smc-mca.c (100%)
 rename drivers/net/{ => ethernet/8390}/smc-ultra.c (100%)
 rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (100%)
 rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
 rename drivers/net/{ => ethernet/8390}/wd.c (100%)
 rename drivers/net/{ => ethernet/8390}/zorro8390.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index e155522..87e8a415 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -169,8 +169,7 @@ F:	include/linux/serial_8250.h
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
 L:	netdev@vger.kernel.org
 S:	Orphan / Obsolete
-F:	drivers/net/*8390*
-F:	drivers/net/ax88796.c
+F:	drivers/net/ethernet/8390/
 
 9P FILE SYSTEM
 M:	Eric Van Hensbergen <ericvh@gmail.com>
@@ -6332,7 +6331,7 @@ W:	http://uclinux-h8.sourceforge.jp/
 S:	Supported
 F:	arch/h8300/
 F:	drivers/ide/ide-h8300.c
-F:	drivers/net/ne-h8300.c
+F:	drivers/net/ethernet/8390/ne-h8300.c
 
 UDF FILESYSTEM
 M:	Jan Kara <jack@suse.cz>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 28abb09..7ed3025 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -237,22 +237,6 @@ config MACB
 
 source "drivers/net/arm/Kconfig"
 
-config AX88796
-	tristate "ASIX AX88796 NE2000 clone support"
-	depends on ARM || MIPS || SUPERH
-	select PHYLIB
-	select MDIO_BITBANG
-	help
-	  AX88796 driver, using platform bus to provide
-	  chip detection and resources
-
-config AX88796_93CX6
-	bool "ASIX AX88796 external 93CX6 eeprom support"
-	depends on AX88796
-	select EEPROM_93CX6
-	help
-	  Select this if your platform comes with an external 93CX6 eeprom.
-
 config MACE
 	tristate "MACE (Power Mac ethernet) support"
 	depends on PPC_PMAC && PPC32
@@ -308,50 +292,6 @@ config A2065
 	  To compile this driver as a module, choose M here: the module
 	  will be called a2065.
 
-config HYDRA
-	tristate "Hydra support"
-	depends on ZORRO
-	select CRC32
-	help
-	  If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called hydra.
-
-config ZORRO8390
-	tristate "Zorro NS8390-based Ethernet support"
-	depends on ZORRO
-	select CRC32
-	help
-	  This driver is for Zorro Ethernet cards using an NS8390-compatible
-	  chipset, like the Village Tronic Ariadne II and the Individual
-	  Computers X-Surf Ethernet cards. If you have such a card, say Y.
-	  Otherwise, say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called zorro8390.
-
-config APNE
-	tristate "PCMCIA NE2000 support"
-	depends on AMIGA_PCMCIA
-	select CRC32
-	help
-	  If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,
-	  say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called apne.
-
-config MAC8390
-	bool "Macintosh NS 8390 based ethernet cards"
-	depends on MAC
-	select CRC32
-	help
-	  If you want to include a driver to support Nubus or LC-PDS
-	  Ethernet cards using an NS8390 chipset or its equivalent, say Y
-	  and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
 config MAC89x0
 	tristate "Macintosh CS89x0 based ethernet cards"
 	depends on MAC
@@ -479,18 +419,6 @@ config SGI_O2MACE_ETH
 	tristate "SGI O2 MACE Fast Ethernet support"
 	depends on SGI_IP32=y
 
-config STNIC
-	tristate "National DP83902AV  support"
-	depends on SUPERH
-	select CRC32
-	help
-	  Support for cards based on the National Semiconductor DP83902AV
-	  ST-NIC Serial Network Interface Controller for Twisted Pair.  This
-	  is a 10Mbit/sec Ethernet controller.  Product overview and specs at
-	  <http://www.national.com/pf/DP/DP83902A.html>.
-
-	  If unsure, say N.
-
 config SH_ETH
 	tristate "Renesas SuperH Ethernet support"
 	depends on SUPERH && \
@@ -564,74 +492,6 @@ config SUNVNET
 	help
 	  Support for virtual network devices under Sun Logical Domains.
 
-config NET_VENDOR_SMC
-	bool "Western Digital/SMC cards"
-	depends on ISA || MCA || EISA || MAC
-	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 Western Digital cards. If you say Y, you will be
-	  asked for your specific card in the following questions.
-
-config WD80x3
-	tristate "WD80*3 support"
-	depends on NET_VENDOR_SMC && ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called wd.
-
-config ULTRAMCA
-	tristate "SMC Ultra MCA support"
-	depends on NET_VENDOR_SMC && MCA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type and are running
-	  an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called smc-mca.
-
-config ULTRA
-	tristate "SMC Ultra support"
-	depends on NET_VENDOR_SMC && ISA
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  Important: There have been many reports that, with some motherboards
-	  mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
-	  such as some BusLogic models) causes corruption problems with many
-	  operating systems. The Linux smc-ultra driver has a work-around for
-	  this but keep it in mind if you have such a SCSI card and have
-	  problems.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called smc-ultra.
-
-config ULTRA32
-	tristate "SMC Ultra32 EISA support"
-	depends on NET_VENDOR_SMC && EISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called smc-ultra32.
-
 config BFIN_MAC
 	tristate "Blackfin on-chip MAC support"
 	depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
@@ -976,18 +836,6 @@ config NET_ISA
 	  the remaining ISA network card questions. If you say Y, you will be
 	  asked for your specific card in the following questions.
 
-config E2100
-	tristate "Cabletron E21xx support"
-	depends on NET_ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called e2100.
-
 config EWRK3
 	tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
 	depends on NET_ISA
@@ -1029,30 +877,6 @@ config EEXPRESS_PRO
 	  To compile this driver as a module, choose M here. The module
 	  will be called eepro.
 
-config HPLAN_PLUS
-	tristate "HP PCLAN+ (27247B and 27252A) support"
-	depends on NET_ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called hp-plus.
-
-config HPLAN
-	tristate "HP PCLAN (27245 and other 27xxx series) support"
-	depends on NET_ISA
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called hp.
-
 config LP486E
 	tristate "LP486E on board Ethernet"
 	depends on NET_ISA
@@ -1072,26 +896,6 @@ config ETH16I
 	  To compile this driver as a module, choose M here. The module
 	  will be called eth16i.
 
-config NE2000
-	tristate "NE2000/NE1000 support"
-	depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.  Many Ethernet cards
-	  without a specific driver are compatible with NE2000.
-
-	  If you have a PCI NE2000 card however, say N here and Y to "PCI
-	  NE2000 and clone support" under "EISA, VLB, PCI and on board
-	  controllers" below. If you have a NE2000 card and are running on
-	  an MCA system (a bus system used on some IBM PS/2 computers and
-	  laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
-	  below.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ne.
-
 config ZNET
 	tristate "Zenith Z-Note support (EXPERIMENTAL)"
 	depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
@@ -1113,18 +917,6 @@ config SEEQ8005
 	  To compile this driver as a module, choose M here. The module
 	  will be called seeq8005.
 
-config NE2_MCA
-	tristate "NE/2 (ne2000 MCA version) support"
-	depends on MCA_LEGACY
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ne2.
-
 config IBMLANA
 	tristate "IBM LAN Adapter/A support"
 	depends on MCA
@@ -1180,18 +972,6 @@ config ADAPTEC_STARFIRE
 	  To compile this driver as a module, choose M here: the module
 	  will be called starfire.  This is recommended.
 
-config AC3200
-	tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
-	depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ac3200.
-
 config KSZ884X_PCI
 	tristate "Micrel KSZ8841/2 PCI"
 	depends on NET_PCI && PCI
@@ -1307,18 +1087,6 @@ config E100
 	  To compile this driver as a module, choose M here. The module
 	  will be called e100.
 
-config LNE390
-	tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
-	depends on NET_PCI && EISA && EXPERIMENTAL
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called lne390.
-
 config FEALNX
 	tristate "Myson MTD-8xx PCI Ethernet support"
 	depends on NET_PCI && PCI
@@ -1339,50 +1107,6 @@ config NATSEMI
 	  More specific information and updates are available from
 	  <http://www.scyld.com/network/natsemi.html>.
 
-config NE2K_PCI
-	tristate "PCI NE2000 and clones support (see help)"
-	depends on NET_PCI && PCI
-	select CRC32
-	---help---
-	  This driver is for NE2000 compatible PCI cards. It will not work
-	  with ISA NE2000 cards (they have their own driver, "NE2000/NE1000
-	  support" below). If you have a PCI NE2000 network (Ethernet) card,
-	  say Y and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  This driver also works for the following NE2000 clone cards:
-	  RealTek RTL-8029  Winbond 89C940  Compex RL2000  KTI ET32P2
-	  NetVin NV5000SC   Via 86C926      SureCom NE34   Winbond
-	  Holtek HT80232    Holtek HT80229
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ne2k-pci.
-
-config NE3210
-	tristate "Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)"
-	depends on NET_PCI && EISA && EXPERIMENTAL
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.  Note that this driver
-	  will NOT WORK for NE3200 cards as they are completely different.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ne3210.
-
-config ES3210
-	tristate "Racal-Interlan EISA ES3210 support (EXPERIMENTAL)"
-	depends on NET_PCI && EISA && EXPERIMENTAL
-	select CRC32
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called es3210.
-
 config 8139CP
 	tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
 	depends on NET_PCI && PCI && EXPERIMENTAL
@@ -1727,13 +1451,6 @@ config FEC_MPC52xx_MDIO
 	  If not sure, enable.
 	  If compiled as module, it will be called fec_mpc52xx_phy.
 
-config NE_H8300
-	tristate "NE2000 compatible support for H8/300"
-	depends on H8300
-	help
-	  Say Y here if you want to use the NE2000 compatible
-	  controller on the Renesas H8/300 processor.
-
 config ATL2
 	tristate "Atheros L2 Fast Ethernet support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f70087d..2ad4579 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -65,7 +65,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 
-obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
@@ -77,7 +76,6 @@ obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
-obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
@@ -112,9 +110,6 @@ obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_MAC8390) += mac8390.o
-obj-$(CONFIG_APNE) += apne.o 8390.o
-obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_FEC) += fec.o
@@ -123,23 +118,9 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
 	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
 endif
 obj-$(CONFIG_68360_ENET) += 68360enet.o
-obj-$(CONFIG_WD80x3) += wd.o 8390.o
-obj-$(CONFIG_NE2000) += ne.o 8390p.o
-obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
-obj-$(CONFIG_HPLAN) += hp.o 8390p.o
-obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
-obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
-obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
-obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
-obj-$(CONFIG_E2100) += e2100.o 8390.o
-obj-$(CONFIG_ES3210) += es3210.o 8390.o
-obj-$(CONFIG_LNE390) += lne390.o 8390.o
-obj-$(CONFIG_NE3210) += ne3210.o 8390.o
 obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
 obj-$(CONFIG_B44) += b44.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_NE_H8300) += ne-h8300.o
-obj-$(CONFIG_AX88796) += ax88796.o
 obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
 obj-$(CONFIG_FTGMAC100) += ftgmac100.o
 obj-$(CONFIG_FTMAC100) += ftmac100.o
@@ -193,7 +174,6 @@ obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_NI5010) += ni5010.o
 obj-$(CONFIG_NI52) += ni52.o
 obj-$(CONFIG_NI65) += ni65.o
-obj-$(CONFIG_AC3200) += ac3200.o 8390.o
 obj-$(CONFIG_APRICOT) += 82596.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_SNI_82596) += sni_82596.o
@@ -205,7 +185,6 @@ obj-$(CONFIG_SC92031) += sc92031.o
 obj-$(CONFIG_LP486E) += lp486e.o
 
 obj-$(CONFIG_ETH16I) += eth16i.o
-obj-$(CONFIG_ZORRO8390) += zorro8390.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
@@ -213,7 +192,6 @@ obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
 obj-$(CONFIG_A2065) += a2065.o
-obj-$(CONFIG_HYDRA) += hydra.o
 obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_CS89x0) += cs89x0.o
 obj-$(CONFIG_MACSONIC) += macsonic.o
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
index a86fdac..5117f87 100644
--- a/drivers/net/ethernet/3com/Makefile
+++ b/drivers/net/ethernet/3com/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-$(CONFIG_EL1) += 3c501.o
-obj-$(CONFIG_EL2) += 3c503.o ../../8390p.o
+obj-$(CONFIG_EL2) += 3c503.o ../8390/8390p.o
 obj-$(CONFIG_ELPLUS) += 3c505.o
 obj-$(CONFIG_EL16) += 3c507.o
 obj-$(CONFIG_EL3) += 3c509.o
diff --git a/drivers/net/8390.c b/drivers/net/ethernet/8390/8390.c
similarity index 100%
rename from drivers/net/8390.c
rename to drivers/net/ethernet/8390/8390.c
diff --git a/drivers/net/8390.h b/drivers/net/ethernet/8390/8390.h
similarity index 100%
rename from drivers/net/8390.h
rename to drivers/net/ethernet/8390/8390.h
diff --git a/drivers/net/8390p.c b/drivers/net/ethernet/8390/8390p.c
similarity index 100%
rename from drivers/net/8390p.c
rename to drivers/net/ethernet/8390/8390p.c
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
new file mode 100644
index 0000000..3c20f26
--- /dev/null
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -0,0 +1,324 @@
+#
+# 8390 device configuration
+#
+
+config NET_VENDOR_8390
+	bool "National Semi-conductor 8390 devices"
+	depends on AMIGA_PCMCIA || PCI || SUPERH || ISA || MCA || EISA ||  \
+		   MAC || M32R || MACH_TX49XX || MCA_LEGACY || H8300 ||  \
+		   ARM || MIPS || ZORRO || PCMCIA || EXPERIMENTAL
+	---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 Western Digital cards. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config AC3200
+	tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
+	depends on NET_VENDOR_8390 && PCI && (ISA || EISA) && EXPERIMENTAL
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ac3200.
+
+config APNE
+	tristate "PCMCIA NE2000 support"
+	depends on NET_VENDOR_8390 && AMIGA_PCMCIA
+	select CRC32
+	---help---
+	  If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,
+	  say N.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called apne.
+
+config PCMCIA_AXNET
+	tristate "Asix AX88190 PCMCIA support"
+	depends on NET_VENDOR_8390 && PCMCIA
+	---help---
+	  Say Y here if you intend to attach an Asix AX88190-based PCMCIA
+	  (PC-card) Fast Ethernet card to your computer.  These cards are
+	  nearly NE2000 compatible but need a separate driver due to a few
+	  misfeatures.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called axnet_cs.  If unsure, say N.
+
+config AX88796
+	tristate "ASIX AX88796 NE2000 clone support"
+	depends on NET_VENDOR_8390 && (ARM || MIPS || SUPERH)
+	select PHYLIB
+	select MDIO_BITBANG
+	---help---
+	  AX88796 driver, using platform bus to provide
+	  chip detection and resources
+
+config AX88796_93CX6
+	bool "ASIX AX88796 external 93CX6 eeprom support"
+	depends on AX88796
+	select EEPROM_93CX6
+	---help---
+	  Select this if your platform comes with an external 93CX6 eeprom.
+
+config E2100
+	tristate "Cabletron E21xx support"
+	depends on NET_VENDOR_8390 && ISA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e2100.
+
+config ES3210
+	tristate "Racal-Interlan EISA ES3210 support (EXPERIMENTAL)"
+	depends on NET_VENDOR_8390 && PCI && EISA && EXPERIMENTAL
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called es3210.
+
+config HPLAN_PLUS
+	tristate "HP PCLAN+ (27247B and 27252A) support"
+	depends on NET_VENDOR_8390 && ISA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called hp-plus.
+
+config HPLAN
+	tristate "HP PCLAN (27245 and other 27xxx series) support"
+	depends on NET_VENDOR_8390 && ISA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called hp.
+
+config HYDRA
+	tristate "Hydra support"
+	depends on NET_VENDOR_8390 && ZORRO
+	select CRC32
+	---help---
+	  If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called hydra.
+
+config LNE390
+	tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
+	depends on NET_VENDOR_8390 && PCI && EISA && EXPERIMENTAL
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called lne390.
+
+config MAC8390
+	bool "Macintosh NS 8390 based ethernet cards"
+	depends on NET_VENDOR_8390 && MAC
+	select CRC32
+	---help---
+	  If you want to include a driver to support Nubus or LC-PDS
+	  Ethernet cards using an NS8390 chipset or its equivalent, say Y
+	  and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+config NE2000
+	tristate "NE2000/NE1000 support"
+	depends on NET_VENDOR_8390 && (ISA || (Q40 && m) || M32R || MACH_TX49XX)
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.  Many Ethernet cards
+	  without a specific driver are compatible with NE2000.
+
+	  If you have a PCI NE2000 card however, say N here and Y to "PCI
+	  NE2000 and clone support" under "EISA, VLB, PCI and on board
+	  controllers" below. If you have a NE2000 card and are running on
+	  an MCA system (a bus system used on some IBM PS/2 computers and
+	  laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
+	  below.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ne.
+
+config NE2_MCA
+	tristate "NE/2 (ne2000 MCA version) support"
+	depends on NET_VENDOR_8390 && MCA_LEGACY
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ne2.
+
+config NE2K_PCI
+	tristate "PCI NE2000 and clones support (see help)"
+	depends on NET_VENDOR_8390 && PCI
+	select CRC32
+	---help---
+	  This driver is for NE2000 compatible PCI cards. It will not work
+	  with ISA NE2000 cards (they have their own driver, "NE2000/NE1000
+	  support" below). If you have a PCI NE2000 network (Ethernet) card,
+	  say Y and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  This driver also works for the following NE2000 clone cards:
+	  RealTek RTL-8029  Winbond 89C940  Compex RL2000  KTI ET32P2
+	  NetVin NV5000SC   Via 86C926      SureCom NE34   Winbond
+	  Holtek HT80232    Holtek HT80229
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ne2k-pci.
+
+config NE3210
+	tristate "Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)"
+	depends on NET_VENDOR_8390 && PCI && EISA && EXPERIMENTAL
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.  Note that this driver
+	  will NOT WORK for NE3200 cards as they are completely different.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ne3210.
+
+config PCMCIA_PCNET
+	tristate "NE2000 compatible PCMCIA support"
+	depends on NET_VENDOR_8390 && PCMCIA
+	select CRC32
+	---help---
+	  Say Y here if you intend to attach an NE2000 compatible PCMCIA
+	  (PC-card) Ethernet or Fast Ethernet card to your computer.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called pcnet_cs.  If unsure, say N.
+
+config NE_H8300
+	tristate "NE2000 compatible support for H8/300"
+	depends on NET_VENDOR_8390 && H8300
+	---help---
+	  Say Y here if you want to use the NE2000 compatible
+	  controller on the Renesas H8/300 processor.
+
+config STNIC
+	tristate "National DP83902AV  support"
+	depends on NET_VENDOR_8390 && SUPERH
+	select CRC32
+	---help---
+	  Support for cards based on the National Semiconductor DP83902AV
+	  ST-NIC Serial Network Interface Controller for Twisted Pair.  This
+	  is a 10Mbit/sec Ethernet controller.  Product overview and specs at
+	  <http://www.national.com/pf/DP/DP83902A.html>.
+
+	  If unsure, say N.
+
+config NET_VENDOR_SMC
+	bool "Western Digital/SMC cards"
+	depends on NET_VENDOR_8390 && (ISA || MCA || EISA || MAC)
+	---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 Western Digital cards. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config ULTRAMCA
+	tristate "SMC Ultra MCA support"
+	depends on NET_VENDOR_SMC && MCA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type and are running
+	  an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called smc-mca.
+
+config ULTRA
+	tristate "SMC Ultra support"
+	depends on NET_VENDOR_SMC && ISA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  Important: There have been many reports that, with some motherboards
+	  mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
+	  such as some BusLogic models) causes corruption problems with many
+	  operating systems. The Linux smc-ultra driver has a work-around for
+	  this but keep it in mind if you have such a SCSI card and have
+	  problems.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called smc-ultra.
+
+config ULTRA32
+	tristate "SMC Ultra32 EISA support"
+	depends on NET_VENDOR_SMC && EISA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called smc-ultra32.
+
+config WD80x3
+	tristate "WD80*3 support"
+	depends on NET_VENDOR_SMC && ISA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called wd.
+
+config ZORRO8390
+	tristate "Zorro NS8390-based Ethernet support"
+	depends on NET_VENDOR_8390 && ZORRO
+	select CRC32
+	---help---
+	  This driver is for Zorro Ethernet cards using an NS8390-compatible
+	  chipset, like the Village Tronic Ariadne II and the Individual
+	  Computers X-Surf Ethernet cards. If you have such a card, say Y.
+	  Otherwise, say N.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called zorro8390.
diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile
new file mode 100644
index 0000000..3c94187
--- /dev/null
+++ b/drivers/net/ethernet/8390/Makefile
@@ -0,0 +1,27 @@
+#
+# Makefile for the 8390 network device drivers.
+#
+
+obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8390.o
+obj-$(CONFIG_MAC8390) += mac8390.o
+obj-$(CONFIG_AC3200) += ac3200.o 8390.o
+obj-$(CONFIG_APNE) += apne.o 8390.o
+obj-$(CONFIG_AX88796) += ax88796.o
+obj-$(CONFIG_E2100) += e2100.o 8390.o
+obj-$(CONFIG_ES3210) += es3210.o 8390.o
+obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
+obj-$(CONFIG_HPLAN) += hp.o 8390p.o
+obj-$(CONFIG_HYDRA) += hydra.o 8390.o
+obj-$(CONFIG_LNE390) += lne390.o 8390.o
+obj-$(CONFIG_NE2000) += ne.o 8390p.o
+obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
+obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
+obj-$(CONFIG_NE3210) += ne3210.o 8390.o
+obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
+obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o 8390.o
+obj-$(CONFIG_STNIC) += stnic.o 8390.o
+obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
+obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
+obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
+obj-$(CONFIG_WD80x3) += wd.o 8390.o
+obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
diff --git a/drivers/net/ac3200.c b/drivers/net/ethernet/8390/ac3200.c
similarity index 100%
rename from drivers/net/ac3200.c
rename to drivers/net/ethernet/8390/ac3200.c
diff --git a/drivers/net/apne.c b/drivers/net/ethernet/8390/apne.c
similarity index 100%
rename from drivers/net/apne.c
rename to drivers/net/ethernet/8390/apne.c
diff --git a/drivers/net/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
similarity index 100%
rename from drivers/net/ax88796.c
rename to drivers/net/ethernet/8390/ax88796.c
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
similarity index 99%
rename from drivers/net/pcmcia/axnet_cs.c
rename to drivers/net/ethernet/8390/axnet_cs.c
index 9953db7..3e4b926 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c
@@ -38,7 +38,7 @@
 #include <linux/etherdevice.h>
 #include <linux/crc32.h>
 #include <linux/mii.h>
-#include "../8390.h"
+#include "8390.h"
 
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
diff --git a/drivers/net/e2100.c b/drivers/net/ethernet/8390/e2100.c
similarity index 100%
rename from drivers/net/e2100.c
rename to drivers/net/ethernet/8390/e2100.c
diff --git a/drivers/net/es3210.c b/drivers/net/ethernet/8390/es3210.c
similarity index 100%
rename from drivers/net/es3210.c
rename to drivers/net/ethernet/8390/es3210.c
diff --git a/drivers/net/hp-plus.c b/drivers/net/ethernet/8390/hp-plus.c
similarity index 100%
rename from drivers/net/hp-plus.c
rename to drivers/net/ethernet/8390/hp-plus.c
diff --git a/drivers/net/hp.c b/drivers/net/ethernet/8390/hp.c
similarity index 100%
rename from drivers/net/hp.c
rename to drivers/net/ethernet/8390/hp.c
diff --git a/drivers/net/hydra.c b/drivers/net/ethernet/8390/hydra.c
similarity index 100%
rename from drivers/net/hydra.c
rename to drivers/net/ethernet/8390/hydra.c
diff --git a/drivers/net/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
similarity index 100%
rename from drivers/net/lib8390.c
rename to drivers/net/ethernet/8390/lib8390.c
diff --git a/drivers/net/lne390.c b/drivers/net/ethernet/8390/lne390.c
similarity index 100%
rename from drivers/net/lne390.c
rename to drivers/net/ethernet/8390/lne390.c
diff --git a/drivers/net/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
similarity index 100%
rename from drivers/net/mac8390.c
rename to drivers/net/ethernet/8390/mac8390.c
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ethernet/8390/ne-h8300.c
similarity index 100%
rename from drivers/net/ne-h8300.c
rename to drivers/net/ethernet/8390/ne-h8300.c
diff --git a/drivers/net/ne.c b/drivers/net/ethernet/8390/ne.c
similarity index 100%
rename from drivers/net/ne.c
rename to drivers/net/ethernet/8390/ne.c
diff --git a/drivers/net/ne2.c b/drivers/net/ethernet/8390/ne2.c
similarity index 100%
rename from drivers/net/ne2.c
rename to drivers/net/ethernet/8390/ne2.c
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
similarity index 100%
rename from drivers/net/ne2k-pci.c
rename to drivers/net/ethernet/8390/ne2k-pci.c
diff --git a/drivers/net/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
similarity index 100%
rename from drivers/net/ne3210.c
rename to drivers/net/ethernet/8390/ne3210.c
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
similarity index 99%
rename from drivers/net/pcmcia/pcnet_cs.c
rename to drivers/net/ethernet/8390/pcnet_cs.c
index b4fd7c3..4010761 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c
@@ -41,7 +41,7 @@
 #include <linux/log2.h>
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
-#include "../8390.h"
+#include "8390.h"
 
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
diff --git a/drivers/net/smc-mca.c b/drivers/net/ethernet/8390/smc-mca.c
similarity index 100%
rename from drivers/net/smc-mca.c
rename to drivers/net/ethernet/8390/smc-mca.c
diff --git a/drivers/net/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c
similarity index 100%
rename from drivers/net/smc-ultra.c
rename to drivers/net/ethernet/8390/smc-ultra.c
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/ethernet/8390/smc-ultra32.c
similarity index 100%
rename from drivers/net/smc-ultra32.c
rename to drivers/net/ethernet/8390/smc-ultra32.c
diff --git a/drivers/net/stnic.c b/drivers/net/ethernet/8390/stnic.c
similarity index 100%
rename from drivers/net/stnic.c
rename to drivers/net/ethernet/8390/stnic.c
diff --git a/drivers/net/wd.c b/drivers/net/ethernet/8390/wd.c
similarity index 100%
rename from drivers/net/wd.c
rename to drivers/net/ethernet/8390/wd.c
diff --git a/drivers/net/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
similarity index 100%
rename from drivers/net/zorro8390.c
rename to drivers/net/ethernet/8390/zorro8390.c
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 5e62efd..56ed5ec 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -12,6 +12,7 @@ menuconfig ETHERNET
 if ETHERNET
 
 source "drivers/net/ethernet/3com/Kconfig"
+source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 1bc2ac2..fc82588 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -3,4 +3,5 @@
 #
 
 obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
+obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index b67c5ed..65c98c6 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -31,16 +31,6 @@ config PCMCIA_FMVJ18X
 	  To compile this driver as a module, choose M here: the module will be
 	  called fmvj18x_cs.  If unsure, say N.
 
-config PCMCIA_PCNET
-	tristate "NE2000 compatible PCMCIA support"
-	select CRC32
-	help
-	  Say Y here if you intend to attach an NE2000 compatible PCMCIA
-	  (PC-card) Ethernet or Fast Ethernet card to your computer.
-
-	  To compile this driver as a module, choose M here: the module will be
-	  called pcnet_cs.  If unsure, say N.
-
 config PCMCIA_NMCLAN
 	tristate "New Media PCMCIA support"
 	help
@@ -70,17 +60,6 @@ config PCMCIA_XIRC2PS
 	  To compile this driver as a module, choose M here: the module will be
 	  called xirc2ps_cs.  If unsure, say N.
 
-config PCMCIA_AXNET
-	tristate "Asix AX88190 PCMCIA support"
-	---help---
-	  Say Y here if you intend to attach an Asix AX88190-based PCMCIA
-	  (PC-card) Fast Ethernet card to your computer.  These cards are
-	  nearly NE2000 compatible but need a separate driver due to a few
-	  misfeatures.
-
-	  To compile this driver as a module, choose M here: the module will be
-	  called axnet_cs.  If unsure, say N.
-
 config ARCNET_COM20020_CS
 	tristate "COM20020 ARCnet PCMCIA support"
 	depends on ARCNET_COM20020
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 2f2ab3b..28b633e 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -5,10 +5,8 @@
 # 16-bit client drivers
 obj-$(CONFIG_PCMCIA_FMVJ18X)	+= fmvj18x_cs.o
 obj-$(CONFIG_PCMCIA_NMCLAN)	+= nmclan_cs.o
-obj-$(CONFIG_PCMCIA_PCNET)	+= pcnet_cs.o
 obj-$(CONFIG_PCMCIA_SMC91C92)	+= smc91c92_cs.o
 obj-$(CONFIG_PCMCIA_XIRC2PS)	+= xirc2ps_cs.o
 obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
-obj-$(CONFIG_PCMCIA_AXNET)	+= axnet_cs.o
 
 obj-$(CONFIG_PCMCIA_IBMTR)	+= ibmtr_cs.o
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 05/72] broadcom: Move the Broadcom drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (3 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 04/72] 8390: Move the 8390 related drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 06/72] chelsio: Move the Chelsio drivers Jeff Kirsher
                   ` (69 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Eilon Greenstein, Michael Chan,
	Matt Carlson, Gary Zambrano, Maciej W. Rozycki

Moves the drivers for Broadcom devices into
drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile
changes.

CC: Eilon Greenstein <eilong@broadcom.com>
CC: Michael Chan <mchan@broadcom.com>
CC: Matt Carlson <mcarlson@broadcom.com>
CC: Gary Zambrano <zambrano@broadcom.com>
CC: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |   10 +-
 drivers/net/Kconfig                                |   99 -----------------
 drivers/net/Makefile                               |    7 --
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/broadcom/Kconfig              |  114 ++++++++++++++++++++
 drivers/net/ethernet/broadcom/Makefile             |   11 ++
 drivers/net/{ => ethernet/broadcom}/b44.c          |    0
 drivers/net/{ => ethernet/broadcom}/b44.h          |    0
 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    0
 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
 drivers/net/{ => ethernet/broadcom}/bnx2.c         |    0
 drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
 drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
 drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
 drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
 .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |    0
 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |    0
 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
 drivers/net/{ => ethernet/broadcom}/cnic.c         |    4 +-
 drivers/net/{ => ethernet/broadcom}/cnic.h         |    0
 drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    0
 drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
 drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    0
 drivers/net/{ => ethernet/broadcom}/tg3.c          |    0
 drivers/net/{ => ethernet/broadcom}/tg3.h          |    0
 drivers/scsi/bnx2fc/bnx2fc.h                       |    2 +-
 drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
 44 files changed, 136 insertions(+), 115 deletions(-)
 create mode 100644 drivers/net/ethernet/broadcom/Kconfig
 create mode 100644 drivers/net/ethernet/broadcom/Makefile
 rename drivers/net/{ => ethernet/broadcom}/b44.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
 rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
 rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/tg3.c (100%)
 rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 87e8a415..50696f8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1507,27 +1507,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER
 M:	Gary Zambrano <zambrano@broadcom.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/b44.*
+F:	drivers/net/ethernet/broadcom/b44.*
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 M:	Michael Chan <mchan@broadcom.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/bnx2.*
-F:	drivers/net/bnx2_*
+F:	drivers/net/ethernet/broadcom/bnx2.*
+F:	drivers/net/ethernet/broadcom/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 M:	Eilon Greenstein <eilong@broadcom.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/bnx2x/
+F:	drivers/net/ethernet/broadcom/bnx2x/
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:	Matt Carlson <mcarlson@broadcom.com>
 M:	Michael Chan <mchan@broadcom.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/tg3.*
+F:	drivers/net/ethernet/broadcom/tg3.*
 
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:	Brett Rudley <brudley@broadcom.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7ed3025..2fbda69 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -994,38 +994,6 @@ config APRICOT
 	  To compile this driver as a module, choose M here. The module
 	  will be called apricot.
 
-config B44
-	tristate "Broadcom 440x/47xx ethernet support"
-	depends on SSB_POSSIBLE && HAS_DMA
-	select SSB
-	select MII
-	help
-	  If you have a network (Ethernet) controller of this type, say Y
-	  or M and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called b44.
-
-# Auto-select SSB PCI-HOST support, if possible
-config B44_PCI_AUTOSELECT
-	bool
-	depends on B44 && SSB_PCIHOST_POSSIBLE
-	select SSB_PCIHOST
-	default y
-
-# Auto-select SSB PCICORE driver, if possible
-config B44_PCICORE_AUTOSELECT
-	bool
-	depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE
-	select SSB_DRIVER_PCICORE
-	default y
-
-config B44_PCI
-	bool
-	depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT
-	default y
-
 config FORCEDETH
 	tristate "nForce Ethernet support"
 	depends on NET_PCI && PCI
@@ -1469,15 +1437,6 @@ config XILINX_EMACLITE
 	help
 	  This driver supports the 10/100 Ethernet Lite from Xilinx.
 
-config BCM63XX_ENET
-	tristate "Broadcom 63xx internal mac support"
-	depends on BCM63XX
-	select MII
-	select PHYLIB
-	help
-	  This driver supports the ethernet MACs in the Broadcom 63xx
-	  MIPS chipset family (BCM63XX).
-
 config FTMAC100
 	tristate "Faraday FTMAC100 10/100 Ethernet support"
 	depends on ARM
@@ -1687,19 +1646,6 @@ config R8169
 	  To compile this driver as a module, choose M here: the module
 	  will be called r8169.  This is recommended.
 
-config SB1250_MAC
-	tristate "SB1250 Gigabit Ethernet support"
-	depends on SIBYTE_SB1xxx_SOC
-	select PHYLIB
-	---help---
-	  This driver supports Gigabit Ethernet interfaces based on the
-	  Broadcom SiByte family of System-On-a-Chip parts.  They include
-	  the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
-	  and BCM1480 chips.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sb1250-mac.
-
 config SIS190
 	tristate "SiS190/SiS191 gigabit ethernet support"
 	depends on PCI
@@ -1784,39 +1730,6 @@ config VIA_VELOCITY
 	  To compile this driver as a module, choose M here. The module
 	  will be called via-velocity.
 
-config TIGON3
-	tristate "Broadcom Tigon3 support"
-	depends on PCI
-	select PHYLIB
-	help
-	  This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called tg3.  This is recommended.
-
-config BNX2
-	tristate "Broadcom NetXtremeII support"
-	depends on PCI
-	select CRC32
-	select FW_LOADER
-	help
-	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called bnx2.  This is recommended.
-
-config CNIC
-	tristate "Broadcom CNIC support"
-	depends on PCI
-	select BNX2
-	select UIO
-	help
-	  This driver supports offload features of Broadcom NetXtremeII
-	  gigabit Ethernet cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called cnic.  This is recommended.
-
 config SPIDER_NET
 	tristate "Spider Gigabit Ethernet driver"
 	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
@@ -2322,18 +2235,6 @@ config TEHUTI
 	help
 	  Tehuti Networks 10G Ethernet NIC
 
-config BNX2X
-	tristate "Broadcom NetXtremeII 10Gb support"
-	depends on PCI
-	select FW_LOADER
-	select ZLIB_INFLATE
-	select LIBCRC32C
-	select MDIO
-	help
-	  This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
-	  To compile this driver as a module, choose M here: the module
-	  will be called bnx2x.  This is recommended.
-
 config QLCNIC
 	tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2ad4579..de205dc 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -77,10 +77,6 @@ obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_FEALNX) += fealnx.o
-obj-$(CONFIG_TIGON3) += tg3.o
-obj-$(CONFIG_BNX2) += bnx2.o
-obj-$(CONFIG_CNIC) += cnic.o
-obj-$(CONFIG_BNX2X) += bnx2x/
 spidernet-y += spider_net.o spider_net_ethtool.o
 obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
@@ -118,10 +114,7 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
 	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
 endif
 obj-$(CONFIG_68360_ENET) += 68360enet.o
-obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
-obj-$(CONFIG_B44) += b44.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
 obj-$(CONFIG_FTGMAC100) += ftgmac100.o
 obj-$(CONFIG_FTMAC100) += ftmac100.o
 
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 56ed5ec..772fb49 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -14,5 +14,6 @@ if ETHERNET
 source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
+source "drivers/net/ethernet/broadcom/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index fc82588..3ef49a2 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -5,3 +5,4 @@
 obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
+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 0000000..55fd2cf
--- /dev/null
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -0,0 +1,114 @@
+#
+# Broadcom device configuration
+#
+
+config NET_VENDOR_BROADCOM
+	bool "Broadcom devices"
+	depends on (SSB_POSSIBLE && HAS_DMA) || PCI || BCM63XX || SIBYTE_SB1xxx_SOC
+	---help---
+	  If you have a network (Ethernet) chipset belonging to this class,
+	  say Y.
+
+	  Note that the answer to this question does not directly affect
+	  the kernel: saying N will just case the configurator to skip all
+	  the questions regarding AMD chipsets. If you say Y, you will be asked
+	  for your specific chipset/driver in the following questions.
+
+config B44
+	tristate "Broadcom 440x/47xx ethernet support"
+	depends on NET_VENDOR_BROADCOM && SSB_POSSIBLE && HAS_DMA
+	select SSB
+	select MII
+	---help---
+	  If you have a network (Ethernet) controller of this type, say Y
+	  or M and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called b44.
+
+# Auto-select SSB PCI-HOST support, if possible
+config B44_PCI_AUTOSELECT
+	bool
+	depends on B44 && SSB_PCIHOST_POSSIBLE
+	select SSB_PCIHOST
+	default y
+
+# Auto-select SSB PCICORE driver, if possible
+config B44_PCICORE_AUTOSELECT
+	bool
+	depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE
+	select SSB_DRIVER_PCICORE
+	default y
+
+config B44_PCI
+	bool
+	depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT
+	default y
+
+config BCM63XX_ENET
+	tristate "Broadcom 63xx internal mac support"
+	depends on NET_VENDOR_BROADCOM && BCM63XX
+	select MII
+	select PHYLIB
+	help
+	  This driver supports the ethernet MACs in the Broadcom 63xx
+	  MIPS chipset family (BCM63XX).
+
+config BNX2
+	tristate "Broadcom NetXtremeII support"
+	depends on NET_VENDOR_BROADCOM && PCI
+	select CRC32
+	select FW_LOADER
+	---help---
+	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called bnx2.  This is recommended.
+
+config CNIC
+	tristate "Broadcom CNIC support"
+	depends on NET_VENDOR_BROADCOM && PCI
+	select BNX2
+	select UIO
+	---help---
+	  This driver supports offload features of Broadcom NetXtremeII
+	  gigabit Ethernet cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called cnic.  This is recommended.
+
+config SB1250_MAC
+	tristate "SB1250 Gigabit Ethernet support"
+	depends on NET_VENDOR_BROADCOM && SIBYTE_SB1xxx_SOC
+	select PHYLIB
+	---help---
+	  This driver supports Gigabit Ethernet interfaces based on the
+	  Broadcom SiByte family of System-On-a-Chip parts.  They include
+	  the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
+	  and BCM1480 chips.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sb1250-mac.
+
+config TIGON3
+	tristate "Broadcom Tigon3 support"
+	depends on NET_VENDOR_BROADCOM && PCI
+	select PHYLIB
+	---help---
+	  This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called tg3.  This is recommended.
+
+config BNX2X
+	tristate "Broadcom NetXtremeII 10Gb support"
+	depends on NET_VENDOR_BROADCOM && PCI
+	select FW_LOADER
+	select ZLIB_INFLATE
+	select LIBCRC32C
+	select MDIO
+	---help---
+	  This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
+	  To compile this driver as a module, choose M here: the module
+	  will be called bnx2x.  This is recommended.
diff --git a/drivers/net/ethernet/broadcom/Makefile b/drivers/net/ethernet/broadcom/Makefile
new file mode 100644
index 0000000..b789605
--- /dev/null
+++ b/drivers/net/ethernet/broadcom/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the Broadcom network device drivers.
+#
+
+obj-$(CONFIG_B44) += b44.o
+obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
+obj-$(CONFIG_BNX2) += bnx2.o
+obj-$(CONFIG_CNIC) += cnic.o
+obj-$(CONFIG_BNX2X) += bnx2x/
+obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
+obj-$(CONFIG_TIGON3) += tg3.o
diff --git a/drivers/net/b44.c b/drivers/net/ethernet/broadcom/b44.c
similarity index 100%
rename from drivers/net/b44.c
rename to drivers/net/ethernet/broadcom/b44.c
diff --git a/drivers/net/b44.h b/drivers/net/ethernet/broadcom/b44.h
similarity index 100%
rename from drivers/net/b44.h
rename to drivers/net/ethernet/broadcom/b44.h
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
similarity index 100%
rename from drivers/net/bcm63xx_enet.c
rename to drivers/net/ethernet/broadcom/bcm63xx_enet.c
diff --git a/drivers/net/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
similarity index 100%
rename from drivers/net/bcm63xx_enet.h
rename to drivers/net/ethernet/broadcom/bcm63xx_enet.h
diff --git a/drivers/net/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
similarity index 100%
rename from drivers/net/bnx2.c
rename to drivers/net/ethernet/broadcom/bnx2.c
diff --git a/drivers/net/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h
similarity index 100%
rename from drivers/net/bnx2.h
rename to drivers/net/ethernet/broadcom/bnx2.h
diff --git a/drivers/net/bnx2_fw.h b/drivers/net/ethernet/broadcom/bnx2_fw.h
similarity index 100%
rename from drivers/net/bnx2_fw.h
rename to drivers/net/ethernet/broadcom/bnx2_fw.h
diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/ethernet/broadcom/bnx2x/Makefile
similarity index 100%
rename from drivers/net/bnx2x/Makefile
rename to drivers/net/ethernet/broadcom/bnx2x/Makefile
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
similarity index 100%
rename from drivers/net/bnx2x/bnx2x.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_cmn.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_cmn.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_dcb.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_dcb.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_dump.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_fw_defs.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_fw_file_hdr.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_hsi.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_init.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_init_ops.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_link.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_link.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_main.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_reg.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_sp.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_sp.h
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_stats.c
rename to 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
similarity index 100%
rename from drivers/net/bnx2x/bnx2x_stats.h
rename to drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
diff --git a/drivers/net/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
similarity index 99%
rename from drivers/net/cnic.c
rename to drivers/net/ethernet/broadcom/cnic.c
index 5533b15..81c2b82 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -44,8 +44,8 @@
 #include "bnx2x/bnx2x_reg.h"
 #include "bnx2x/bnx2x_fw_defs.h"
 #include "bnx2x/bnx2x_hsi.h"
-#include "../scsi/bnx2i/57xx_iscsi_constants.h"
-#include "../scsi/bnx2i/57xx_iscsi_hsi.h"
+#include "../../../scsi/bnx2i/57xx_iscsi_constants.h"
+#include "../../../scsi/bnx2i/57xx_iscsi_hsi.h"
 #include "cnic.h"
 #include "cnic_defs.h"
 
diff --git a/drivers/net/cnic.h b/drivers/net/ethernet/broadcom/cnic.h
similarity index 100%
rename from drivers/net/cnic.h
rename to drivers/net/ethernet/broadcom/cnic.h
diff --git a/drivers/net/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h
similarity index 100%
rename from drivers/net/cnic_defs.h
rename to drivers/net/ethernet/broadcom/cnic_defs.h
diff --git a/drivers/net/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
similarity index 100%
rename from drivers/net/cnic_if.h
rename to drivers/net/ethernet/broadcom/cnic_if.h
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
similarity index 100%
rename from drivers/net/sb1250-mac.c
rename to drivers/net/ethernet/broadcom/sb1250-mac.c
diff --git a/drivers/net/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
similarity index 100%
rename from drivers/net/tg3.c
rename to drivers/net/ethernet/broadcom/tg3.c
diff --git a/drivers/net/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
similarity index 100%
rename from drivers/net/tg3.h
rename to drivers/net/ethernet/broadcom/tg3.h
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 907672e..6f297bc 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -58,7 +58,7 @@
 
 #include "57xx_hsi_bnx2fc.h"
 #include "bnx2fc_debug.h"
-#include "../../net/cnic_if.h"
+#include "../../net/ethernet/broadcom/cnic_if.h"
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME		"bnx2fc"
diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h
index e7cb7ec..9f680ab5 100644
--- a/drivers/scsi/bnx2i/bnx2i.h
+++ b/drivers/scsi/bnx2i/bnx2i.h
@@ -37,7 +37,7 @@
 #include <scsi/libiscsi.h>
 #include <scsi/scsi_transport_iscsi.h>
 
-#include "../../net/cnic_if.h"
+#include "../../net/ethernet/broadcom/cnic_if.h"
 #include "57xx_iscsi_hsi.h"
 #include "57xx_iscsi_constants.h"
 
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 06/72] chelsio: Move the Chelsio drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (4 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 05/72] broadcom: Move the Broadcom drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 07/72] intel: Move the Intel wired LAN drivers Jeff Kirsher
                   ` (68 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Divy Le Ray, Dimitris Michailidis, Casey Leedom

Moves the drivers for the Chelsio chipsets into
drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile
changes.

CC: Divy Le Ray <divy@chelsio.com>
CC: Dimitris Michailidis <dm@chelsio.com>
CC: Casey Leedom <leedom@chelsio.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    6 +-
 drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
 drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
 drivers/net/Kconfig                                |   86 ----------------
 drivers/net/Makefile                               |    4 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/chelsio/Kconfig               |  102 ++++++++++++++++++++
 drivers/net/ethernet/chelsio/Makefile              |    8 ++
 .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
 .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
 .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    0
 .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
 .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
 .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
 .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
 .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
 .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
 .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
 .../chelsio/cxgb}/vsc7326_reg.h                    |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
 .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    0
 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
 .../chelsio}/cxgb3/firmware_exports.h              |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
 .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
 drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    0
 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
 .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
 .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
 .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
 .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    0
 drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
 .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
 drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
 drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
 78 files changed, 119 insertions(+), 97 deletions(-)
 create mode 100644 drivers/net/ethernet/chelsio/Kconfig
 create mode 100644 drivers/net/ethernet/chelsio/Makefile
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 50696f8..816bab8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1961,7 +1961,7 @@ M:	Divy Le Ray <divy@chelsio.com>
 L:	netdev@vger.kernel.org
 W:	http://www.chelsio.com
 S:	Supported
-F:	drivers/net/cxgb3/
+F:	drivers/net/ethernet/chelsio/cxgb3/
 
 CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
 M:	Steve Wise <swise@chelsio.com>
@@ -1975,7 +1975,7 @@ M:	Dimitris Michailidis <dm@chelsio.com>
 L:	netdev@vger.kernel.org
 W:	http://www.chelsio.com
 S:	Supported
-F:	drivers/net/cxgb4/
+F:	drivers/net/ethernet/chelsio/cxgb4/
 
 CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
 M:	Steve Wise <swise@chelsio.com>
@@ -1989,7 +1989,7 @@ M:	Casey Leedom <leedom@chelsio.com>
 L:	netdev@vger.kernel.org
 W:	http://www.chelsio.com
 S:	Supported
-F:	drivers/net/cxgb4vf/
+F:	drivers/net/ethernet/chelsio/cxgb4vf/
 
 STMMAC ETHERNET DRIVER
 M:	Giuseppe Cavallaro <peppe.cavallaro@st.com>
diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile
index 621619c..2761364 100644
--- a/drivers/infiniband/hw/cxgb3/Makefile
+++ b/drivers/infiniband/hw/cxgb3/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -Idrivers/net/cxgb3
+ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o
 
diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile
index cd20b13..46b878c 100644
--- a/drivers/infiniband/hw/cxgb4/Makefile
+++ b/drivers/infiniband/hw/cxgb4/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -Idrivers/net/cxgb4
+ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4
 
 obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o
 
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2fbda69..3e1b8bc 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1937,92 +1937,6 @@ if NETDEV_10000
 config MDIO
 	tristate
 
-config CHELSIO_T1
-	tristate "Chelsio 10Gb Ethernet support"
-	depends on PCI
-	select CRC32
-	select MDIO
-	help
-	  This driver supports Chelsio gigabit and 10-gigabit
-	  Ethernet cards. More information about adapter features and
-	  performance tuning is in <file:Documentation/networking/cxgb.txt>.
-
-	  For general information about Chelsio and our products, visit
-	  our website at <http://www.chelsio.com>.
-
-	  For customer support, please visit our customer support page at
-	  <http://www.chelsio.com/support.html>.
-
-	  Please send feedback to <linux-bugs@chelsio.com>.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called cxgb.
-
-config CHELSIO_T1_1G
-	bool "Chelsio gigabit Ethernet support"
-	depends on CHELSIO_T1
-	help
-	  Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
-	  are using only 10G cards say 'N' here.
-
-config CHELSIO_T3
-	tristate "Chelsio Communications T3 10Gb Ethernet support"
-	depends on PCI && INET
-	select FW_LOADER
-	select MDIO
-	help
-	  This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
-	  adapters.
-
-	  For general information about Chelsio and our products, visit
-	  our website at <http://www.chelsio.com>.
-
-	  For customer support, please visit our customer support page at
-	  <http://www.chelsio.com/support.html>.
-
-	  Please send feedback to <linux-bugs@chelsio.com>.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called cxgb3.
-
-config CHELSIO_T4
-	tristate "Chelsio Communications T4 Ethernet support"
-	depends on PCI
-	select FW_LOADER
-	select MDIO
-	help
-	  This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
-	  adapters.
-
-	  For general information about Chelsio and our products, visit
-	  our website at <http://www.chelsio.com>.
-
-	  For customer support, please visit our customer support page at
-	  <http://www.chelsio.com/support.html>.
-
-	  Please send feedback to <linux-bugs@chelsio.com>.
-
-	  To compile this driver as a module choose M here; the module
-	  will be called cxgb4.
-
-config CHELSIO_T4VF
-	tristate "Chelsio Communications T4 Virtual Function Ethernet support"
-	depends on PCI
-	help
-	  This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
-	  adapters with PCI-E SR-IOV Virtual Functions.
-
-	  For general information about Chelsio and our products, visit
-	  our website at <http://www.chelsio.com>.
-
-	  For customer support, please visit our customer support page at
-	  <http://www.chelsio.com/support.html>.
-
-	  Please send feedback to <linux-bugs@chelsio.com>.
-
-	  To compile this driver as a module choose M here; the module
-	  will be called cxgb4vf.
-
 config EHEA
 	tristate "eHEA Ethernet support"
 	depends on IBMEBUS && INET && SPARSEMEM
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index de205dc..395878f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,10 +19,6 @@ obj-$(CONFIG_IXGBE) += ixgbe/
 obj-$(CONFIG_IXGBEVF) += ixgbevf/
 obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
-obj-$(CONFIG_CHELSIO_T1) += chelsio/
-obj-$(CONFIG_CHELSIO_T3) += cxgb3/
-obj-$(CONFIG_CHELSIO_T4) += cxgb4/
-obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
 obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 772fb49..69d6403 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -15,5 +15,6 @@ source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
+source "drivers/net/ethernet/chelsio/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3ef49a2..470e5d8 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
+obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig
new file mode 100644
index 0000000..24fd964
--- /dev/null
+++ b/drivers/net/ethernet/chelsio/Kconfig
@@ -0,0 +1,102 @@
+#
+# Chelsio device configuration
+#
+
+config NET_VENDOR_CHELSIO
+	bool "Chelsio devices"
+	depends on PCI || INET
+	---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 Chelsio devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config CHELSIO_T1
+	tristate "Chelsio 10Gb Ethernet support"
+	depends on NET_VENDOR_CHELSIO && PCI
+	select CRC32
+	select MDIO
+	---help---
+	  This driver supports Chelsio gigabit and 10-gigabit
+	  Ethernet cards. More information about adapter features and
+	  performance tuning is in <file:Documentation/networking/cxgb.txt>.
+
+	  For general information about Chelsio and our products, visit
+	  our website at <http://www.chelsio.com>.
+
+	  For customer support, please visit our customer support page at
+	  <http://www.chelsio.com/support.html>.
+
+	  Please send feedback to <linux-bugs@chelsio.com>.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called cxgb.
+
+config CHELSIO_T1_1G
+	bool "Chelsio gigabit Ethernet support"
+	depends on CHELSIO_T1
+	---help---
+	  Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
+	  are using only 10G cards say 'N' here.
+
+config CHELSIO_T3
+	tristate "Chelsio Communications T3 10Gb Ethernet support"
+	depends on NET_VENDOR_CHELSIO && PCI && INET
+	select FW_LOADER
+	select MDIO
+	---help---
+	  This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
+	  adapters.
+
+	  For general information about Chelsio and our products, visit
+	  our website at <http://www.chelsio.com>.
+
+	  For customer support, please visit our customer support page at
+	  <http://www.chelsio.com/support.html>.
+
+	  Please send feedback to <linux-bugs@chelsio.com>.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called cxgb3.
+
+config CHELSIO_T4
+	tristate "Chelsio Communications T4 Ethernet support"
+	depends on NET_VENDOR_CHELSIO && PCI
+	select FW_LOADER
+	select MDIO
+	---help---
+	  This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
+	  adapters.
+
+	  For general information about Chelsio and our products, visit
+	  our website at <http://www.chelsio.com>.
+
+	  For customer support, please visit our customer support page at
+	  <http://www.chelsio.com/support.html>.
+
+	  Please send feedback to <linux-bugs@chelsio.com>.
+
+	  To compile this driver as a module choose M here; the module
+	  will be called cxgb4.
+
+config CHELSIO_T4VF
+	tristate "Chelsio Communications T4 Virtual Function Ethernet support"
+	depends on NET_VENDOR_CHELSIO && PCI
+	---help---
+	  This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
+	  adapters with PCI-E SR-IOV Virtual Functions.
+
+	  For general information about Chelsio and our products, visit
+	  our website at <http://www.chelsio.com>.
+
+	  For customer support, please visit our customer support page at
+	  <http://www.chelsio.com/support.html>.
+
+	  Please send feedback to <linux-bugs@chelsio.com>.
+
+	  To compile this driver as a module choose M here; the module
+	  will be called cxgb4vf.
diff --git a/drivers/net/ethernet/chelsio/Makefile b/drivers/net/ethernet/chelsio/Makefile
new file mode 100644
index 0000000..390510b
--- /dev/null
+++ b/drivers/net/ethernet/chelsio/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the Chelsio network device drivers.
+#
+
+obj-$(CONFIG_CHELSIO_T1) += cxgb/
+obj-$(CONFIG_CHELSIO_T3) += cxgb3/
+obj-$(CONFIG_CHELSIO_T4) += cxgb4/
+obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
diff --git a/drivers/net/chelsio/Makefile b/drivers/net/ethernet/chelsio/cxgb/Makefile
similarity index 100%
rename from drivers/net/chelsio/Makefile
rename to drivers/net/ethernet/chelsio/cxgb/Makefile
diff --git a/drivers/net/chelsio/common.h b/drivers/net/ethernet/chelsio/cxgb/common.h
similarity index 100%
rename from drivers/net/chelsio/common.h
rename to drivers/net/ethernet/chelsio/cxgb/common.h
diff --git a/drivers/net/chelsio/cphy.h b/drivers/net/ethernet/chelsio/cxgb/cphy.h
similarity index 100%
rename from drivers/net/chelsio/cphy.h
rename to drivers/net/ethernet/chelsio/cxgb/cphy.h
diff --git a/drivers/net/chelsio/cpl5_cmd.h b/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h
similarity index 100%
rename from drivers/net/chelsio/cpl5_cmd.h
rename to drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
similarity index 100%
rename from drivers/net/chelsio/cxgb2.c
rename to drivers/net/ethernet/chelsio/cxgb/cxgb2.c
diff --git a/drivers/net/chelsio/elmer0.h b/drivers/net/ethernet/chelsio/cxgb/elmer0.h
similarity index 100%
rename from drivers/net/chelsio/elmer0.h
rename to drivers/net/ethernet/chelsio/cxgb/elmer0.h
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/ethernet/chelsio/cxgb/espi.c
similarity index 100%
rename from drivers/net/chelsio/espi.c
rename to drivers/net/ethernet/chelsio/cxgb/espi.c
diff --git a/drivers/net/chelsio/espi.h b/drivers/net/ethernet/chelsio/cxgb/espi.h
similarity index 100%
rename from drivers/net/chelsio/espi.h
rename to drivers/net/ethernet/chelsio/cxgb/espi.h
diff --git a/drivers/net/chelsio/fpga_defs.h b/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
similarity index 100%
rename from drivers/net/chelsio/fpga_defs.h
rename to drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
diff --git a/drivers/net/chelsio/gmac.h b/drivers/net/ethernet/chelsio/cxgb/gmac.h
similarity index 100%
rename from drivers/net/chelsio/gmac.h
rename to drivers/net/ethernet/chelsio/cxgb/gmac.h
diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
similarity index 100%
rename from drivers/net/chelsio/mv88e1xxx.c
rename to drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
diff --git a/drivers/net/chelsio/mv88e1xxx.h b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
similarity index 100%
rename from drivers/net/chelsio/mv88e1xxx.h
rename to drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
diff --git a/drivers/net/chelsio/mv88x201x.c b/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
similarity index 100%
rename from drivers/net/chelsio/mv88x201x.c
rename to drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/ethernet/chelsio/cxgb/my3126.c
similarity index 100%
rename from drivers/net/chelsio/my3126.c
rename to drivers/net/ethernet/chelsio/cxgb/my3126.c
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/ethernet/chelsio/cxgb/pm3393.c
similarity index 100%
rename from drivers/net/chelsio/pm3393.c
rename to drivers/net/ethernet/chelsio/cxgb/pm3393.c
diff --git a/drivers/net/chelsio/regs.h b/drivers/net/ethernet/chelsio/cxgb/regs.h
similarity index 100%
rename from drivers/net/chelsio/regs.h
rename to drivers/net/ethernet/chelsio/cxgb/regs.h
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
similarity index 100%
rename from drivers/net/chelsio/sge.c
rename to drivers/net/ethernet/chelsio/cxgb/sge.c
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/ethernet/chelsio/cxgb/sge.h
similarity index 100%
rename from drivers/net/chelsio/sge.h
rename to drivers/net/ethernet/chelsio/cxgb/sge.h
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/ethernet/chelsio/cxgb/subr.c
similarity index 100%
rename from drivers/net/chelsio/subr.c
rename to drivers/net/ethernet/chelsio/cxgb/subr.c
diff --git a/drivers/net/chelsio/suni1x10gexp_regs.h b/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h
similarity index 100%
rename from drivers/net/chelsio/suni1x10gexp_regs.h
rename to drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h
diff --git a/drivers/net/chelsio/tp.c b/drivers/net/ethernet/chelsio/cxgb/tp.c
similarity index 100%
rename from drivers/net/chelsio/tp.c
rename to drivers/net/ethernet/chelsio/cxgb/tp.c
diff --git a/drivers/net/chelsio/tp.h b/drivers/net/ethernet/chelsio/cxgb/tp.h
similarity index 100%
rename from drivers/net/chelsio/tp.h
rename to drivers/net/ethernet/chelsio/cxgb/tp.h
diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/ethernet/chelsio/cxgb/vsc7326.c
similarity index 100%
rename from drivers/net/chelsio/vsc7326.c
rename to drivers/net/ethernet/chelsio/cxgb/vsc7326.c
diff --git a/drivers/net/chelsio/vsc7326_reg.h b/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
similarity index 100%
rename from drivers/net/chelsio/vsc7326_reg.h
rename to drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
diff --git a/drivers/net/cxgb3/Makefile b/drivers/net/ethernet/chelsio/cxgb3/Makefile
similarity index 100%
rename from drivers/net/cxgb3/Makefile
rename to drivers/net/ethernet/chelsio/cxgb3/Makefile
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/ethernet/chelsio/cxgb3/adapter.h
similarity index 100%
rename from drivers/net/cxgb3/adapter.h
rename to drivers/net/ethernet/chelsio/cxgb3/adapter.h
diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/ethernet/chelsio/cxgb3/ael1002.c
similarity index 100%
rename from drivers/net/cxgb3/ael1002.c
rename to drivers/net/ethernet/chelsio/cxgb3/ael1002.c
diff --git a/drivers/net/cxgb3/aq100x.c b/drivers/net/ethernet/chelsio/cxgb3/aq100x.c
similarity index 100%
rename from drivers/net/cxgb3/aq100x.c
rename to drivers/net/ethernet/chelsio/cxgb3/aq100x.c
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/ethernet/chelsio/cxgb3/common.h
similarity index 100%
rename from drivers/net/cxgb3/common.h
rename to drivers/net/ethernet/chelsio/cxgb3/common.h
diff --git a/drivers/net/cxgb3/cxgb3_ctl_defs.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ctl_defs.h
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_ctl_defs.h
rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_ctl_defs.h
diff --git a/drivers/net/cxgb3/cxgb3_defs.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_defs.h
rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h
diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_ioctl.h
rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_main.c
rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_offload.c
rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h
similarity index 100%
rename from drivers/net/cxgb3/cxgb3_offload.h
rename to drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h
diff --git a/drivers/net/cxgb3/firmware_exports.h b/drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h
similarity index 100%
rename from drivers/net/cxgb3/firmware_exports.h
rename to drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
similarity index 100%
rename from drivers/net/cxgb3/l2t.c
rename to drivers/net/ethernet/chelsio/cxgb3/l2t.c
diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
similarity index 100%
rename from drivers/net/cxgb3/l2t.h
rename to drivers/net/ethernet/chelsio/cxgb3/l2t.h
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/ethernet/chelsio/cxgb3/mc5.c
similarity index 100%
rename from drivers/net/cxgb3/mc5.c
rename to drivers/net/ethernet/chelsio/cxgb3/mc5.c
diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/ethernet/chelsio/cxgb3/regs.h
similarity index 100%
rename from drivers/net/cxgb3/regs.h
rename to drivers/net/ethernet/chelsio/cxgb3/regs.h
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
similarity index 100%
rename from drivers/net/cxgb3/sge.c
rename to drivers/net/ethernet/chelsio/cxgb3/sge.c
diff --git a/drivers/net/cxgb3/sge_defs.h b/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h
similarity index 100%
rename from drivers/net/cxgb3/sge_defs.h
rename to drivers/net/ethernet/chelsio/cxgb3/sge_defs.h
diff --git a/drivers/net/cxgb3/t3_cpl.h b/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h
similarity index 100%
rename from drivers/net/cxgb3/t3_cpl.h
rename to drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
similarity index 100%
rename from drivers/net/cxgb3/t3_hw.c
rename to drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/ethernet/chelsio/cxgb3/t3cdev.h
similarity index 100%
rename from drivers/net/cxgb3/t3cdev.h
rename to drivers/net/ethernet/chelsio/cxgb3/t3cdev.h
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h
similarity index 100%
rename from drivers/net/cxgb3/version.h
rename to drivers/net/ethernet/chelsio/cxgb3/version.h
diff --git a/drivers/net/cxgb3/vsc8211.c b/drivers/net/ethernet/chelsio/cxgb3/vsc8211.c
similarity index 100%
rename from drivers/net/cxgb3/vsc8211.c
rename to drivers/net/ethernet/chelsio/cxgb3/vsc8211.c
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/ethernet/chelsio/cxgb3/xgmac.c
similarity index 100%
rename from drivers/net/cxgb3/xgmac.c
rename to drivers/net/ethernet/chelsio/cxgb3/xgmac.c
diff --git a/drivers/net/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile
similarity index 100%
rename from drivers/net/cxgb4/Makefile
rename to drivers/net/ethernet/chelsio/cxgb4/Makefile
diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
similarity index 100%
rename from drivers/net/cxgb4/cxgb4.h
rename to drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
similarity index 100%
rename from drivers/net/cxgb4/cxgb4_main.c
rename to drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
diff --git a/drivers/net/cxgb4/cxgb4_uld.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
similarity index 100%
rename from drivers/net/cxgb4/cxgb4_uld.h
rename to drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
diff --git a/drivers/net/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
similarity index 100%
rename from drivers/net/cxgb4/l2t.c
rename to drivers/net/ethernet/chelsio/cxgb4/l2t.c
diff --git a/drivers/net/cxgb4/l2t.h b/drivers/net/ethernet/chelsio/cxgb4/l2t.h
similarity index 100%
rename from drivers/net/cxgb4/l2t.h
rename to drivers/net/ethernet/chelsio/cxgb4/l2t.h
diff --git a/drivers/net/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
similarity index 100%
rename from drivers/net/cxgb4/sge.c
rename to drivers/net/ethernet/chelsio/cxgb4/sge.c
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
similarity index 100%
rename from drivers/net/cxgb4/t4_hw.c
rename to drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
diff --git a/drivers/net/cxgb4/t4_hw.h b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
similarity index 100%
rename from drivers/net/cxgb4/t4_hw.h
rename to drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
diff --git a/drivers/net/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
similarity index 100%
rename from drivers/net/cxgb4/t4_msg.h
rename to drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
diff --git a/drivers/net/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
similarity index 100%
rename from drivers/net/cxgb4/t4_regs.h
rename to drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
diff --git a/drivers/net/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
similarity index 100%
rename from drivers/net/cxgb4/t4fw_api.h
rename to drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
diff --git a/drivers/net/cxgb4vf/Makefile b/drivers/net/ethernet/chelsio/cxgb4vf/Makefile
similarity index 100%
rename from drivers/net/cxgb4vf/Makefile
rename to drivers/net/ethernet/chelsio/cxgb4vf/Makefile
diff --git a/drivers/net/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
similarity index 100%
rename from drivers/net/cxgb4vf/adapter.h
rename to drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
diff --git a/drivers/net/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
similarity index 100%
rename from drivers/net/cxgb4vf/cxgb4vf_main.c
rename to drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
similarity index 100%
rename from drivers/net/cxgb4vf/sge.c
rename to drivers/net/ethernet/chelsio/cxgb4vf/sge.c
diff --git a/drivers/net/cxgb4vf/t4vf_common.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
similarity index 100%
rename from drivers/net/cxgb4vf/t4vf_common.h
rename to drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
diff --git a/drivers/net/cxgb4vf/t4vf_defs.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h
similarity index 100%
rename from drivers/net/cxgb4vf/t4vf_defs.h
rename to drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h
diff --git a/drivers/net/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
similarity index 100%
rename from drivers/net/cxgb4vf/t4vf_hw.c
rename to drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
diff --git a/drivers/scsi/cxgbi/cxgb3i/Kbuild b/drivers/scsi/cxgbi/cxgb3i/Kbuild
index 09dbf9e..6f095e2 100644
--- a/drivers/scsi/cxgbi/cxgb3i/Kbuild
+++ b/drivers/scsi/cxgbi/cxgb3i/Kbuild
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o
diff --git a/drivers/scsi/cxgbi/cxgb4i/Kbuild b/drivers/scsi/cxgbi/cxgb4i/Kbuild
index b9f4af7..8290cda 100644
--- a/drivers/scsi/cxgbi/cxgb4i/Kbuild
+++ b/drivers/scsi/cxgbi/cxgb4i/Kbuild
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb4
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
 
 obj-$(CONFIG_SCSI_CXGB4_ISCSI) += cxgb4i.o
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 07/72] intel: Move the Intel wired LAN drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (5 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 06/72] chelsio: Move the Chelsio drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 08/72] qlogic: Move the QLogic drivers Jeff Kirsher
                   ` (67 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev

Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
the necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |   11 +-
 drivers/net/Kconfig                                |  200 ------------------
 drivers/net/Makefile                               |    8 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/intel/Kconfig                 |  216 ++++++++++++++++++++
 drivers/net/ethernet/intel/Makefile                |   12 +
 drivers/net/{ => ethernet/intel}/e100.c            |    0
 drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
 drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    0
 .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
 .../net/{ => ethernet/intel}/e1000/e1000_main.c    |    0
 .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
 .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
 .../intel/e1000e/80003es2lan.c}                    |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    4 +-
 drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
 .../e1000.h => ethernet/intel/e1000e/e1000e.h}     |    0
 .../intel/e1000e/e1000e_main.c}                    |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
 drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/param.c    |    2 +-
 drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    2 +-
 drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
 .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
 drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
 drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
 drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
 drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    0
 drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
 drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
 drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
 drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
 drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
 drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
 drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    0
 drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
 drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
 drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
 drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
 .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
 drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
 drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    0
 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    0
 .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    0
 .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
 drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
 101 files changed, 242 insertions(+), 227 deletions(-)
 create mode 100644 drivers/net/ethernet/intel/Kconfig
 create mode 100644 drivers/net/ethernet/intel/Makefile
 rename drivers/net/{ => ethernet/intel}/e100.c (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
 rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
 rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (92%)
 rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
 rename drivers/net/{e1000e/e1000.h => ethernet/intel/e1000e/e1000e.h} (100%)
 rename drivers/net/{e1000e/netdev.c => ethernet/intel/e1000e/e1000e_main.c} (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
 rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/param.c (99%)
 rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (99%)
 rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
 rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
 rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
 rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 816bab8..ed7cce6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3308,7 +3308,7 @@ M:	Bruce Allan <bruce.w.allan@intel.com>
 M:	Carolyn Wyborny <carolyn.wyborny@intel.com>
 M:	Don Skidmore <donald.c.skidmore@intel.com>
 M:	Greg Rose <gregory.v.rose@intel.com>
-M:	PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
+M:	Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
 M:	Alex Duyck <alexander.h.duyck@intel.com>
 M:	John Ronciak <john.ronciak@intel.com>
 L:	e1000-devel@lists.sourceforge.net
@@ -3324,14 +3324,7 @@ F:	Documentation/networking/igbvf.txt
 F:	Documentation/networking/ixgb.txt
 F:	Documentation/networking/ixgbe.txt
 F:	Documentation/networking/ixgbevf.txt
-F:	drivers/net/e100.c
-F:	drivers/net/e1000/
-F:	drivers/net/e1000e/
-F:	drivers/net/igb/
-F:	drivers/net/igbvf/
-F:	drivers/net/ixgb/
-F:	drivers/net/ixgbe/
-F:	drivers/net/ixgbevf/
+F:	drivers/net/ethernet/intel/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 L:	linux-wireless@vger.kernel.org
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3e1b8bc..5bb247f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1029,32 +1029,6 @@ config TC35815
 	depends on NET_PCI && PCI && MIPS
 	select PHYLIB
 
-config E100
-	tristate "Intel(R) PRO/100+ support"
-	depends on NET_PCI && PCI
-	select MII
-	---help---
-	  This driver supports Intel(R) PRO/100 family of adapters.
-	  To verify that your adapter is supported, find the board ID number 
-	  on the adapter. Look for a label that has a barcode and a number 
-	  in the format 123456-001 (six digits hyphen three digits). 
-
-	  Use the above information and the Adapter & Driver ID Guide at:
-
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-	  to identify the adapter.
-
-	  For the latest Intel PRO/100 network driver for Linux, see:
-
-	  <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>
-
-	  More specific information on configuring the driver is in 
-	  <file:Documentation/networking/e100.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called e100.
-
 config FEALNX
 	tristate "Myson MTD-8xx PCI Ethernet support"
 	depends on NET_PCI && PCI
@@ -1494,47 +1468,6 @@ config DL2K
 	  To compile this driver as a module, choose M here: the
 	  module will be called dl2k.
 
-config E1000
-	tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
-	depends on PCI
-	---help---
-	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of
-	  adapters.  For more information on how to identify your adapter, go 
-	  to the Adapter & Driver ID Guide at:
-
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-	  For general information and support, go to the Intel support
-	  website at:
-
-	  <http://support.intel.com>
-
-	  More specific information on configuring the driver is in 
-	  <file:Documentation/networking/e1000.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called e1000.
-
-config E1000E
-	tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
-	depends on PCI && (!SPARC32 || BROKEN)
-	select CRC32
-	---help---
-	  This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
-	  ethernet family of adapters. For PCI or PCI-X e1000 adapters,
-	  use the regular e1000 driver For more information on how to
-	  identify your adapter, go to the Adapter & Driver ID Guide at:
-
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-	  For general information and support, go to the Intel support
-	  website at:
-
-	  <http://support.intel.com>
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called e1000e.
-
 config IP1000
 	tristate "IP1000 Gigabit Ethernet support"
 	depends on PCI && EXPERIMENTAL
@@ -1545,57 +1478,6 @@ config IP1000
 	  To compile this driver as a module, choose M here: the module
 	  will be called ipg.  This is recommended.
 
-config IGB
-	tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
-	depends on PCI
-	---help---
-	  This driver supports Intel(R) 82575/82576 gigabit ethernet family of
-	  adapters.  For more information on how to identify your adapter, go
-	  to the Adapter & Driver ID Guide at:
-
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-	  For general information and support, go to the Intel support
-	  website at:
-
-	  <http://support.intel.com>
-
-	  More specific information on configuring the driver is in
-	  <file:Documentation/networking/e1000.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called igb.
-
-config IGB_DCA
-	bool "Direct Cache Access (DCA) Support"
-	default y
-	depends on IGB && DCA && !(IGB=y && DCA=m)
-	---help---
-	  Say Y here if you want to use Direct Cache Access (DCA) in the
-	  driver.  DCA is a method for warming the CPU cache before data
-	  is used, with the intent of lessening the impact of cache misses.
-
-config IGBVF
-	tristate "Intel(R) 82576 Virtual Function Ethernet support"
-	depends on PCI
-	---help---
-	  This driver supports Intel(R) 82576 virtual functions.  For more
-	  information on how to identify your adapter, go to the Adapter &
-	  Driver ID Guide at:
-
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-	  For general information and support, go to the Intel support
-	  website at:
-
-	  <http://support.intel.com>
-
-	  More specific information on configuring the driver is in
-	  <file:Documentation/networking/e1000.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called igbvf.
-
 source "drivers/net/ixp2000/Kconfig"
 
 config NS83820
@@ -1953,88 +1835,6 @@ config ENIC
 	help
 	  This enables the support for the Cisco VIC Ethernet card.
 
-config IXGBE
-	tristate "Intel(R) 10GbE PCI Express adapters support"
-	depends on PCI && INET
-	select MDIO
-	---help---
-	  This driver supports Intel(R) 10GbE PCI Express family of
-	  adapters.  For more information on how to identify your adapter, go
-	  to the Adapter & Driver ID Guide at:
-
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-	  For general information and support, go to the Intel support
-	  website at:
-
-	  <http://support.intel.com>
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ixgbe.
-
-config IXGBE_DCA
-	bool "Direct Cache Access (DCA) Support"
-	default y
-	depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
-	---help---
-	  Say Y here if you want to use Direct Cache Access (DCA) in the
-	  driver.  DCA is a method for warming the CPU cache before data
-	  is used, with the intent of lessening the impact of cache misses.
-
-config IXGBE_DCB
-	bool "Data Center Bridging (DCB) Support"
-	default n
-	depends on IXGBE && DCB
-	---help---
-	  Say Y here if you want to use Data Center Bridging (DCB) in the
-	  driver.
-
-	  If unsure, say N.
-
-config IXGBEVF
-	tristate "Intel(R) 82599 Virtual Function Ethernet support"
-	depends on PCI_MSI
-	---help---
-	  This driver supports Intel(R) 82599 virtual functions.  For more
-	  information on how to identify your adapter, go to the Adapter &
-	  Driver ID Guide at:
-
-	  <http://support.intel.com/support/network/sb/CS-008441.htm>
-
-	  For general information and support, go to the Intel support
-	  website at:
-
-	  <http://support.intel.com>
-
-	  More specific information on configuring the driver is in
-	  <file:Documentation/networking/ixgbevf.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ixgbevf.  MSI-X interrupt support is required
-	  for this driver to work correctly.
-
-config IXGB
-	tristate "Intel(R) PRO/10GbE support"
-	depends on PCI
-	---help---
-	  This driver supports Intel(R) PRO/10GbE family of adapters for
-	  PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
-	  instead. For more information on how to identify your adapter, go
-	  to the Adapter & Driver ID Guide at:
-
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-	  For general information and support, go to the Intel support
-	  website at:
-
-	  <http://support.intel.com>
-
-	  More specific information on configuring the driver is in 
-	  <file:Documentation/networking/ixgb.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ixgb.
-
 config S2IO
 	tristate "Exar Xframe 10Gb Ethernet Adapter"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 395878f..b2e5b93 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -10,14 +10,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
 obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
 
-obj-$(CONFIG_E1000) += e1000/
-obj-$(CONFIG_E1000E) += e1000e/
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
-obj-$(CONFIG_IGB) += igb/
-obj-$(CONFIG_IGBVF) += igbvf/
-obj-$(CONFIG_IXGBE) += ixgbe/
-obj-$(CONFIG_IXGBEVF) += ixgbevf/
-obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
@@ -61,7 +54,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 
-obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 69d6403..a2fd385 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -16,5 +16,6 @@ source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/intel/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 470e5d8..5265271 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
new file mode 100644
index 0000000..83089e4
--- /dev/null
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -0,0 +1,216 @@
+#
+# Intel network device configuration
+#
+
+config NET_VENDOR_INTEL
+	bool "Intel devices"
+	depends on PCI || PCI_MSI
+	---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 Intel cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config E100
+	tristate "Intel(R) PRO/100+ support"
+	depends on NET_VENDOR_INTEL && PCI
+	select MII
+	---help---
+	  This driver supports Intel(R) PRO/100 family of adapters.
+	  To verify that your adapter is supported, find the board ID number
+	  on the adapter. Look for a label that has a barcode and a number
+	  in the format 123456-001 (six digits hyphen three digits).
+
+	  Use the above information and the Adapter & Driver ID Guide at:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+	  to identify the adapter.
+
+	  For the latest Intel PRO/100 network driver for Linux, see:
+
+	  <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/e100.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e100.
+
+config E1000
+	tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
+	depends on NET_VENDOR_INTEL && PCI
+	---help---
+	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of
+	  adapters.  For more information on how to identify your adapter, go
+	  to the Adapter & Driver ID Guide at:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+	  For general information and support, go to the Intel support
+	  website at:
+
+	  <http://support.intel.com>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/e1000.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e1000.
+
+config E1000E
+	tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
+	depends on NET_VENDOR_INTEL && PCI && (!SPARC32 || BROKEN)
+	select CRC32
+	---help---
+	  This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
+	  ethernet family of adapters. For PCI or PCI-X e1000 adapters,
+	  use the regular e1000 driver For more information on how to
+	  identify your adapter, go to the Adapter & Driver ID Guide at:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+	  For general information and support, go to the Intel support
+	  website at:
+
+	  <http://support.intel.com>
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e1000e.
+
+config IGB
+	tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
+	depends on NET_VENDOR_INTEL && PCI
+	---help---
+	  This driver supports Intel(R) 82575/82576 gigabit ethernet family of
+	  adapters.  For more information on how to identify your adapter, go
+	  to the Adapter & Driver ID Guide at:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+	  For general information and support, go to the Intel support
+	  website at:
+
+	  <http://support.intel.com>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/e1000.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called igb.
+
+config IGB_DCA
+	bool "Direct Cache Access (DCA) Support"
+	default y
+	depends on IGB && DCA && !(IGB=y && DCA=m)
+	---help---
+	  Say Y here if you want to use Direct Cache Access (DCA) in the
+	  driver.  DCA is a method for warming the CPU cache before data
+	  is used, with the intent of lessening the impact of cache misses.
+
+config IGBVF
+	tristate "Intel(R) 82576 Virtual Function Ethernet support"
+	depends on NET_VENDOR_INTEL && PCI
+	---help---
+	  This driver supports Intel(R) 82576 virtual functions.  For more
+	  information on how to identify your adapter, go to the Adapter &
+	  Driver ID Guide at:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+	  For general information and support, go to the Intel support
+	  website at:
+
+	  <http://support.intel.com>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/e1000.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called igbvf.
+
+config IXGB
+	tristate "Intel(R) PRO/10GbE support"
+	depends on NET_VENDOR_INTEL && PCI
+	---help---
+	  This driver supports Intel(R) PRO/10GbE family of adapters for
+	  PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
+	  instead. For more information on how to identify your adapter, go
+	  to the Adapter & Driver ID Guide at:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+	  For general information and support, go to the Intel support
+	  website at:
+
+	  <http://support.intel.com>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/ixgb.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ixgb.
+
+config IXGBE
+	tristate "Intel(R) 10GbE PCI Express adapters support"
+	depends on NET_VENDOR_INTEL && PCI && INET
+	select MDIO
+	---help---
+	  This driver supports Intel(R) 10GbE PCI Express family of
+	  adapters.  For more information on how to identify your adapter, go
+	  to the Adapter & Driver ID Guide at:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+	  For general information and support, go to the Intel support
+	  website at:
+
+	  <http://support.intel.com>
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ixgbe.
+
+config IXGBE_DCA
+	bool "Direct Cache Access (DCA) Support"
+	default y
+	depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
+	---help---
+	  Say Y here if you want to use Direct Cache Access (DCA) in the
+	  driver.  DCA is a method for warming the CPU cache before data
+	  is used, with the intent of lessening the impact of cache misses.
+
+config IXGBE_DCB
+	bool "Data Center Bridging (DCB) Support"
+	default n
+	depends on IXGBE && DCB
+	---help---
+	  Say Y here if you want to use Data Center Bridging (DCB) in the
+	  driver.
+
+	  If unsure, say N.
+
+config IXGBEVF
+	tristate "Intel(R) 82599 Virtual Function Ethernet support"
+	depends on NET_VENDOR_INTEL && PCI_MSI
+	---help---
+	  This driver supports Intel(R) 82599 virtual functions.  For more
+	  information on how to identify your adapter, go to the Adapter &
+	  Driver ID Guide at:
+
+	  <http://support.intel.com/support/network/sb/CS-008441.htm>
+
+	  For general information and support, go to the Intel support
+	  website at:
+
+	  <http://support.intel.com>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/ixgbevf.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ixgbevf.  MSI-X interrupt support is required
+	  for this driver to work correctly.
diff --git a/drivers/net/ethernet/intel/Makefile b/drivers/net/ethernet/intel/Makefile
new file mode 100644
index 0000000..c8210e6
--- /dev/null
+++ b/drivers/net/ethernet/intel/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the Intel network device drivers.
+#
+
+obj-$(CONFIG_E100) += e100.o
+obj-$(CONFIG_E1000) += e1000/
+obj-$(CONFIG_E1000E) += e1000e/
+obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGBVF) += igbvf/
+obj-$(CONFIG_IXGBE) += ixgbe/
+obj-$(CONFIG_IXGBEVF) += ixgbevf/
+obj-$(CONFIG_IXGB) += ixgb/
diff --git a/drivers/net/e100.c b/drivers/net/ethernet/intel/e100.c
similarity index 100%
rename from drivers/net/e100.c
rename to drivers/net/ethernet/intel/e100.c
diff --git a/drivers/net/e1000/Makefile b/drivers/net/ethernet/intel/e1000/Makefile
similarity index 100%
rename from drivers/net/e1000/Makefile
rename to drivers/net/ethernet/intel/e1000/Makefile
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
similarity index 100%
rename from drivers/net/e1000/e1000.h
rename to drivers/net/ethernet/intel/e1000/e1000.h
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
similarity index 100%
rename from drivers/net/e1000/e1000_ethtool.c
rename to drivers/net/ethernet/intel/e1000/e1000_ethtool.c
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
similarity index 100%
rename from drivers/net/e1000/e1000_hw.c
rename to drivers/net/ethernet/intel/e1000/e1000_hw.c
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/ethernet/intel/e1000/e1000_hw.h
similarity index 100%
rename from drivers/net/e1000/e1000_hw.h
rename to drivers/net/ethernet/intel/e1000/e1000_hw.h
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
similarity index 100%
rename from drivers/net/e1000/e1000_main.c
rename to drivers/net/ethernet/intel/e1000/e1000_main.c
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/ethernet/intel/e1000/e1000_osdep.h
similarity index 100%
rename from drivers/net/e1000/e1000_osdep.h
rename to drivers/net/ethernet/intel/e1000/e1000_osdep.h
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c
similarity index 100%
rename from drivers/net/e1000/e1000_param.c
rename to drivers/net/ethernet/intel/e1000/e1000_param.c
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
similarity index 99%
rename from drivers/net/e1000e/es2lan.c
rename to drivers/net/ethernet/intel/e1000e/80003es2lan.c
index c0ecb2d..5631dfd 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -31,7 +31,7 @@
  * 80003ES2LAN Gigabit Ethernet Controller (Serdes)
  */
 
-#include "e1000.h"
+#include "e1000e.h"
 
 #define E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL	 0x00
 #define E1000_KMRNCTRLSTA_OFFSET_INB_CTRL	 0x02
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
similarity index 99%
rename from drivers/net/e1000e/82571.c
rename to drivers/net/ethernet/intel/e1000e/82571.c
index 8295f21..228b532 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -43,7 +43,7 @@
  * 82583V Gigabit Network Connection
  */
 
-#include "e1000.h"
+#include "e1000e.h"
 
 #define ID_LED_RESERVED_F746 0xF746
 #define ID_LED_DEFAULT_82573 ((ID_LED_DEF1_DEF2 << 12) | \
diff --git a/drivers/net/e1000e/Makefile b/drivers/net/ethernet/intel/e1000e/Makefile
similarity index 92%
rename from drivers/net/e1000e/Makefile
rename to drivers/net/ethernet/intel/e1000e/Makefile
index 28519ac..3c749b3 100644
--- a/drivers/net/e1000e/Makefile
+++ b/drivers/net/ethernet/intel/e1000e/Makefile
@@ -32,6 +32,6 @@
 
 obj-$(CONFIG_E1000E) += e1000e.o
 
-e1000e-objs := 82571.o ich8lan.o es2lan.o \
-	       lib.o phy.o param.o ethtool.o netdev.o
+e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \
+	       lib.o phy.o param.o ethtool.o e1000e_main.o
 
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
similarity index 100%
rename from drivers/net/e1000e/defines.h
rename to drivers/net/ethernet/intel/e1000e/defines.h
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000e.h
similarity index 100%
rename from drivers/net/e1000e/e1000.h
rename to drivers/net/ethernet/intel/e1000e/e1000e.h
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/e1000e_main.c
similarity index 99%
rename from drivers/net/e1000e/netdev.c
rename to drivers/net/ethernet/intel/e1000e/e1000e_main.c
index 3bf5249..4ade2d8 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/e1000e_main.c
@@ -52,7 +52,7 @@
 #include <linux/aer.h>
 #include <linux/prefetch.h>
 
-#include "e1000.h"
+#include "e1000e.h"
 
 #define DRV_EXTRAVERSION "-k"
 
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
similarity index 99%
rename from drivers/net/e1000e/ethtool.c
rename to drivers/net/ethernet/intel/e1000e/ethtool.c
index cb1a362..7943908 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -35,7 +35,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 
-#include "e1000.h"
+#include "e1000e.h"
 
 enum {NETDEV_STATS, E1000_STATS};
 
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
similarity index 100%
rename from drivers/net/e1000e/hw.h
rename to drivers/net/ethernet/intel/e1000e/hw.h
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
similarity index 99%
rename from drivers/net/e1000e/ich8lan.c
rename to drivers/net/ethernet/intel/e1000e/ich8lan.c
index c175212..e725001 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -56,7 +56,7 @@
  * 82579V Gigabit Network Connection
  */
 
-#include "e1000.h"
+#include "e1000e.h"
 
 #define ICH_FLASH_GFPREG		0x0000
 #define ICH_FLASH_HSFSTS		0x0004
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c
similarity index 99%
rename from drivers/net/e1000e/lib.c
rename to drivers/net/ethernet/intel/e1000e/lib.c
index dd8ab05..20e8d25 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/ethernet/intel/e1000e/lib.c
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include "e1000.h"
+#include "e1000e.h"
 
 enum e1000_mng_mode {
 	e1000_mng_mode_none = 0,
diff --git a/drivers/net/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
similarity index 99%
rename from drivers/net/e1000e/param.c
rename to drivers/net/ethernet/intel/e1000e/param.c
index 4dd9b63..1f4202c 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -29,7 +29,7 @@
 #include <linux/netdevice.h>
 #include <linux/pci.h>
 
-#include "e1000.h"
+#include "e1000e.h"
 
 /*
  * This is the only thing that needs to be changed to adjust the
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
similarity index 99%
rename from drivers/net/e1000e/phy.c
rename to drivers/net/ethernet/intel/e1000e/phy.c
index 2a6ee13..4ba763b 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -28,7 +28,7 @@
 
 #include <linux/delay.h>
 
-#include "e1000.h"
+#include "e1000e.h"
 
 static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
 static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
diff --git a/drivers/net/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile
similarity index 100%
rename from drivers/net/igb/Makefile
rename to drivers/net/ethernet/intel/igb/Makefile
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
similarity index 100%
rename from drivers/net/igb/e1000_82575.c
rename to drivers/net/ethernet/intel/igb/e1000_82575.c
diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
similarity index 100%
rename from drivers/net/igb/e1000_82575.h
rename to drivers/net/ethernet/intel/igb/e1000_82575.h
diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
similarity index 100%
rename from drivers/net/igb/e1000_defines.h
rename to drivers/net/ethernet/intel/igb/e1000_defines.h
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
similarity index 100%
rename from drivers/net/igb/e1000_hw.h
rename to drivers/net/ethernet/intel/igb/e1000_hw.h
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
similarity index 100%
rename from drivers/net/igb/e1000_mac.c
rename to drivers/net/ethernet/intel/igb/e1000_mac.c
diff --git a/drivers/net/igb/e1000_mac.h b/drivers/net/ethernet/intel/igb/e1000_mac.h
similarity index 100%
rename from drivers/net/igb/e1000_mac.h
rename to drivers/net/ethernet/intel/igb/e1000_mac.h
diff --git a/drivers/net/igb/e1000_mbx.c b/drivers/net/ethernet/intel/igb/e1000_mbx.c
similarity index 100%
rename from drivers/net/igb/e1000_mbx.c
rename to drivers/net/ethernet/intel/igb/e1000_mbx.c
diff --git a/drivers/net/igb/e1000_mbx.h b/drivers/net/ethernet/intel/igb/e1000_mbx.h
similarity index 100%
rename from drivers/net/igb/e1000_mbx.h
rename to drivers/net/ethernet/intel/igb/e1000_mbx.h
diff --git a/drivers/net/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c
similarity index 100%
rename from drivers/net/igb/e1000_nvm.c
rename to drivers/net/ethernet/intel/igb/e1000_nvm.c
diff --git a/drivers/net/igb/e1000_nvm.h b/drivers/net/ethernet/intel/igb/e1000_nvm.h
similarity index 100%
rename from drivers/net/igb/e1000_nvm.h
rename to drivers/net/ethernet/intel/igb/e1000_nvm.h
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
similarity index 100%
rename from drivers/net/igb/e1000_phy.c
rename to drivers/net/ethernet/intel/igb/e1000_phy.c
diff --git a/drivers/net/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h
similarity index 100%
rename from drivers/net/igb/e1000_phy.h
rename to drivers/net/ethernet/intel/igb/e1000_phy.h
diff --git a/drivers/net/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
similarity index 100%
rename from drivers/net/igb/e1000_regs.h
rename to drivers/net/ethernet/intel/igb/e1000_regs.h
diff --git a/drivers/net/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
similarity index 100%
rename from drivers/net/igb/igb.h
rename to drivers/net/ethernet/intel/igb/igb.h
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
similarity index 100%
rename from drivers/net/igb/igb_ethtool.c
rename to drivers/net/ethernet/intel/igb/igb_ethtool.c
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
similarity index 100%
rename from drivers/net/igb/igb_main.c
rename to drivers/net/ethernet/intel/igb/igb_main.c
diff --git a/drivers/net/igbvf/Makefile b/drivers/net/ethernet/intel/igbvf/Makefile
similarity index 100%
rename from drivers/net/igbvf/Makefile
rename to drivers/net/ethernet/intel/igbvf/Makefile
diff --git a/drivers/net/igbvf/defines.h b/drivers/net/ethernet/intel/igbvf/defines.h
similarity index 100%
rename from drivers/net/igbvf/defines.h
rename to drivers/net/ethernet/intel/igbvf/defines.h
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
similarity index 100%
rename from drivers/net/igbvf/ethtool.c
rename to drivers/net/ethernet/intel/igbvf/ethtool.c
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h
similarity index 100%
rename from drivers/net/igbvf/igbvf.h
rename to drivers/net/ethernet/intel/igbvf/igbvf.h
diff --git a/drivers/net/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c
similarity index 100%
rename from drivers/net/igbvf/mbx.c
rename to drivers/net/ethernet/intel/igbvf/mbx.c
diff --git a/drivers/net/igbvf/mbx.h b/drivers/net/ethernet/intel/igbvf/mbx.h
similarity index 100%
rename from drivers/net/igbvf/mbx.h
rename to drivers/net/ethernet/intel/igbvf/mbx.h
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
similarity index 100%
rename from drivers/net/igbvf/netdev.c
rename to drivers/net/ethernet/intel/igbvf/netdev.c
diff --git a/drivers/net/igbvf/regs.h b/drivers/net/ethernet/intel/igbvf/regs.h
similarity index 100%
rename from drivers/net/igbvf/regs.h
rename to drivers/net/ethernet/intel/igbvf/regs.h
diff --git a/drivers/net/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
similarity index 100%
rename from drivers/net/igbvf/vf.c
rename to drivers/net/ethernet/intel/igbvf/vf.c
diff --git a/drivers/net/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
similarity index 100%
rename from drivers/net/igbvf/vf.h
rename to drivers/net/ethernet/intel/igbvf/vf.h
diff --git a/drivers/net/ixgb/Makefile b/drivers/net/ethernet/intel/ixgb/Makefile
similarity index 100%
rename from drivers/net/ixgb/Makefile
rename to drivers/net/ethernet/intel/ixgb/Makefile
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h
similarity index 100%
rename from drivers/net/ixgb/ixgb.h
rename to drivers/net/ethernet/intel/ixgb/ixgb.h
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.c
rename to drivers/net/ethernet/intel/ixgb/ixgb_ee.c
diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ethernet/intel/ixgb/ixgb_ee.h
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.h
rename to drivers/net/ethernet/intel/ixgb/ixgb_ee.h
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
similarity index 100%
rename from drivers/net/ixgb/ixgb_ethtool.c
rename to drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.c
rename to drivers/net/ethernet/intel/ixgb/ixgb_hw.c
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ethernet/intel/ixgb/ixgb_hw.h
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.h
rename to drivers/net/ethernet/intel/ixgb/ixgb_hw.h
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
similarity index 100%
rename from drivers/net/ixgb/ixgb_ids.h
rename to drivers/net/ethernet/intel/ixgb/ixgb_ids.h
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
similarity index 100%
rename from drivers/net/ixgb/ixgb_main.c
rename to drivers/net/ethernet/intel/ixgb/ixgb_main.c
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h
similarity index 100%
rename from drivers/net/ixgb/ixgb_osdep.h
rename to drivers/net/ethernet/intel/ixgb/ixgb_osdep.h
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ethernet/intel/ixgb/ixgb_param.c
similarity index 100%
rename from drivers/net/ixgb/ixgb_param.c
rename to drivers/net/ethernet/intel/ixgb/ixgb_param.c
diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
similarity index 100%
rename from drivers/net/ixgbe/Makefile
rename to drivers/net/ethernet/intel/ixgbe/Makefile
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe.h
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82598.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82599.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_nl.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethtool.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_main.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
diff --git a/drivers/net/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
diff --git a/drivers/net/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_type.h
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_x540.c
rename to drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
diff --git a/drivers/net/ixgbevf/Makefile b/drivers/net/ethernet/intel/ixgbevf/Makefile
similarity index 100%
rename from drivers/net/ixgbevf/Makefile
rename to drivers/net/ethernet/intel/ixgbevf/Makefile
diff --git a/drivers/net/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h
similarity index 100%
rename from drivers/net/ixgbevf/defines.h
rename to drivers/net/ethernet/intel/ixgbevf/defines.h
diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
similarity index 100%
rename from drivers/net/ixgbevf/ethtool.c
rename to drivers/net/ethernet/intel/ixgbevf/ethtool.c
diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf.h
rename to drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf_main.c
rename to drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
diff --git a/drivers/net/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c
similarity index 100%
rename from drivers/net/ixgbevf/mbx.c
rename to drivers/net/ethernet/intel/ixgbevf/mbx.c
diff --git a/drivers/net/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h
similarity index 100%
rename from drivers/net/ixgbevf/mbx.h
rename to drivers/net/ethernet/intel/ixgbevf/mbx.h
diff --git a/drivers/net/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h
similarity index 100%
rename from drivers/net/ixgbevf/regs.h
rename to drivers/net/ethernet/intel/ixgbevf/regs.h
diff --git a/drivers/net/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
similarity index 100%
rename from drivers/net/ixgbevf/vf.c
rename to drivers/net/ethernet/intel/ixgbevf/vf.c
diff --git a/drivers/net/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
similarity index 100%
rename from drivers/net/ixgbevf/vf.h
rename to drivers/net/ethernet/intel/ixgbevf/vf.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 08/72] qlogic: Move the QLogic drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (6 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 07/72] intel: Move the Intel wired LAN drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-27  1:30   ` Anirban Chakraborty
  2011-06-25 13:58 ` [RFC 09/72] smc: Move the SMC drivers Jeff Kirsher
                   ` (66 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Ron Mercer, Amit Kumar Salecha,
	Anirban Chakraborty

Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
the necessary Kconfig and Makefile changes.

CC: Ron Mercer <ron.mercer@qlogic.com>
CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
CC: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    8 ++--
 drivers/net/Kconfig                                |   26 ----------
 drivers/net/Makefile                               |    3 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/qlogic/Kconfig                |   49 ++++++++++++++++++++
 drivers/net/ethernet/qlogic/Makefile               |    8 +++
 drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
 .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
 .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    0
 .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |    0
 drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    0
 drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
 drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
 drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |    0
 .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |    0
 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |    0
 drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
 drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
 drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
 .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
 drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    0
 drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
 32 files changed, 63 insertions(+), 33 deletions(-)
 create mode 100644 drivers/net/ethernet/qlogic/Kconfig
 create mode 100644 drivers/net/ethernet/qlogic/Makefile
 rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (100%)
 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index ed7cce6..4929f4a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4441,7 +4441,7 @@ M:	Amit Kumar Salecha <amit.salecha@qlogic.com>
 L:	netdev@vger.kernel.org
 W:	http://www.qlogic.com
 S:	Supported
-F:	drivers/net/netxen/
+F:	drivers/net/ethernet/qlogic/netxen/
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:	Trond Myklebust <Trond.Myklebust@netapp.com>
@@ -5162,7 +5162,7 @@ M:	linux-driver@qlogic.com
 L:	netdev@vger.kernel.org
 S:	Supported
 F:	Documentation/networking/LICENSE.qla3xxx
-F:	drivers/net/qla3xxx.*
+F:	drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 M:	Amit Kumar Salecha <amit.salecha@qlogic.com>
@@ -5170,14 +5170,14 @@ M:	Anirban Chakraborty <anirban.chakraborty@qlogic.com>
 M:	linux-driver@qlogic.com
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/qlcnic/
+F:	drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
 M:	Ron Mercer <ron.mercer@qlogic.com>
 M:	linux-driver@qlogic.com
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/qlge/
+F:	drivers/net/ethernet/qlogic/qlge/
 
 QNX4 FILESYSTEM
 M:	Anders Larsen <al@alarsen.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5bb247f..802be52 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1702,15 +1702,6 @@ config XILINX_LL_TEMAC
 	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
 	  core used in Xilinx Spartan and Virtex FPGAs
 
-config QLA3XXX
-	tristate "QLogic QLA3XXX Network Driver Support"
-	depends on PCI
-	help
-	  This driver supports QLogic ISP3XXX gigabit Ethernet cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called qla3xxx.
-
 config ATL1
 	tristate "Atheros/Attansic L1 Gigabit Ethernet support"
 	depends on PCI
@@ -1949,23 +1940,6 @@ config TEHUTI
 	help
 	  Tehuti Networks 10G Ethernet NIC
 
-config QLCNIC
-	tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
-	depends on PCI
-	select FW_LOADER
-	help
-	  This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
-	  devices.
-
-config QLGE
-	tristate "QLogic QLGE 10Gb Ethernet Driver Support"
-	depends on PCI
-	help
-	  This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called qlge.
-
 config BNA
 	tristate "Brocade 1010/1020 10Gb Ethernet Driver support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b2e5b93..9dcbcc7 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -111,9 +111,6 @@ obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
 ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
 obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
 obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
-obj-$(CONFIG_QLA3XXX) += qla3xxx.o
-obj-$(CONFIG_QLCNIC) += qlcnic/
-obj-$(CONFIG_QLGE) += qlge/
 
 obj-$(CONFIG_PPP) += ppp_generic.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index a2fd385..ab591bb 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -17,5 +17,6 @@ source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
+source "drivers/net/ethernet/qlogic/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 5265271..d8cf120 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
new file mode 100644
index 0000000..07f088a
--- /dev/null
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -0,0 +1,49 @@
+#
+# QLogic network device configuration
+#
+
+config NET_VENDOR_QLOGIC
+	bool "QLogic 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 QLogic cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config QLA3XXX
+	tristate "QLogic QLA3XXX Network Driver Support"
+	depends on NET_VENDOR_QLOGIC && PCI
+	---help---
+	  This driver supports QLogic ISP3XXX gigabit Ethernet cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called qla3xxx.
+
+config QLCNIC
+	tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
+	depends on NET_VENDOR_QLOGIC && PCI
+	select FW_LOADER
+	---help---
+	  This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
+	  devices.
+
+config QLGE
+	tristate "QLogic QLGE 10Gb Ethernet Driver Support"
+	depends on NET_VENDOR_QLOGIC && PCI
+	---help---
+	  This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called qlge.
+
+config NETXEN_NIC
+	tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
+	depends on NET_VENDOR_QLOGIC && PCI
+	select FW_LOADER
+	---help---
+	  This enables the support for NetXen's Gigabit Ethernet card.
diff --git a/drivers/net/ethernet/qlogic/Makefile b/drivers/net/ethernet/qlogic/Makefile
new file mode 100644
index 0000000..b2a283d
--- /dev/null
+++ b/drivers/net/ethernet/qlogic/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the QLogic network device drivers.
+#
+
+obj-$(CONFIG_QLA3XXX) += qla3xxx.o
+obj-$(CONFIG_QLCNIC) += qlcnic/
+obj-$(CONFIG_QLGE) += qlge/
+obj-$(CONFIG_NETXEN_NIC) += netxen/
diff --git a/drivers/net/netxen/Makefile b/drivers/net/ethernet/qlogic/netxen/Makefile
similarity index 100%
rename from drivers/net/netxen/Makefile
rename to drivers/net/ethernet/qlogic/netxen/Makefile
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
similarity index 100%
rename from drivers/net/netxen/netxen_nic.h
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic.h
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
similarity index 100%
rename from drivers/net/netxen/netxen_nic_ctx.c
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
similarity index 100%
rename from drivers/net/netxen/netxen_nic_ethtool.c
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
similarity index 100%
rename from drivers/net/netxen/netxen_nic_hdr.h
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
similarity index 100%
rename from drivers/net/netxen/netxen_nic_hw.c
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
diff --git a/drivers/net/netxen/netxen_nic_hw.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h
similarity index 100%
rename from drivers/net/netxen/netxen_nic_hw.h
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
similarity index 100%
rename from drivers/net/netxen/netxen_nic_init.c
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
similarity index 100%
rename from drivers/net/netxen/netxen_nic_main.c
rename to drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
diff --git a/drivers/net/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
similarity index 100%
rename from drivers/net/qla3xxx.c
rename to drivers/net/ethernet/qlogic/qla3xxx.c
diff --git a/drivers/net/qla3xxx.h b/drivers/net/ethernet/qlogic/qla3xxx.h
similarity index 100%
rename from drivers/net/qla3xxx.h
rename to drivers/net/ethernet/qlogic/qla3xxx.h
diff --git a/drivers/net/qlcnic/Makefile b/drivers/net/ethernet/qlogic/qlcnic/Makefile
similarity index 100%
rename from drivers/net/qlcnic/Makefile
rename to drivers/net/ethernet/qlogic/qlcnic/Makefile
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
similarity index 100%
rename from drivers/net/qlcnic/qlcnic.h
rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_ctx.c
rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_ethtool.c
rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_hdr.h
rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
diff --git a/drivers/net/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_hw.c
rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_init.c
rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
similarity index 100%
rename from drivers/net/qlcnic/qlcnic_main.c
rename to drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
diff --git a/drivers/net/qlge/Makefile b/drivers/net/ethernet/qlogic/qlge/Makefile
similarity index 100%
rename from drivers/net/qlge/Makefile
rename to drivers/net/ethernet/qlogic/qlge/Makefile
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
similarity index 100%
rename from drivers/net/qlge/qlge.h
rename to drivers/net/ethernet/qlogic/qlge/qlge.h
diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
similarity index 100%
rename from drivers/net/qlge/qlge_dbg.c
rename to drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
similarity index 100%
rename from drivers/net/qlge/qlge_ethtool.c
rename to drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
similarity index 100%
rename from drivers/net/qlge/qlge_main.c
rename to drivers/net/ethernet/qlogic/qlge/qlge_main.c
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
similarity index 100%
rename from drivers/net/qlge/qlge_mpi.c
rename to drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 09/72] smc: Move the SMC drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (7 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 08/72] qlogic: Move the QLogic drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 14:30   ` Arnd Bergmann
  2011-06-25 13:58 ` [RFC 10/72] ni5*/ni65: Move the Racal-Interlan (Micom) drivers Jeff Kirsher
                   ` (65 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Nicolas Pitre, Donald Becker, Erik Stahlman

Moves the SMC drivers into drivers/net/ethernet/smc/ and the
necessary Kconfig and Makefile changes.  Also did some cleanup
of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.

CC: Nicolas Pitre <nico@fluxnic.net>
CC: Donald Becker <becker@scyld.com>
CC: Erik Stahlman <erik@vt.edu>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                              |    2 +-
 drivers/net/Kconfig                      |   51 -------------------------
 drivers/net/Makefile                     |    4 --
 drivers/net/ethernet/8390/Kconfig        |   21 ++--------
 drivers/net/ethernet/Kconfig             |    1 +
 drivers/net/ethernet/Makefile            |    1 +
 drivers/net/ethernet/smc/Kconfig         |   61 ++++++++++++++++++++++++++++++
 drivers/net/ethernet/smc/Makefile        |    7 +++
 drivers/net/{ => ethernet/smc}/epic100.c |    0
 drivers/net/{ => ethernet/smc}/smc9194.c |    0
 drivers/net/{ => ethernet/smc}/smc9194.h |    0
 drivers/net/{ => ethernet/smc}/smc91x.c  |    0
 drivers/net/{ => ethernet/smc}/smc91x.h  |    0
 13 files changed, 75 insertions(+), 73 deletions(-)
 create mode 100644 drivers/net/ethernet/smc/Kconfig
 create mode 100644 drivers/net/ethernet/smc/Makefile
 rename drivers/net/{ => ethernet/smc}/epic100.c (100%)
 rename drivers/net/{ => ethernet/smc}/smc9194.c (100%)
 rename drivers/net/{ => ethernet/smc}/smc9194.h (100%)
 rename drivers/net/{ => ethernet/smc}/smc91x.c (100%)
 rename drivers/net/{ => ethernet/smc}/smc91x.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4929f4a..4dcfdc8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5778,7 +5778,7 @@ F:	mm/sl?b.c
 SMC91x ETHERNET DRIVER
 M:	Nicolas Pitre <nico@fluxnic.net>
 S:	Odd Fixes
-F:	drivers/net/smc91x.*
+F:	drivers/net/ethernet/smc/smc91x.*
 
 SMM665 HARDWARE MONITOR DRIVER
 M:	Guenter Roeck <linux@roeck-us.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 802be52..c3399a5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -538,39 +538,6 @@ config BFIN_MAC_USE_HWSTAMP
 	help
 	  To support the IEEE 1588 Precision Time Protocol (PTP), select y here
 
-config SMC9194
-	tristate "SMC 9194 support"
-	depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
-	select CRC32
-	---help---
-	  This is support for the SMC9xxx based Ethernet cards. Choose this
-	  option if you have a DELL laptop with the docking station, or
-	  another SMC9192/9194 based chipset.  Say Y if you want it compiled
-	  into the kernel, and read the file
-	  <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called smc9194.
-
-config SMC91X
-	tristate "SMC 91C9x/91C1xxx support"
-	select CRC32
-	select MII
-	depends on ARM || M32R || SUPERH || \
-		MIPS || BLACKFIN || MN10300 || COLDFIRE
-	help
-	  This is a driver for SMC's 91x series of Ethernet chipsets,
-	  including the SMC91C94 and the SMC91C111. Say Y if you want it
-	  compiled into the kernel, and read the file
-	  <file:Documentation/networking/smc9.txt>  and the Ethernet-HOWTO,
-	  available from  <http://www.tldp.org/docs.html#howto>.
-
-	  This driver is also available as a module ( = code which can be
-	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called smc91x.  If you want to compile it as a
-	  module, say M here and read <file:Documentation/kbuild/modules.txt>.
-
 config PXA168_ETH
 	tristate "Marvell pxa168 ethernet support"
 	depends on CPU_PXA168
@@ -1145,17 +1112,6 @@ config SIS900
 	  To compile this driver as a module, choose M here: the module
 	  will be called sis900.  This is recommended.
 
-config EPIC100
-	tristate "SMC EtherPower II"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
-	  which is based on the SMC83c17x (EPIC/100).
-	  More specific information and updates are available from
-	  <http://www.scyld.com/network/epic100.html>.
-
 config SMSC9420
 	tristate "SMSC LAN9420 PCI ethernet adapter support"
 	depends on NET_PCI && PCI
@@ -1886,13 +1842,6 @@ config MYRI10GE_DCA
 	  driver.  DCA is a method for warming the CPU cache before data
 	  is used, with the intent of lessening the impact of cache misses.
 
-config NETXEN_NIC
-	tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
-	depends on PCI
-	select FW_LOADER
-	help
-	  This enables the support for NetXen's Gigabit Ethernet card.
-
 config NIU
 	tristate "Sun Neptune 10Gbit Ethernet support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9dcbcc7..aa3296f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 
 obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
 obj-$(CONFIG_SIS190) += sis190.o
 obj-$(CONFIG_SIS900) += sis900.o
@@ -95,7 +94,6 @@ obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
-obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_FEC) += fec.o
 obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
 ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
@@ -184,7 +182,6 @@ obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_S2IO) += s2io.o
 obj-$(CONFIG_VXGE) += vxge/
 obj-$(CONFIG_MYRI10GE) += myri10ge/
-obj-$(CONFIG_SMC91X) += smc91x.o
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_SMSC911X) += smsc911x.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
@@ -232,7 +229,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
 
 obj-$(CONFIG_FS_ENET) += fs_enet/
 
-obj-$(CONFIG_NETXEN_NIC) += netxen/
 obj-$(CONFIG_NIU) += niu.o
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index 3c20f26..db03f52 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -242,22 +242,9 @@ config STNIC
 
 	  If unsure, say N.
 
-config NET_VENDOR_SMC
-	bool "Western Digital/SMC cards"
-	depends on NET_VENDOR_8390 && (ISA || MCA || EISA || MAC)
-	---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 Western Digital cards. If you say Y, you will be
-	  asked for your specific card in the following questions.
-
 config ULTRAMCA
 	tristate "SMC Ultra MCA support"
-	depends on NET_VENDOR_SMC && MCA
+	depends on NET_VENDOR_8390 && MCA
 	select CRC32
 	---help---
 	  If you have a network (Ethernet) card of this type and are running
@@ -269,7 +256,7 @@ config ULTRAMCA
 
 config ULTRA
 	tristate "SMC Ultra support"
-	depends on NET_VENDOR_SMC && ISA
+	depends on NET_VENDOR_8390 && ISA
 	select CRC32
 	---help---
 	  If you have a network (Ethernet) card of this type, say Y and read
@@ -288,7 +275,7 @@ config ULTRA
 
 config ULTRA32
 	tristate "SMC Ultra32 EISA support"
-	depends on NET_VENDOR_SMC && EISA
+	depends on NET_VENDOR_8390 && EISA
 	select CRC32
 	---help---
 	  If you have a network (Ethernet) card of this type, say Y and read
@@ -300,7 +287,7 @@ config ULTRA32
 
 config WD80x3
 	tristate "WD80*3 support"
-	depends on NET_VENDOR_SMC && ISA
+	depends on NET_VENDOR_8390 && ISA
 	select CRC32
 	---help---
 	  If you have a network (Ethernet) card of this type, say Y and read
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ab591bb..ca75c40 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -18,5 +18,6 @@ source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
+source "drivers/net/ethernet/smc/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index d8cf120..125b332 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
+obj-$(CONFIG_NET_VENDOR_SMC) += smc/
diff --git a/drivers/net/ethernet/smc/Kconfig b/drivers/net/ethernet/smc/Kconfig
new file mode 100644
index 0000000..492ac29
--- /dev/null
+++ b/drivers/net/ethernet/smc/Kconfig
@@ -0,0 +1,61 @@
+#
+# Western Digital/SMC network device configuration
+#
+
+config NET_VENDOR_SMC
+	bool "SMC/Western Digital devices"
+	depends on ISA || MAC || ARM || MIPS || M32R || SUPERH || \
+		BLACKFIN || MN10300 || COLDFIRE || 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 Western Digital cards. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config SMC9194
+	tristate "SMC 9194 support"
+	depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
+	select CRC32
+	---help---
+	  This is support for the SMC9xxx based Ethernet cards. Choose this
+	  option if you have a DELL laptop with the docking station, or
+	  another SMC9192/9194 based chipset.  Say Y if you want it compiled
+	  into the kernel, and read the file
+	  <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called smc9194.
+
+config SMC91X
+	tristate "SMC 91C9x/91C1xxx support"
+	select CRC32
+	select MII
+	depends on NET_VENDOR_SMC && (ARM || M32R || SUPERH || \
+		MIPS || BLACKFIN || MN10300 || COLDFIRE)
+	---help---
+	  This is a driver for SMC's 91x series of Ethernet chipsets,
+	  including the SMC91C94 and the SMC91C111. Say Y if you want it
+	  compiled into the kernel, and read the file
+	  <file:Documentation/networking/smc9.txt>  and the Ethernet-HOWTO,
+	  available from  <http://www.tldp.org/docs.html#howto>.
+
+	  This driver is also available as a module ( = code which can be
+	  inserted in and removed from the running kernel whenever you want).
+	  The module will be called smc91x.  If you want to compile it as a
+	  module, say M here and read <file:Documentation/kbuild/modules.txt>.
+
+config EPIC100
+	tristate "SMC EtherPower II"
+	depends on NET_VENDOR_SMC && PCI
+	select CRC32
+	select MII
+	---help---
+	  This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
+	  which is based on the SMC83c17x (EPIC/100).
+	  More specific information and updates are available from
+	  <http://www.scyld.com/network/epic100.html>.
diff --git a/drivers/net/ethernet/smc/Makefile b/drivers/net/ethernet/smc/Makefile
new file mode 100644
index 0000000..b414266
--- /dev/null
+++ b/drivers/net/ethernet/smc/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the SMC network device drivers.
+#
+
+obj-$(CONFIG_SMC9194) += smc9194.o
+obj-$(CONFIG_SMC91X) += smc91x.o
+obj-$(CONFIG_EPIC100) += epic100.o
diff --git a/drivers/net/epic100.c b/drivers/net/ethernet/smc/epic100.c
similarity index 100%
rename from drivers/net/epic100.c
rename to drivers/net/ethernet/smc/epic100.c
diff --git a/drivers/net/smc9194.c b/drivers/net/ethernet/smc/smc9194.c
similarity index 100%
rename from drivers/net/smc9194.c
rename to drivers/net/ethernet/smc/smc9194.c
diff --git a/drivers/net/smc9194.h b/drivers/net/ethernet/smc/smc9194.h
similarity index 100%
rename from drivers/net/smc9194.h
rename to drivers/net/ethernet/smc/smc9194.h
diff --git a/drivers/net/smc91x.c b/drivers/net/ethernet/smc/smc91x.c
similarity index 100%
rename from drivers/net/smc91x.c
rename to drivers/net/ethernet/smc/smc91x.c
diff --git a/drivers/net/smc91x.h b/drivers/net/ethernet/smc/smc91x.h
similarity index 100%
rename from drivers/net/smc91x.h
rename to drivers/net/ethernet/smc/smc91x.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 10/72] ni5*/ni65: Move the Racal-Interlan (Micom) drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (8 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 09/72] smc: Move the SMC drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 11/72] cassini/niu/sun*: Move the Sun drivers Jeff Kirsher
                   ` (64 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Jan-Pascal van Best, Andreas Mohr, M.Hipp

Moves the Racal-Interlan drivers into drivers/net/ethernet/racal/ and
make the necessary Kconfig and Makefile changes.

CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
CC: Andreas Mohr <andi@lisas.de>
CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                               |    2 +-
 drivers/net/Kconfig                       |   47 ---------------------------
 drivers/net/Makefile                      |    3 --
 drivers/net/ethernet/Kconfig              |    1 +
 drivers/net/ethernet/Makefile             |    1 +
 drivers/net/ethernet/racal/Kconfig        |   50 +++++++++++++++++++++++++++++
 drivers/net/ethernet/racal/Makefile       |    7 ++++
 drivers/net/{ => ethernet/racal}/ni5010.c |    0
 drivers/net/{ => ethernet/racal}/ni5010.h |    0
 drivers/net/{ => ethernet/racal}/ni52.c   |    0
 drivers/net/{ => ethernet/racal}/ni52.h   |    0
 drivers/net/{ => ethernet/racal}/ni65.c   |    0
 drivers/net/{ => ethernet/racal}/ni65.h   |    0
 13 files changed, 60 insertions(+), 51 deletions(-)
 create mode 100644 drivers/net/ethernet/racal/Kconfig
 create mode 100644 drivers/net/ethernet/racal/Makefile
 rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
 rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
 rename drivers/net/{ => ethernet/racal}/ni52.c (100%)
 rename drivers/net/{ => ethernet/racal}/ni52.h (100%)
 rename drivers/net/{ => ethernet/racal}/ni65.c (100%)
 rename drivers/net/{ => ethernet/racal}/ni65.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4dcfdc8..f567d4e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4462,7 +4462,7 @@ M:	Jan-Pascal van Best <janpascal@vanbest.org>
 M:	Andreas Mohr <andi@lisas.de>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/ni5010.*
+F:	drivers/net/ethernet/racal/ni5010.*
 
 NILFS2 FILESYSTEM
 M:	KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c3399a5..8c57e20 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -690,53 +690,6 @@ config SMSC911X_ARCH_HOOKS
 	  hooks for more comprehensive interrupt control and also to override
 	  the source of the MAC address.
 
-config NET_VENDOR_RACAL
-	bool "Racal-Interlan (Micom) NI cards"
-	depends on ISA
-	help
-	  If you have a network (Ethernet) card belonging to this class, such
-	  as the NI5010, NI5210 or NI6210, 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 NI cards. If you say Y, you will be asked for
-	  your specific card in the following questions.
-
-config NI5010
-	tristate "NI5010 support (EXPERIMENTAL)"
-	depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>. Note that this is still
-	  experimental code.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ni5010.
-
-config NI52
-	tristate "NI5210 support"
-	depends on NET_VENDOR_RACAL && ISA
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ni52.
-
-config NI65
-	tristate "NI6510 support"
-	depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ni65.
-
 config DNET
 	tristate "Dave ethernet support (DNET)"
 	depends on NET_ETHERNET && HAS_IOMEM
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index aa3296f..111fc02 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -147,9 +147,6 @@ obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_EWRK3) += ewrk3.o
 obj-$(CONFIG_ATP) += atp.o
-obj-$(CONFIG_NI5010) += ni5010.o
-obj-$(CONFIG_NI52) += ni52.o
-obj-$(CONFIG_NI65) += ni65.o
 obj-$(CONFIG_APRICOT) += 82596.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_SNI_82596) += sni_82596.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ca75c40..50c118c 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -18,6 +18,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
+source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 125b332..37d891d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -9,4 +9,5 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
+obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
diff --git a/drivers/net/ethernet/racal/Kconfig b/drivers/net/ethernet/racal/Kconfig
new file mode 100644
index 0000000..7d190d7
--- /dev/null
+++ b/drivers/net/ethernet/racal/Kconfig
@@ -0,0 +1,50 @@
+#
+# Racal-Interlan device configuration
+#
+
+config NET_VENDOR_RACAL
+	bool "Racal-Interlan (Micom) NI devices"
+	depends on ISA
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, such
+	  as the NI5010, NI5210 or NI6210, 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 NI cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config NI5010
+	tristate "NI5010 support (EXPERIMENTAL)"
+	depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>. Note that this is still
+	  experimental code.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ni5010.
+
+config NI52
+	tristate "NI5210 support"
+	depends on NET_VENDOR_RACAL && ISA
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ni52.
+
+config NI65
+	tristate "NI6510 support"
+	depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ni65.
diff --git a/drivers/net/ethernet/racal/Makefile b/drivers/net/ethernet/racal/Makefile
new file mode 100644
index 0000000..7f2915b
--- /dev/null
+++ b/drivers/net/ethernet/racal/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Racal-Interlan network device drivers.
+#
+
+obj-$(CONFIG_NI5010) += ni5010.o
+obj-$(CONFIG_NI52) += ni52.o
+obj-$(CONFIG_NI65) += ni65.o
diff --git a/drivers/net/ni5010.c b/drivers/net/ethernet/racal/ni5010.c
similarity index 100%
rename from drivers/net/ni5010.c
rename to drivers/net/ethernet/racal/ni5010.c
diff --git a/drivers/net/ni5010.h b/drivers/net/ethernet/racal/ni5010.h
similarity index 100%
rename from drivers/net/ni5010.h
rename to drivers/net/ethernet/racal/ni5010.h
diff --git a/drivers/net/ni52.c b/drivers/net/ethernet/racal/ni52.c
similarity index 100%
rename from drivers/net/ni52.c
rename to drivers/net/ethernet/racal/ni52.c
diff --git a/drivers/net/ni52.h b/drivers/net/ethernet/racal/ni52.h
similarity index 100%
rename from drivers/net/ni52.h
rename to drivers/net/ethernet/racal/ni52.h
diff --git a/drivers/net/ni65.c b/drivers/net/ethernet/racal/ni65.c
similarity index 100%
rename from drivers/net/ni65.c
rename to drivers/net/ethernet/racal/ni65.c
diff --git a/drivers/net/ni65.h b/drivers/net/ethernet/racal/ni65.h
similarity index 100%
rename from drivers/net/ni65.h
rename to drivers/net/ethernet/racal/ni65.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 11/72] cassini/niu/sun*: Move the Sun drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (9 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 10/72] ni5*/ni65: Move the Racal-Interlan (Micom) drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 14:46   ` Oliver Hartkopp
  2011-06-25 13:58 ` [RFC 12/72] sfc: Move the Solarflare drivers Jeff Kirsher
                   ` (63 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Sam Creasey, Adrian Sun, Benjamin Herrenscmidt

Moves the Sun drivers into drivers/net/ethernet/sun/ and make
the necessary Kconfig and Makefile changes.

CC: Sam Creasey <sammy@sammy.net>
CC: Adrian Sun <asun@darksunrising.com>
CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                 |    1 +
 drivers/net/Kconfig                         |   75 ----------------------
 drivers/net/Makefile                        |   11 +---
 drivers/net/ethernet/Kconfig                |    1 +
 drivers/net/ethernet/Makefile               |    1 +
 drivers/net/ethernet/sun/Kconfig            |   91 +++++++++++++++++++++++++++
 drivers/net/ethernet/sun/Makefile           |   12 ++++
 drivers/net/{ => ethernet/sun}/cassini.c    |    0
 drivers/net/{ => ethernet/sun}/cassini.h    |    0
 drivers/net/{ => ethernet/sun}/niu.c        |    0
 drivers/net/{ => ethernet/sun}/niu.h        |    0
 drivers/net/{ => ethernet/sun}/sun3_82586.c |    0
 drivers/net/{ => ethernet/sun}/sun3_82586.h |    0
 drivers/net/{ => ethernet/sun}/sunbmac.c    |    0
 drivers/net/{ => ethernet/sun}/sunbmac.h    |    0
 drivers/net/{ => ethernet/sun}/sungem.c     |    0
 drivers/net/{ => ethernet/sun}/sungem.h     |    0
 drivers/net/{ => ethernet/sun}/sungem_phy.c |    0
 drivers/net/{ => ethernet/sun}/sungem_phy.h |    0
 drivers/net/{ => ethernet/sun}/sunhme.c     |    0
 drivers/net/{ => ethernet/sun}/sunhme.h     |    0
 drivers/net/{ => ethernet/sun}/sunqe.c      |    0
 drivers/net/{ => ethernet/sun}/sunqe.h      |    0
 drivers/net/{ => ethernet/sun}/sunvnet.c    |    0
 drivers/net/{ => ethernet/sun}/sunvnet.h    |    0
 drivers/net/spider_net.h                    |    2 +-
 26 files changed, 108 insertions(+), 86 deletions(-)
 create mode 100644 drivers/net/ethernet/sun/Kconfig
 create mode 100644 drivers/net/ethernet/sun/Makefile
 rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
 rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
 rename drivers/net/{ => ethernet/sun}/niu.c (100%)
 rename drivers/net/{ => ethernet/sun}/niu.h (100%)
 rename drivers/net/{ => ethernet/sun}/sun3_82586.c (100%)
 rename drivers/net/{ => ethernet/sun}/sun3_82586.h (100%)
 rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
 rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
 rename drivers/net/{ => ethernet/sun}/sungem.c (100%)
 rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
 rename drivers/net/{ => ethernet/sun}/sungem_phy.c (100%)
 rename drivers/net/{ => ethernet/sun}/sungem_phy.h (100%)
 rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
 rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
 rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
 rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
 rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
 rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index f567d4e..cc9c060 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6042,6 +6042,7 @@ S:	Maintained
 F:	arch/m68k/kernel/*sun3*
 F:	arch/m68k/sun3*/
 F:	arch/m68k/include/asm/sun3*
+F:	drivers/net/ethernet/sun/sun3*
 
 SUPERH
 M:	Paul Mundt <lethal@linux-sh.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8c57e20..7ac2b56 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -345,15 +345,6 @@ config BVME6000_NET
 	  in your kernel.
 	  To compile this driver as a module, choose M here.
 
-config SUN3_82586
-	bool "Sun3 on-board Intel 82586 support"
-	depends on SUN3
-	help
-	  This driver enables support for the on-board Intel 82586 based
-	  Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards.  Note
-	  that this driver does not support 82586-based adapters on additional
-	  VME boards.
-
 config LASI_82596
 	tristate "Lasi ethernet"
 	depends on GSC
@@ -434,64 +425,6 @@ config SH_ETH
 	  This driver supporting CPUs are:
 		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
 
-config HAPPYMEAL
-	tristate "Sun Happy Meal 10/100baseT support"
-	depends on SBUS || PCI
-	select CRC32
-	help
-	  This driver supports the "hme" interface present on most Ultra
-	  systems and as an option on older Sbus systems. This driver supports
-	  both PCI and Sbus devices. This driver also supports the "qfe" quad
-	  100baseT device available in both PCI and Sbus configurations.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sunhme.
-
-config SUNBMAC
-	tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
-	depends on SBUS && EXPERIMENTAL
-	select CRC32
-	help
-	  This driver supports the "be" interface available as an Sbus option.
-	  This is Sun's older 100baseT Ethernet device.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sunbmac.
-
-config SUNQE
-	tristate "Sun QuadEthernet support"
-	depends on SBUS
-	select CRC32
-	help
-	  This driver supports the "qe" 10baseT Ethernet device, available as
-	  an Sbus option. Note that this is not the same as Quad FastEthernet
-	  "qfe" which is supported by the Happy Meal driver instead.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sunqe.
-
-config SUNGEM
-	tristate "Sun GEM support"
-	depends on PCI
-	select CRC32
-	help
-	  Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also
-	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
-
-config CASSINI
-	tristate "Sun Cassini support"
-	depends on PCI
-	select CRC32
-	help
-	  Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
-	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
-
-config SUNVNET
-	tristate "Sun Virtual Network support"
-	depends on SUN_LDOMS
-	help
-	  Support for virtual network devices under Sun Logical Domains.
-
 config BFIN_MAC
 	tristate "Blackfin on-chip MAC support"
 	depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
@@ -1795,14 +1728,6 @@ config MYRI10GE_DCA
 	  driver.  DCA is a method for warming the CPU cache before data
 	  is used, with the intent of lessening the impact of cache misses.
 
-config NIU
-	tristate "Sun Neptune 10Gbit Ethernet support"
-	depends on PCI
-	select CRC32
-	help
-	  This enables support for cards based upon Sun's
-	  Neptune chipset.
-
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
 	depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 111fc02..60880d2 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -44,13 +44,6 @@ obj-$(CONFIG_PLIP) += plip.o
 
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
-obj-$(CONFIG_HAPPYMEAL) += sunhme.o
-obj-$(CONFIG_SUNQE) += sunqe.o
-obj-$(CONFIG_SUNBMAC) += sunbmac.o
-obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
-obj-$(CONFIG_CASSINI) += cassini.o
-obj-$(CONFIG_SUNVNET) += sunvnet.o
-
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 
@@ -65,7 +58,7 @@ obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 spidernet-y += spider_net.o spider_net_ethtool.o
-obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
 gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
 ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
@@ -132,7 +125,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DE600) += de600.o
 obj-$(CONFIG_DE620) += de620.o
-obj-$(CONFIG_SUN3_82586) += sun3_82586.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
@@ -226,7 +218,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
 
 obj-$(CONFIG_FS_ENET) += fs_enet/
 
-obj-$(CONFIG_NIU) += niu.o
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 obj-$(CONFIG_SFC) += sfc/
 
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 50c118c..82d7438 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -20,5 +20,6 @@ source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
+source "drivers/net/ethernet/sun/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 37d891d..a3ce80c 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
+obj-$(CONFIG_NET_VENDOR_SUN) += sun/
diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
new file mode 100644
index 0000000..fe80457
--- /dev/null
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -0,0 +1,91 @@
+#
+# Sun network device configuration
+#
+
+config NET_VENDOR_SUN
+	bool "Sun devices"
+	depends on SUN3 || SBUS || PCI || SUN_LDOMS
+	---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 Sun network interfaces. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config SUN3_82586
+	bool "Sun3 on-board Intel 82586 support"
+	depends on NET_VENDOR_SUN && SUN3
+	---help---
+	  This driver enables support for the on-board Intel 82586 based
+	  Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards.  Note
+	  that this driver does not support 82586-based adapters on additional
+	  VME boards.
+
+config HAPPYMEAL
+	tristate "Sun Happy Meal 10/100baseT support"
+	depends on NET_VENDOR_SUN && (SBUS || PCI)
+	select CRC32
+	---help---
+	  This driver supports the "hme" interface present on most Ultra
+	  systems and as an option on older Sbus systems. This driver supports
+	  both PCI and Sbus devices. This driver also supports the "qfe" quad
+	  100baseT device available in both PCI and Sbus configurations.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunhme.
+
+config SUNBMAC
+	tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
+	depends on NET_VENDOR_SUN && SBUS && EXPERIMENTAL
+	select CRC32
+	---help---
+	  This driver supports the "be" interface available as an Sbus option.
+	  This is Sun's older 100baseT Ethernet device.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunbmac.
+
+config SUNQE
+	tristate "Sun QuadEthernet support"
+	depends on NET_VENDOR_SUN && SBUS
+	select CRC32
+	---help---
+	  This driver supports the "qe" 10baseT Ethernet device, available as
+	  an Sbus option. Note that this is not the same as Quad FastEthernet
+	  "qfe" which is supported by the Happy Meal driver instead.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunqe.
+
+config SUNGEM
+	tristate "Sun GEM support"
+	depends on NET_VENDOR_SUN && PCI
+	select CRC32
+	---help---
+	  Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also
+	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
+
+config CASSINI
+	tristate "Sun Cassini support"
+	depends on NET_VENDOR_SUN && PCI
+	select CRC32
+	---help---
+	  Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
+	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
+
+config SUNVNET
+	tristate "Sun Virtual Network support"
+	depends on NET_VENDOR_SUN && SUN_LDOMS
+	---help---
+	  Support for virtual network devices under Sun Logical Domains.
+
+config NIU
+	tristate "Sun Neptune 10Gbit Ethernet support"
+	depends on NET_VENDOR_SUN && PCI
+	select CRC32
+	---help---
+	  This enables support for cards based upon Sun's
+	  Neptune chipset.
diff --git a/drivers/net/ethernet/sun/Makefile b/drivers/net/ethernet/sun/Makefile
new file mode 100644
index 0000000..da1cbb8
--- /dev/null
+++ b/drivers/net/ethernet/sun/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the Sun network device drivers.
+#
+
+obj-$(CONFIG_SUN3_82586) += sun3_82586.o
+obj-$(CONFIG_HAPPYMEAL) += sunhme.o
+obj-$(CONFIG_SUNQE) += sunqe.o
+obj-$(CONFIG_SUNBMAC) += sunbmac.o
+obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
+obj-$(CONFIG_CASSINI) += cassini.o
+obj-$(CONFIG_SUNVNET) += sunvnet.o
+obj-$(CONFIG_NIU) += niu.o
diff --git a/drivers/net/cassini.c b/drivers/net/ethernet/sun/cassini.c
similarity index 100%
rename from drivers/net/cassini.c
rename to drivers/net/ethernet/sun/cassini.c
diff --git a/drivers/net/cassini.h b/drivers/net/ethernet/sun/cassini.h
similarity index 100%
rename from drivers/net/cassini.h
rename to drivers/net/ethernet/sun/cassini.h
diff --git a/drivers/net/niu.c b/drivers/net/ethernet/sun/niu.c
similarity index 100%
rename from drivers/net/niu.c
rename to drivers/net/ethernet/sun/niu.c
diff --git a/drivers/net/niu.h b/drivers/net/ethernet/sun/niu.h
similarity index 100%
rename from drivers/net/niu.h
rename to drivers/net/ethernet/sun/niu.h
diff --git a/drivers/net/sun3_82586.c b/drivers/net/ethernet/sun/sun3_82586.c
similarity index 100%
rename from drivers/net/sun3_82586.c
rename to drivers/net/ethernet/sun/sun3_82586.c
diff --git a/drivers/net/sun3_82586.h b/drivers/net/ethernet/sun/sun3_82586.h
similarity index 100%
rename from drivers/net/sun3_82586.h
rename to drivers/net/ethernet/sun/sun3_82586.h
diff --git a/drivers/net/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
similarity index 100%
rename from drivers/net/sunbmac.c
rename to drivers/net/ethernet/sun/sunbmac.c
diff --git a/drivers/net/sunbmac.h b/drivers/net/ethernet/sun/sunbmac.h
similarity index 100%
rename from drivers/net/sunbmac.h
rename to drivers/net/ethernet/sun/sunbmac.h
diff --git a/drivers/net/sungem.c b/drivers/net/ethernet/sun/sungem.c
similarity index 100%
rename from drivers/net/sungem.c
rename to drivers/net/ethernet/sun/sungem.c
diff --git a/drivers/net/sungem.h b/drivers/net/ethernet/sun/sungem.h
similarity index 100%
rename from drivers/net/sungem.h
rename to drivers/net/ethernet/sun/sungem.h
diff --git a/drivers/net/sungem_phy.c b/drivers/net/ethernet/sun/sungem_phy.c
similarity index 100%
rename from drivers/net/sungem_phy.c
rename to drivers/net/ethernet/sun/sungem_phy.c
diff --git a/drivers/net/sungem_phy.h b/drivers/net/ethernet/sun/sungem_phy.h
similarity index 100%
rename from drivers/net/sungem_phy.h
rename to drivers/net/ethernet/sun/sungem_phy.h
diff --git a/drivers/net/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
similarity index 100%
rename from drivers/net/sunhme.c
rename to drivers/net/ethernet/sun/sunhme.c
diff --git a/drivers/net/sunhme.h b/drivers/net/ethernet/sun/sunhme.h
similarity index 100%
rename from drivers/net/sunhme.h
rename to drivers/net/ethernet/sun/sunhme.h
diff --git a/drivers/net/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
similarity index 100%
rename from drivers/net/sunqe.c
rename to drivers/net/ethernet/sun/sunqe.c
diff --git a/drivers/net/sunqe.h b/drivers/net/ethernet/sun/sunqe.h
similarity index 100%
rename from drivers/net/sunqe.h
rename to drivers/net/ethernet/sun/sunqe.h
diff --git a/drivers/net/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
similarity index 100%
rename from drivers/net/sunvnet.c
rename to drivers/net/ethernet/sun/sunvnet.c
diff --git a/drivers/net/sunvnet.h b/drivers/net/ethernet/sun/sunvnet.h
similarity index 100%
rename from drivers/net/sunvnet.h
rename to drivers/net/ethernet/sun/sunvnet.h
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index 020f64a..a891ad0 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -27,7 +27,7 @@
 
 #define VERSION "2.0 B"
 
-#include "sungem_phy.h"
+#include "./ethernet/sun/sungem_phy.h"
 
 extern int spider_net_stop(struct net_device *netdev);
 extern int spider_net_open(struct net_device *netdev);
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 12/72] sfc: Move the Solarflare drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (10 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 11/72] cassini/niu/sun*: Move the Sun drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 13/72] be2net: Move the Emulex driver Jeff Kirsher
                   ` (62 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Steve Hodgson, Ben Hutchings

Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and
make the necessary Kconfig and Makefile changes.

CC: Steve Hodgson <shodgson@solarflare.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                    |    2 +-
 drivers/net/Kconfig                            |    2 --
 drivers/net/Makefile                           |    1 -
 drivers/net/ethernet/Kconfig                   |    1 +
 drivers/net/ethernet/Makefile                  |    1 +
 drivers/net/{ => ethernet}/sfc/Kconfig         |    0
 drivers/net/{ => ethernet}/sfc/Makefile        |    0
 drivers/net/{ => ethernet}/sfc/bitfield.h      |    0
 drivers/net/{ => ethernet}/sfc/efx.c           |    0
 drivers/net/{ => ethernet}/sfc/efx.h           |    0
 drivers/net/{ => ethernet}/sfc/enum.h          |    0
 drivers/net/{ => ethernet}/sfc/ethtool.c       |    0
 drivers/net/{ => ethernet}/sfc/falcon.c        |    0
 drivers/net/{ => ethernet}/sfc/falcon_boards.c |    0
 drivers/net/{ => ethernet}/sfc/falcon_xmac.c   |    0
 drivers/net/{ => ethernet}/sfc/filter.c        |    0
 drivers/net/{ => ethernet}/sfc/filter.h        |    0
 drivers/net/{ => ethernet}/sfc/io.h            |    0
 drivers/net/{ => ethernet}/sfc/mac.h           |    0
 drivers/net/{ => ethernet}/sfc/mcdi.c          |    0
 drivers/net/{ => ethernet}/sfc/mcdi.h          |    0
 drivers/net/{ => ethernet}/sfc/mcdi_mac.c      |    0
 drivers/net/{ => ethernet}/sfc/mcdi_pcol.h     |    0
 drivers/net/{ => ethernet}/sfc/mcdi_phy.c      |    0
 drivers/net/{ => ethernet}/sfc/mdio_10g.c      |    0
 drivers/net/{ => ethernet}/sfc/mdio_10g.h      |    0
 drivers/net/{ => ethernet}/sfc/mtd.c           |    0
 drivers/net/{ => ethernet}/sfc/net_driver.h    |    0
 drivers/net/{ => ethernet}/sfc/nic.c           |    0
 drivers/net/{ => ethernet}/sfc/nic.h           |    0
 drivers/net/{ => ethernet}/sfc/phy.h           |    0
 drivers/net/{ => ethernet}/sfc/qt202x_phy.c    |    0
 drivers/net/{ => ethernet}/sfc/regs.h          |    0
 drivers/net/{ => ethernet}/sfc/rx.c            |    0
 drivers/net/{ => ethernet}/sfc/selftest.c      |    0
 drivers/net/{ => ethernet}/sfc/selftest.h      |    0
 drivers/net/{ => ethernet}/sfc/siena.c         |    0
 drivers/net/{ => ethernet}/sfc/spi.h           |    0
 drivers/net/{ => ethernet}/sfc/tenxpress.c     |    0
 drivers/net/{ => ethernet}/sfc/tx.c            |    0
 drivers/net/{ => ethernet}/sfc/txc43128_phy.c  |    0
 drivers/net/{ => ethernet}/sfc/workarounds.h   |    0
 42 files changed, 3 insertions(+), 4 deletions(-)
 rename drivers/net/{ => ethernet}/sfc/Kconfig (100%)
 rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
 rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
 rename drivers/net/{ => ethernet}/sfc/efx.c (100%)
 rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
 rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
 rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
 rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
 rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
 rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
 rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
 rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
 rename drivers/net/{ => ethernet}/sfc/io.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
 rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
 rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
 rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
 rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
 rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
 rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
 rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
 rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
 rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
 rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
 rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
 rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
 rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
 rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
 rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
 rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
 rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
 rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index cc9c060..cc16a52f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5663,7 +5663,7 @@ M:	Steve Hodgson <shodgson@solarflare.com>
 M:	Ben Hutchings <bhutchings@solarflare.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/sfc/
+F:	drivers/net/ethernet/sfc/
 
 SGI GRU DRIVER
 M:	Jack Steiner <steiner@sgi.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7ac2b56..51dbdb5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1781,8 +1781,6 @@ config BNA
 
 	  <http://support.brocade.com>
 
-source "drivers/net/sfc/Kconfig"
-
 source "drivers/net/benet/Kconfig"
 
 endif # NETDEV_10000
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 60880d2..b616154 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -219,7 +219,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
 obj-$(CONFIG_FS_ENET) += fs_enet/
 
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
-obj-$(CONFIG_SFC) += sfc/
 
 obj-$(CONFIG_WIMAX) += wimax/
 obj-$(CONFIG_CAIF) += caif/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 82d7438..37819a1 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
+source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
 source "drivers/net/ethernet/sun/Kconfig"
 
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a3ce80c..917131c 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,5 +10,6 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
+obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
diff --git a/drivers/net/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig
similarity index 100%
rename from drivers/net/sfc/Kconfig
rename to drivers/net/ethernet/sfc/Kconfig
diff --git a/drivers/net/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile
similarity index 100%
rename from drivers/net/sfc/Makefile
rename to drivers/net/ethernet/sfc/Makefile
diff --git a/drivers/net/sfc/bitfield.h b/drivers/net/ethernet/sfc/bitfield.h
similarity index 100%
rename from drivers/net/sfc/bitfield.h
rename to drivers/net/ethernet/sfc/bitfield.h
diff --git a/drivers/net/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
similarity index 100%
rename from drivers/net/sfc/efx.c
rename to drivers/net/ethernet/sfc/efx.c
diff --git a/drivers/net/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
similarity index 100%
rename from drivers/net/sfc/efx.h
rename to drivers/net/ethernet/sfc/efx.h
diff --git a/drivers/net/sfc/enum.h b/drivers/net/ethernet/sfc/enum.h
similarity index 100%
rename from drivers/net/sfc/enum.h
rename to drivers/net/ethernet/sfc/enum.h
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
similarity index 100%
rename from drivers/net/sfc/ethtool.c
rename to drivers/net/ethernet/sfc/ethtool.c
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
similarity index 100%
rename from drivers/net/sfc/falcon.c
rename to drivers/net/ethernet/sfc/falcon.c
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/ethernet/sfc/falcon_boards.c
similarity index 100%
rename from drivers/net/sfc/falcon_boards.c
rename to drivers/net/ethernet/sfc/falcon_boards.c
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/ethernet/sfc/falcon_xmac.c
similarity index 100%
rename from drivers/net/sfc/falcon_xmac.c
rename to drivers/net/ethernet/sfc/falcon_xmac.c
diff --git a/drivers/net/sfc/filter.c b/drivers/net/ethernet/sfc/filter.c
similarity index 100%
rename from drivers/net/sfc/filter.c
rename to drivers/net/ethernet/sfc/filter.c
diff --git a/drivers/net/sfc/filter.h b/drivers/net/ethernet/sfc/filter.h
similarity index 100%
rename from drivers/net/sfc/filter.h
rename to drivers/net/ethernet/sfc/filter.h
diff --git a/drivers/net/sfc/io.h b/drivers/net/ethernet/sfc/io.h
similarity index 100%
rename from drivers/net/sfc/io.h
rename to drivers/net/ethernet/sfc/io.h
diff --git a/drivers/net/sfc/mac.h b/drivers/net/ethernet/sfc/mac.h
similarity index 100%
rename from drivers/net/sfc/mac.h
rename to drivers/net/ethernet/sfc/mac.h
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
similarity index 100%
rename from drivers/net/sfc/mcdi.c
rename to drivers/net/ethernet/sfc/mcdi.c
diff --git a/drivers/net/sfc/mcdi.h b/drivers/net/ethernet/sfc/mcdi.h
similarity index 100%
rename from drivers/net/sfc/mcdi.h
rename to drivers/net/ethernet/sfc/mcdi.h
diff --git a/drivers/net/sfc/mcdi_mac.c b/drivers/net/ethernet/sfc/mcdi_mac.c
similarity index 100%
rename from drivers/net/sfc/mcdi_mac.c
rename to drivers/net/ethernet/sfc/mcdi_mac.c
diff --git a/drivers/net/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h
similarity index 100%
rename from drivers/net/sfc/mcdi_pcol.h
rename to drivers/net/ethernet/sfc/mcdi_pcol.h
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/ethernet/sfc/mcdi_phy.c
similarity index 100%
rename from drivers/net/sfc/mcdi_phy.c
rename to drivers/net/ethernet/sfc/mcdi_phy.c
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/ethernet/sfc/mdio_10g.c
similarity index 100%
rename from drivers/net/sfc/mdio_10g.c
rename to drivers/net/ethernet/sfc/mdio_10g.c
diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/ethernet/sfc/mdio_10g.h
similarity index 100%
rename from drivers/net/sfc/mdio_10g.h
rename to drivers/net/ethernet/sfc/mdio_10g.h
diff --git a/drivers/net/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c
similarity index 100%
rename from drivers/net/sfc/mtd.c
rename to drivers/net/ethernet/sfc/mtd.c
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
similarity index 100%
rename from drivers/net/sfc/net_driver.h
rename to drivers/net/ethernet/sfc/net_driver.h
diff --git a/drivers/net/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
similarity index 100%
rename from drivers/net/sfc/nic.c
rename to drivers/net/ethernet/sfc/nic.c
diff --git a/drivers/net/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
similarity index 100%
rename from drivers/net/sfc/nic.h
rename to drivers/net/ethernet/sfc/nic.h
diff --git a/drivers/net/sfc/phy.h b/drivers/net/ethernet/sfc/phy.h
similarity index 100%
rename from drivers/net/sfc/phy.h
rename to drivers/net/ethernet/sfc/phy.h
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/ethernet/sfc/qt202x_phy.c
similarity index 100%
rename from drivers/net/sfc/qt202x_phy.c
rename to drivers/net/ethernet/sfc/qt202x_phy.c
diff --git a/drivers/net/sfc/regs.h b/drivers/net/ethernet/sfc/regs.h
similarity index 100%
rename from drivers/net/sfc/regs.h
rename to drivers/net/ethernet/sfc/regs.h
diff --git a/drivers/net/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
similarity index 100%
rename from drivers/net/sfc/rx.c
rename to drivers/net/ethernet/sfc/rx.c
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
similarity index 100%
rename from drivers/net/sfc/selftest.c
rename to drivers/net/ethernet/sfc/selftest.c
diff --git a/drivers/net/sfc/selftest.h b/drivers/net/ethernet/sfc/selftest.h
similarity index 100%
rename from drivers/net/sfc/selftest.h
rename to drivers/net/ethernet/sfc/selftest.h
diff --git a/drivers/net/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
similarity index 100%
rename from drivers/net/sfc/siena.c
rename to drivers/net/ethernet/sfc/siena.c
diff --git a/drivers/net/sfc/spi.h b/drivers/net/ethernet/sfc/spi.h
similarity index 100%
rename from drivers/net/sfc/spi.h
rename to drivers/net/ethernet/sfc/spi.h
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/ethernet/sfc/tenxpress.c
similarity index 100%
rename from drivers/net/sfc/tenxpress.c
rename to drivers/net/ethernet/sfc/tenxpress.c
diff --git a/drivers/net/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
similarity index 100%
rename from drivers/net/sfc/tx.c
rename to drivers/net/ethernet/sfc/tx.c
diff --git a/drivers/net/sfc/txc43128_phy.c b/drivers/net/ethernet/sfc/txc43128_phy.c
similarity index 100%
rename from drivers/net/sfc/txc43128_phy.c
rename to drivers/net/ethernet/sfc/txc43128_phy.c
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/ethernet/sfc/workarounds.h
similarity index 100%
rename from drivers/net/sfc/workarounds.h
rename to drivers/net/ethernet/sfc/workarounds.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 13/72] be2net: Move the Emulex driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (11 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 12/72] sfc: Move the Solarflare drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 14/72] bna: Move the Brocade driver Jeff Kirsher
                   ` (61 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Sathya Perla, Subbu Seetharaman, Ajit Khaparde

Moves the Emulex driver into drivers/net/ethernet/emulex/ and
make the necessary Kconfig and Makefile changes.

CC: Sathya Perla <sathya.perla@emulex.com>
CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
CC: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |    2 --
 drivers/net/Makefile                               |    1 -
 drivers/net/benet/Kconfig                          |    6 ------
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/emulex/Kconfig                |   18 ++++++++++++++++++
 drivers/net/ethernet/emulex/Makefile               |    5 +++++
 drivers/net/ethernet/emulex/benet/Kconfig          |    6 ++++++
 drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
 drivers/net/{ => ethernet/emulex}/benet/be.h       |    0
 drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |    0
 drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |    0
 .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |    0
 drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |    0
 drivers/net/{ => ethernet/emulex}/benet/be_main.c  |    0
 16 files changed, 32 insertions(+), 10 deletions(-)
 delete mode 100644 drivers/net/benet/Kconfig
 create mode 100644 drivers/net/ethernet/emulex/Kconfig
 create mode 100644 drivers/net/ethernet/emulex/Makefile
 create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
 rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be.h (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (100%)
 rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index cc16a52f..5bf6ae2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5655,7 +5655,7 @@ M:	Ajit Khaparde <ajit.khaparde@emulex.com>
 L:	netdev@vger.kernel.org
 W:	http://www.emulex.com
 S:	Supported
-F:	drivers/net/benet/
+F:	drivers/net/ethernet/emulex/benet/
 
 SFC NETWORK DRIVER
 M:	Solarflare linux maintainers <linux-net-drivers@solarflare.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 51dbdb5..5218303 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1781,8 +1781,6 @@ config BNA
 
 	  <http://support.brocade.com>
 
-source "drivers/net/benet/Kconfig"
-
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b616154..5e1ccb5 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
 obj-$(CONFIG_TEHUTI) += tehuti.o
 obj-$(CONFIG_ENIC) += enic/
 obj-$(CONFIG_JME) += jme.o
-obj-$(CONFIG_BE2NET) += benet/
 obj-$(CONFIG_VMXNET3) += vmxnet3/
 obj-$(CONFIG_BNA) += bna/
 
diff --git a/drivers/net/benet/Kconfig b/drivers/net/benet/Kconfig
deleted file mode 100644
index 1a41a49..0000000
--- a/drivers/net/benet/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-config BE2NET
-	tristate "ServerEngines' 10Gbps NIC - BladeEngine"
-	depends on PCI && INET
-	help
-	This driver implements the NIC functionality for ServerEngines'
-	10Gbps network adapter - BladeEngine.
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 37819a1..97a4b57 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -16,6 +16,7 @@ source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 917131c..bf9b2e9 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
diff --git a/drivers/net/ethernet/emulex/Kconfig b/drivers/net/ethernet/emulex/Kconfig
new file mode 100644
index 0000000..f8a68ce
--- /dev/null
+++ b/drivers/net/ethernet/emulex/Kconfig
@@ -0,0 +1,18 @@
+#
+# Emulex driver configuration
+#
+
+config NET_VENDOR_EMULEX
+	bool "Emulex devices"
+	depends on PCI || INET
+	---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 Emulex cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+source "drivers/net/ethernet/emulex/benet/Kconfig"
diff --git a/drivers/net/ethernet/emulex/Makefile b/drivers/net/ethernet/emulex/Makefile
new file mode 100644
index 0000000..ea8ec57
--- /dev/null
+++ b/drivers/net/ethernet/emulex/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Emulex device drivers.
+#
+
+obj-$(CONFIG_BE2NET) += benet/
diff --git a/drivers/net/ethernet/emulex/benet/Kconfig b/drivers/net/ethernet/emulex/benet/Kconfig
new file mode 100644
index 0000000..ca2c28e
--- /dev/null
+++ b/drivers/net/ethernet/emulex/benet/Kconfig
@@ -0,0 +1,6 @@
+config BE2NET
+	tristate "ServerEngines' 10Gbps NIC - BladeEngine"
+	depends on NET_VENDOR_EMULEX && PCI && INET
+	---help---
+	  This driver implements the NIC functionality for ServerEngines'
+	  10Gbps network adapter - BladeEngine.
diff --git a/drivers/net/benet/Makefile b/drivers/net/ethernet/emulex/benet/Makefile
similarity index 100%
rename from drivers/net/benet/Makefile
rename to drivers/net/ethernet/emulex/benet/Makefile
diff --git a/drivers/net/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
similarity index 100%
rename from drivers/net/benet/be.h
rename to drivers/net/ethernet/emulex/benet/be.h
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
similarity index 100%
rename from drivers/net/benet/be_cmds.c
rename to drivers/net/ethernet/emulex/benet/be_cmds.c
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
similarity index 100%
rename from drivers/net/benet/be_cmds.h
rename to drivers/net/ethernet/emulex/benet/be_cmds.h
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
similarity index 100%
rename from drivers/net/benet/be_ethtool.c
rename to drivers/net/ethernet/emulex/benet/be_ethtool.c
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
similarity index 100%
rename from drivers/net/benet/be_hw.h
rename to drivers/net/ethernet/emulex/benet/be_hw.h
diff --git a/drivers/net/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
similarity index 100%
rename from drivers/net/benet/be_main.c
rename to drivers/net/ethernet/emulex/benet/be_main.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 14/72] bna: Move the Brocade driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (12 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 13/72] be2net: Move the Emulex driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 15/72] mlx4: Move the Mellanox driver Jeff Kirsher
                   ` (60 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Rasesh Mody, Debashis Dutt

Moves the Brocade driver into drivers/net/ethernet/brocade/ and make
the necessary Kconfig and Makefile changes.

CC: Rasesh Mody <rmody@brocade.com>
CC: Debashis Dutt <ddutt@brocade.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |   14 --------------
 drivers/net/Makefile                               |    1 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/brocade/Kconfig               |   18 ++++++++++++++++++
 drivers/net/ethernet/brocade/Makefile              |    5 +++++
 drivers/net/ethernet/brocade/bna/Kconfig           |   17 +++++++++++++++++
 drivers/net/{ => ethernet/brocade}/bna/Makefile    |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |    0
 .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
 .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |    0
 .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |    0
 .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_sm.h    |    0
 drivers/net/{ => ethernet/brocade}/bna/bfa_wc.h    |    0
 drivers/net/{ => ethernet/brocade}/bna/bfi.h       |    0
 drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
 drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h |    0
 drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h    |    0
 drivers/net/{ => ethernet/brocade}/bna/bna.h       |    0
 drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c  |    0
 drivers/net/{ => ethernet/brocade}/bna/bna_hw.h    |    0
 drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c  |    0
 drivers/net/{ => ethernet/brocade}/bna/bna_types.h |    0
 drivers/net/{ => ethernet/brocade}/bna/bnad.c      |    0
 drivers/net/{ => ethernet/brocade}/bna/bnad.h      |    0
 .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |    0
 drivers/net/{ => ethernet/brocade}/bna/cna.h       |    0
 drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
 34 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/ethernet/brocade/Kconfig
 create mode 100644 drivers/net/ethernet/brocade/Makefile
 create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
 rename drivers/net/{ => ethernet/brocade}/bna/Makefile (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_sm.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfa_wc.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna_hw.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/cna.h (100%)
 rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5bf6ae2..b73e10b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1550,7 +1550,7 @@ M:	Rasesh Mody <rmody@brocade.com>
 M:	Debashis Dutt <ddutt@brocade.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/bna/
+F:	drivers/net/ethernet/brocade/bna/
 
 BSG (block layer generic sg v4 driver)
 M:	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5218303..c3ab3e7 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1767,20 +1767,6 @@ config TEHUTI
 	help
 	  Tehuti Networks 10G Ethernet NIC
 
-config BNA
-	tristate "Brocade 1010/1020 10Gb Ethernet Driver support"
-	depends on PCI
-	---help---
-	  This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet
-	  cards.
-	  To compile this driver as a module, choose M here: the module
-	  will be called bna.
-
-	  For general information and support, go to the Brocade support
-	  website at:
-
-	  <http://support.brocade.com>
-
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 5e1ccb5..f480771 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_TEHUTI) += tehuti.o
 obj-$(CONFIG_ENIC) += enic/
 obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_VMXNET3) += vmxnet3/
-obj-$(CONFIG_BNA) += bna/
 
 gianfar_driver-objs := gianfar.o \
 		gianfar_ethtool.o \
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 97a4b57..aae207a 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -15,6 +15,7 @@ source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
+source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index bf9b2e9..9494827 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
+obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
diff --git a/drivers/net/ethernet/brocade/Kconfig b/drivers/net/ethernet/brocade/Kconfig
new file mode 100644
index 0000000..8d8bff7
--- /dev/null
+++ b/drivers/net/ethernet/brocade/Kconfig
@@ -0,0 +1,18 @@
+#
+# Brocade device configuration
+#
+
+config NET_VENDOR_BROCADE
+	bool "Brocade 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 Brocade cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+source "drivers/net/ethernet/brocade/bna/Kconfig"
diff --git a/drivers/net/ethernet/brocade/Makefile b/drivers/net/ethernet/brocade/Makefile
new file mode 100644
index 0000000..b58238d
--- /dev/null
+++ b/drivers/net/ethernet/brocade/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Brocade device drivers.
+#
+
+obj-$(CONFIG_BNA) += bna/
diff --git a/drivers/net/ethernet/brocade/bna/Kconfig b/drivers/net/ethernet/brocade/bna/Kconfig
new file mode 100644
index 0000000..ba37af2
--- /dev/null
+++ b/drivers/net/ethernet/brocade/bna/Kconfig
@@ -0,0 +1,17 @@
+#
+# Brocade network device configuration
+#
+
+config BNA
+	tristate "Brocade 1010/1020 10Gb Ethernet Driver support"
+	depends on NET_VENDOR_BROCADE && PCI
+	---help---
+	  This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet
+	  cards.
+	  To compile this driver as a module, choose M here: the module
+	  will be called bna.
+
+	  For general information and support, go to the Brocade support
+	  website at:
+
+	  <http://support.brocade.com>
diff --git a/drivers/net/bna/Makefile b/drivers/net/ethernet/brocade/bna/Makefile
similarity index 100%
rename from drivers/net/bna/Makefile
rename to drivers/net/ethernet/brocade/bna/Makefile
diff --git a/drivers/net/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c
similarity index 100%
rename from drivers/net/bna/bfa_cee.c
rename to drivers/net/ethernet/brocade/bna/bfa_cee.c
diff --git a/drivers/net/bna/bfa_cee.h b/drivers/net/ethernet/brocade/bna/bfa_cee.h
similarity index 100%
rename from drivers/net/bna/bfa_cee.h
rename to drivers/net/ethernet/brocade/bna/bfa_cee.h
diff --git a/drivers/net/bna/bfa_defs.h b/drivers/net/ethernet/brocade/bna/bfa_defs.h
similarity index 100%
rename from drivers/net/bna/bfa_defs.h
rename to drivers/net/ethernet/brocade/bna/bfa_defs.h
diff --git a/drivers/net/bna/bfa_defs_cna.h b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
similarity index 100%
rename from drivers/net/bna/bfa_defs_cna.h
rename to drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
diff --git a/drivers/net/bna/bfa_defs_mfg_comm.h b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
similarity index 100%
rename from drivers/net/bna/bfa_defs_mfg_comm.h
rename to drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
diff --git a/drivers/net/bna/bfa_defs_status.h b/drivers/net/ethernet/brocade/bna/bfa_defs_status.h
similarity index 100%
rename from drivers/net/bna/bfa_defs_status.h
rename to drivers/net/ethernet/brocade/bna/bfa_defs_status.h
diff --git a/drivers/net/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
similarity index 100%
rename from drivers/net/bna/bfa_ioc.c
rename to drivers/net/ethernet/brocade/bna/bfa_ioc.c
diff --git a/drivers/net/bna/bfa_ioc.h b/drivers/net/ethernet/brocade/bna/bfa_ioc.h
similarity index 100%
rename from drivers/net/bna/bfa_ioc.h
rename to drivers/net/ethernet/brocade/bna/bfa_ioc.h
diff --git a/drivers/net/bna/bfa_ioc_ct.c b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
similarity index 100%
rename from drivers/net/bna/bfa_ioc_ct.c
rename to drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
diff --git a/drivers/net/bna/bfa_sm.h b/drivers/net/ethernet/brocade/bna/bfa_sm.h
similarity index 100%
rename from drivers/net/bna/bfa_sm.h
rename to drivers/net/ethernet/brocade/bna/bfa_sm.h
diff --git a/drivers/net/bna/bfa_wc.h b/drivers/net/ethernet/brocade/bna/bfa_wc.h
similarity index 100%
rename from drivers/net/bna/bfa_wc.h
rename to drivers/net/ethernet/brocade/bna/bfa_wc.h
diff --git a/drivers/net/bna/bfi.h b/drivers/net/ethernet/brocade/bna/bfi.h
similarity index 100%
rename from drivers/net/bna/bfi.h
rename to drivers/net/ethernet/brocade/bna/bfi.h
diff --git a/drivers/net/bna/bfi_cna.h b/drivers/net/ethernet/brocade/bna/bfi_cna.h
similarity index 100%
rename from drivers/net/bna/bfi_cna.h
rename to drivers/net/ethernet/brocade/bna/bfi_cna.h
diff --git a/drivers/net/bna/bfi_ctreg.h b/drivers/net/ethernet/brocade/bna/bfi_ctreg.h
similarity index 100%
rename from drivers/net/bna/bfi_ctreg.h
rename to drivers/net/ethernet/brocade/bna/bfi_ctreg.h
diff --git a/drivers/net/bna/bfi_ll.h b/drivers/net/ethernet/brocade/bna/bfi_ll.h
similarity index 100%
rename from drivers/net/bna/bfi_ll.h
rename to drivers/net/ethernet/brocade/bna/bfi_ll.h
diff --git a/drivers/net/bna/bna.h b/drivers/net/ethernet/brocade/bna/bna.h
similarity index 100%
rename from drivers/net/bna/bna.h
rename to drivers/net/ethernet/brocade/bna/bna.h
diff --git a/drivers/net/bna/bna_ctrl.c b/drivers/net/ethernet/brocade/bna/bna_ctrl.c
similarity index 100%
rename from drivers/net/bna/bna_ctrl.c
rename to drivers/net/ethernet/brocade/bna/bna_ctrl.c
diff --git a/drivers/net/bna/bna_hw.h b/drivers/net/ethernet/brocade/bna/bna_hw.h
similarity index 100%
rename from drivers/net/bna/bna_hw.h
rename to drivers/net/ethernet/brocade/bna/bna_hw.h
diff --git a/drivers/net/bna/bna_txrx.c b/drivers/net/ethernet/brocade/bna/bna_txrx.c
similarity index 100%
rename from drivers/net/bna/bna_txrx.c
rename to drivers/net/ethernet/brocade/bna/bna_txrx.c
diff --git a/drivers/net/bna/bna_types.h b/drivers/net/ethernet/brocade/bna/bna_types.h
similarity index 100%
rename from drivers/net/bna/bna_types.h
rename to drivers/net/ethernet/brocade/bna/bna_types.h
diff --git a/drivers/net/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
similarity index 100%
rename from drivers/net/bna/bnad.c
rename to drivers/net/ethernet/brocade/bna/bnad.c
diff --git a/drivers/net/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h
similarity index 100%
rename from drivers/net/bna/bnad.h
rename to drivers/net/ethernet/brocade/bna/bnad.h
diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
similarity index 100%
rename from drivers/net/bna/bnad_ethtool.c
rename to drivers/net/ethernet/brocade/bna/bnad_ethtool.c
diff --git a/drivers/net/bna/cna.h b/drivers/net/ethernet/brocade/bna/cna.h
similarity index 100%
rename from drivers/net/bna/cna.h
rename to drivers/net/ethernet/brocade/bna/cna.h
diff --git a/drivers/net/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
similarity index 100%
rename from drivers/net/bna/cna_fwimg.c
rename to drivers/net/ethernet/brocade/bna/cna_fwimg.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 15/72] mlx4: Move the Mellanox driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (13 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 14/72] bna: Move the Brocade driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 16/72] myri*: Move the Myricom drivers Jeff Kirsher
                   ` (59 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Roland Dreier

Moves the Mellanox driver into drivers/net/ethernet/mellanox/ and
make the necessary Kconfig and Makefile changes.

CC: Roland Dreier <roland@kernel.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                                |   24 -----------------
 drivers/net/Makefile                               |    1 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/mellanox/Kconfig              |   18 +++++++++++++
 drivers/net/ethernet/mellanox/Makefile             |    5 +++
 drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 ++++++++++++++++++++
 drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
 .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
 .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
 .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
 .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
 drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
 40 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 drivers/net/ethernet/mellanox/Kconfig
 create mode 100644 drivers/net/ethernet/mellanox/Makefile
 create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
 rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
 rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c3ab3e7..4e8b6c3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1737,30 +1737,6 @@ config PASEMI_MAC
 	  This driver supports the on-chip 1/10Gbit Ethernet controller on
 	  PA Semi's PWRficient line of chips.
 
-config MLX4_EN
-	tristate "Mellanox Technologies 10Gbit Ethernet support"
-	depends on PCI && INET
-	select MLX4_CORE
-	select INET_LRO
-	help
-	  This driver supports Mellanox Technologies ConnectX Ethernet
-	  devices.
-
-config MLX4_CORE
-	tristate
-	depends on PCI
-	default n
-
-config MLX4_DEBUG
-	bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
-	depends on MLX4_CORE
-	default y
-	---help---
-	  This option causes debugging code to be compiled into the
-	  mlx4_core driver.  The output can be turned on via the
-	  debug_level module parameter (which can also be set after
-	  the driver is loaded through sysfs).
-
 config TEHUTI
 	tristate "Tehuti Networks 10G Ethernet"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f480771..6c2eb60 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -176,7 +176,6 @@ obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
 pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
-obj-$(CONFIG_MLX4_CORE) += mlx4/
 obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index aae207a..67b06b2 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
+source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 9494827..ecbe7fa 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/mellanox/Kconfig b/drivers/net/ethernet/mellanox/Kconfig
new file mode 100644
index 0000000..ba0524a
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/Kconfig
@@ -0,0 +1,18 @@
+#
+# Mellanox driver configuration
+#
+
+config NET_VENDOR_MELLANOX
+	bool "Mellanox devices"
+	depends on PCI || INET
+	---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 Mellanox cards. If you say Y, you will be asked
+	  for your specific card in the following questions.
+
+source "drivers/net/ethernet/mellanox/mlx4/Kconfig"
diff --git a/drivers/net/ethernet/mellanox/Makefile b/drivers/net/ethernet/mellanox/Makefile
new file mode 100644
index 0000000..37afb96
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Mellanox device drivers.
+#
+
+obj-$(CONFIG_MLX4_CORE) += mlx4/
diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig
new file mode 100644
index 0000000..67df67a
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx4/Kconfig
@@ -0,0 +1,27 @@
+#
+# Mellanox driver configuration
+#
+
+config MLX4_EN
+	tristate "Mellanox Technologies 10Gbit Ethernet support"
+	depends on NET_VENDOR_MELLANOX && PCI && INET
+	select MLX4_CORE
+	select INET_LRO
+	---help---
+	  This driver supports Mellanox Technologies ConnectX Ethernet
+	  devices.
+
+config MLX4_CORE
+	tristate
+	depends on PCI
+	default n
+
+config MLX4_DEBUG
+	bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
+	depends on MLX4_CORE
+	default y
+	---help---
+	  This option causes debugging code to be compiled into the
+	  mlx4_core driver.  The output can be turned on via the
+	  debug_level module parameter (which can also be set after
+	  the driver is loaded through sysfs).
diff --git a/drivers/net/mlx4/Makefile b/drivers/net/ethernet/mellanox/mlx4/Makefile
similarity index 100%
rename from drivers/net/mlx4/Makefile
rename to drivers/net/ethernet/mellanox/mlx4/Makefile
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c
similarity index 100%
rename from drivers/net/mlx4/alloc.c
rename to drivers/net/ethernet/mellanox/mlx4/alloc.c
diff --git a/drivers/net/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c
similarity index 100%
rename from drivers/net/mlx4/catas.c
rename to drivers/net/ethernet/mellanox/mlx4/catas.c
diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
similarity index 100%
rename from drivers/net/mlx4/cmd.c
rename to drivers/net/ethernet/mellanox/mlx4/cmd.c
diff --git a/drivers/net/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
similarity index 100%
rename from drivers/net/mlx4/cq.c
rename to drivers/net/ethernet/mellanox/mlx4/cq.c
diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
similarity index 100%
rename from drivers/net/mlx4/en_cq.c
rename to drivers/net/ethernet/mellanox/mlx4/en_cq.c
diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
similarity index 100%
rename from drivers/net/mlx4/en_ethtool.c
rename to drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
similarity index 100%
rename from drivers/net/mlx4/en_main.c
rename to drivers/net/ethernet/mellanox/mlx4/en_main.c
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
similarity index 100%
rename from drivers/net/mlx4/en_netdev.c
rename to drivers/net/ethernet/mellanox/mlx4/en_netdev.c
diff --git a/drivers/net/mlx4/en_port.c b/drivers/net/ethernet/mellanox/mlx4/en_port.c
similarity index 100%
rename from drivers/net/mlx4/en_port.c
rename to drivers/net/ethernet/mellanox/mlx4/en_port.c
diff --git a/drivers/net/mlx4/en_port.h b/drivers/net/ethernet/mellanox/mlx4/en_port.h
similarity index 100%
rename from drivers/net/mlx4/en_port.h
rename to drivers/net/ethernet/mellanox/mlx4/en_port.h
diff --git a/drivers/net/mlx4/en_resources.c b/drivers/net/ethernet/mellanox/mlx4/en_resources.c
similarity index 100%
rename from drivers/net/mlx4/en_resources.c
rename to drivers/net/ethernet/mellanox/mlx4/en_resources.c
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
similarity index 100%
rename from drivers/net/mlx4/en_rx.c
rename to drivers/net/ethernet/mellanox/mlx4/en_rx.c
diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c
similarity index 100%
rename from drivers/net/mlx4/en_selftest.c
rename to drivers/net/ethernet/mellanox/mlx4/en_selftest.c
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
similarity index 100%
rename from drivers/net/mlx4/en_tx.c
rename to drivers/net/ethernet/mellanox/mlx4/en_tx.c
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
similarity index 100%
rename from drivers/net/mlx4/eq.c
rename to drivers/net/ethernet/mellanox/mlx4/eq.c
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
similarity index 100%
rename from drivers/net/mlx4/fw.c
rename to drivers/net/ethernet/mellanox/mlx4/fw.c
diff --git a/drivers/net/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h
similarity index 100%
rename from drivers/net/mlx4/fw.h
rename to drivers/net/ethernet/mellanox/mlx4/fw.h
diff --git a/drivers/net/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c
similarity index 100%
rename from drivers/net/mlx4/icm.c
rename to drivers/net/ethernet/mellanox/mlx4/icm.c
diff --git a/drivers/net/mlx4/icm.h b/drivers/net/ethernet/mellanox/mlx4/icm.h
similarity index 100%
rename from drivers/net/mlx4/icm.h
rename to drivers/net/ethernet/mellanox/mlx4/icm.h
diff --git a/drivers/net/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
similarity index 100%
rename from drivers/net/mlx4/intf.c
rename to drivers/net/ethernet/mellanox/mlx4/intf.c
diff --git a/drivers/net/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
similarity index 100%
rename from drivers/net/mlx4/main.c
rename to drivers/net/ethernet/mellanox/mlx4/main.c
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
similarity index 100%
rename from drivers/net/mlx4/mcg.c
rename to drivers/net/ethernet/mellanox/mlx4/mcg.c
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
similarity index 100%
rename from drivers/net/mlx4/mlx4.h
rename to drivers/net/ethernet/mellanox/mlx4/mlx4.h
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
similarity index 100%
rename from drivers/net/mlx4/mlx4_en.h
rename to drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
similarity index 100%
rename from drivers/net/mlx4/mr.c
rename to drivers/net/ethernet/mellanox/mlx4/mr.c
diff --git a/drivers/net/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
similarity index 100%
rename from drivers/net/mlx4/pd.c
rename to drivers/net/ethernet/mellanox/mlx4/pd.c
diff --git a/drivers/net/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
similarity index 100%
rename from drivers/net/mlx4/port.c
rename to drivers/net/ethernet/mellanox/mlx4/port.c
diff --git a/drivers/net/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c
similarity index 100%
rename from drivers/net/mlx4/profile.c
rename to drivers/net/ethernet/mellanox/mlx4/profile.c
diff --git a/drivers/net/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
similarity index 100%
rename from drivers/net/mlx4/qp.c
rename to drivers/net/ethernet/mellanox/mlx4/qp.c
diff --git a/drivers/net/mlx4/reset.c b/drivers/net/ethernet/mellanox/mlx4/reset.c
similarity index 100%
rename from drivers/net/mlx4/reset.c
rename to drivers/net/ethernet/mellanox/mlx4/reset.c
diff --git a/drivers/net/mlx4/sense.c b/drivers/net/ethernet/mellanox/mlx4/sense.c
similarity index 100%
rename from drivers/net/mlx4/sense.c
rename to drivers/net/ethernet/mellanox/mlx4/sense.c
diff --git a/drivers/net/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
similarity index 100%
rename from drivers/net/mlx4/srq.c
rename to drivers/net/ethernet/mellanox/mlx4/srq.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 16/72] myri*: Move the Myricom drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (14 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 15/72] mlx4: Move the Mellanox driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 17/72] s2io/vxge: Move the Exar drivers Jeff Kirsher
                   ` (58 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Andrew Gallatin, Brice Goglin

Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
the necessary Kconfig and Makefile changes.

CC: Andrew Gallatin <gallatin@myri.com>
CC: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |   26 ------------
 drivers/net/Makefile                               |    1 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/myricom/Kconfig               |   42 ++++++++++++++++++++
 drivers/net/ethernet/myricom/Makefile              |    5 ++
 .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
 .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    0
 .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
 .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
 11 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 drivers/net/ethernet/myricom/Kconfig
 create mode 100644 drivers/net/ethernet/myricom/Makefile
 rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index b73e10b..81dfcff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4276,7 +4276,7 @@ M:	Brice Goglin <brice@myri.com>
 L:	netdev@vger.kernel.org
 W:	http://www.myri.com/scs/download-Myri10GE.html
 S:	Supported
-F:	drivers/net/myri10ge/
+F:	drivers/net/ethernet/myricom/myri10ge/
 
 NATSEMI ETHERNET DRIVER (DP8381x)
 M:	Tim Hockin <thockin@hockin.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4e8b6c3..6b58ee3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1702,32 +1702,6 @@ config VXGE_DEBUG_TRACE_ALL
 	  the vxge driver. By default only few debug trace statements are
 	  enabled.
 
-config MYRI10GE
-	tristate "Myricom Myri-10G Ethernet support"
-	depends on PCI && INET
-	select FW_LOADER
-	select CRC32
-	select INET_LRO
-	---help---
-	  This driver supports Myricom Myri-10G Dual Protocol interface in
-	  Ethernet mode. If the eeprom on your board is not recent enough,
-	  you will need a newer firmware image.
-	  You may get this image or more information, at:
-
-	  <http://www.myri.com/scs/download-Myri10GE.html>
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called myri10ge.
-
-config MYRI10GE_DCA
-	bool "Direct Cache Access (DCA) Support"
-	default y
-	depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
-	---help---
-	  Say Y here if you want to use Direct Cache Access (DCA) in the
-	  driver.  DCA is a method for warming the CPU cache before data
-	  is used, with the intent of lessening the impact of cache misses.
-
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
 	depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6c2eb60..15c3598 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -168,7 +168,6 @@ obj-$(CONFIG_R8169) += r8169.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_S2IO) += s2io.o
 obj-$(CONFIG_VXGE) += vxge/
-obj-$(CONFIG_MYRI10GE) += myri10ge/
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_SMSC911X) += smsc911x.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 67b06b2..6149413 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -20,6 +20,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
+source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index ecbe7fa..093b44f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
+obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/myricom/Kconfig b/drivers/net/ethernet/myricom/Kconfig
new file mode 100644
index 0000000..1227005
--- /dev/null
+++ b/drivers/net/ethernet/myricom/Kconfig
@@ -0,0 +1,42 @@
+#
+# Myricom device configuration
+#
+
+config NET_VENDOR_MYRI
+	bool "Myricom network devices"
+	depends on PCI || INET
+	---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 Myricom cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config MYRI10GE
+	tristate "Myricom Myri-10G Ethernet support"
+	depends on NET_VENDOR_MYRI && PCI && INET
+	select FW_LOADER
+	select CRC32
+	select INET_LRO
+	---help---
+	  This driver supports Myricom Myri-10G Dual Protocol interface in
+	  Ethernet mode. If the eeprom on your board is not recent enough,
+	  you will need a newer firmware image.
+	  You may get this image or more information, at:
+
+	  <http://www.myri.com/scs/download-Myri10GE.html>
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called myri10ge.
+
+config MYRI10GE_DCA
+	bool "Direct Cache Access (DCA) Support"
+	default y
+	depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
+	---help---
+	  Say Y here if you want to use Direct Cache Access (DCA) in the
+	  driver.  DCA is a method for warming the CPU cache before data
+	  is used, with the intent of lessening the impact of cache misses.
diff --git a/drivers/net/ethernet/myricom/Makefile b/drivers/net/ethernet/myricom/Makefile
new file mode 100644
index 0000000..296c0a1
--- /dev/null
+++ b/drivers/net/ethernet/myricom/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Myricom network device drivers.
+#
+
+obj-$(CONFIG_MYRI10GE) += myri10ge/
diff --git a/drivers/net/myri10ge/Makefile b/drivers/net/ethernet/myricom/myri10ge/Makefile
similarity index 100%
rename from drivers/net/myri10ge/Makefile
rename to drivers/net/ethernet/myricom/myri10ge/Makefile
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
similarity index 100%
rename from drivers/net/myri10ge/myri10ge.c
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge.c
diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
similarity index 100%
rename from drivers/net/myri10ge/myri10ge_mcp.h
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
diff --git a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
similarity index 100%
rename from drivers/net/myri10ge/myri10ge_mcp_gen_header.h
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 17/72] s2io/vxge: Move the Exar drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (15 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 16/72] myri*: Move the Myricom drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 18/72] ehea/ibm*: Move the IBM drivers Jeff Kirsher
                   ` (57 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Jon Mason

Move the Exar drivers into drivers/net/ethernet/neterion/ and make the
necessary Kconfig and Makefile changes.

CC: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    3 +-
 drivers/net/Kconfig                                |   34 -------------
 drivers/net/Makefile                               |    2 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/neterion/Kconfig              |   50 ++++++++++++++++++++
 drivers/net/ethernet/neterion/Makefile             |    6 ++
 drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
 drivers/net/{ => ethernet/neterion}/s2io.c         |    0
 drivers/net/{ => ethernet/neterion}/s2io.h         |    0
 drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
 .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
 .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
 .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
 .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
 .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
 .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
 21 files changed, 59 insertions(+), 38 deletions(-)
 create mode 100644 drivers/net/ethernet/neterion/Kconfig
 create mode 100644 drivers/net/ethernet/neterion/Makefile
 rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
 rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
 rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 81dfcff..816c665 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4321,9 +4321,8 @@ W:	http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 W:	http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:	Supported
 F:	Documentation/networking/s2io.txt
-F:	drivers/net/s2io*
 F:	Documentation/networking/vxge.txt
-F:	drivers/net/vxge/
+F:	drivers/net/ethernet/neterion/
 
 NETFILTER/IPTABLES/IPCHAINS
 P:	Rusty Russell
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6b58ee3..6294de0 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1668,40 +1668,6 @@ config ENIC
 	help
 	  This enables the support for the Cisco VIC Ethernet card.
 
-config S2IO
-	tristate "Exar Xframe 10Gb Ethernet Adapter"
-	depends on PCI
-	---help---
-	  This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
-
-	  More specific information on configuring the driver is in 
-	  <file:Documentation/networking/s2io.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called s2io.
-
-config VXGE
-	tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
-	depends on PCI && INET
-	---help---
-	  This driver supports Exar Corp's X3100 Series 10 GbE PCIe
-	  I/O Virtualized Server Adapter.
-
-	  More specific information on configuring the driver is in
-	  <file:Documentation/networking/vxge.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called vxge.
-
-config VXGE_DEBUG_TRACE_ALL
-	bool "Enabling All Debug trace statments in driver"
-	default n
-	depends on VXGE
-	---help---
-	  Say Y here if you want to enabling all the debug trace statements in
-	  the vxge driver. By default only few debug trace statements are
-	  enabled.
-
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
 	depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 15c3598..5241d6e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -166,8 +166,6 @@ obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
-obj-$(CONFIG_S2IO) += s2io.o
-obj-$(CONFIG_VXGE) += vxge/
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_SMSC911X) += smsc911x.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6149413..a23ea19 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -18,6 +18,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
+source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 093b44f..690421d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
+obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
diff --git a/drivers/net/ethernet/neterion/Kconfig b/drivers/net/ethernet/neterion/Kconfig
new file mode 100644
index 0000000..c79fbe9
--- /dev/null
+++ b/drivers/net/ethernet/neterion/Kconfig
@@ -0,0 +1,50 @@
+#
+# Exar device configuration
+#
+
+config NET_VENDOR_EXAR
+	bool "Exar network 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 Exar cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config S2IO
+	tristate "Exar Xframe 10Gb Ethernet Adapter"
+	depends on NET_VENDOR_EXAR && PCI
+	---help---
+	  This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/s2io.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called s2io.
+
+config VXGE
+	tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
+	depends on NET_VENDOR_EXAR && PCI && INET
+	---help---
+	  This driver supports Exar Corp's X3100 Series 10 GbE PCIe
+	  I/O Virtualized Server Adapter.
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/vxge.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called vxge.
+
+config VXGE_DEBUG_TRACE_ALL
+	bool "Enabling All Debug trace statments in driver"
+	default n
+	depends on VXGE
+	---help---
+	  Say Y here if you want to enabling all the debug trace statements in
+	  the vxge driver. By default only few debug trace statements are
+	  enabled.
diff --git a/drivers/net/ethernet/neterion/Makefile b/drivers/net/ethernet/neterion/Makefile
new file mode 100644
index 0000000..70c8058
--- /dev/null
+++ b/drivers/net/ethernet/neterion/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Exar network device drivers.
+#
+
+obj-$(CONFIG_S2IO) += s2io.o
+obj-$(CONFIG_VXGE) += vxge/
diff --git a/drivers/net/s2io-regs.h b/drivers/net/ethernet/neterion/s2io-regs.h
similarity index 100%
rename from drivers/net/s2io-regs.h
rename to drivers/net/ethernet/neterion/s2io-regs.h
diff --git a/drivers/net/s2io.c b/drivers/net/ethernet/neterion/s2io.c
similarity index 100%
rename from drivers/net/s2io.c
rename to drivers/net/ethernet/neterion/s2io.c
diff --git a/drivers/net/s2io.h b/drivers/net/ethernet/neterion/s2io.h
similarity index 100%
rename from drivers/net/s2io.h
rename to drivers/net/ethernet/neterion/s2io.h
diff --git a/drivers/net/vxge/Makefile b/drivers/net/ethernet/neterion/vxge/Makefile
similarity index 100%
rename from drivers/net/vxge/Makefile
rename to drivers/net/ethernet/neterion/vxge/Makefile
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
similarity index 100%
rename from drivers/net/vxge/vxge-config.c
rename to drivers/net/ethernet/neterion/vxge/vxge-config.c
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
similarity index 100%
rename from drivers/net/vxge/vxge-config.h
rename to drivers/net/ethernet/neterion/vxge/vxge-config.h
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
similarity index 100%
rename from drivers/net/vxge/vxge-ethtool.c
rename to drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
diff --git a/drivers/net/vxge/vxge-ethtool.h b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.h
similarity index 100%
rename from drivers/net/vxge/vxge-ethtool.h
rename to drivers/net/ethernet/neterion/vxge/vxge-ethtool.h
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
similarity index 100%
rename from drivers/net/vxge/vxge-main.c
rename to drivers/net/ethernet/neterion/vxge/vxge-main.c
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
similarity index 100%
rename from drivers/net/vxge/vxge-main.h
rename to drivers/net/ethernet/neterion/vxge/vxge-main.h
diff --git a/drivers/net/vxge/vxge-reg.h b/drivers/net/ethernet/neterion/vxge/vxge-reg.h
similarity index 100%
rename from drivers/net/vxge/vxge-reg.h
rename to drivers/net/ethernet/neterion/vxge/vxge-reg.h
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
similarity index 100%
rename from drivers/net/vxge/vxge-traffic.c
rename to drivers/net/ethernet/neterion/vxge/vxge-traffic.c
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
similarity index 100%
rename from drivers/net/vxge/vxge-traffic.h
rename to drivers/net/ethernet/neterion/vxge/vxge-traffic.h
diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/ethernet/neterion/vxge/vxge-version.h
similarity index 100%
rename from drivers/net/vxge/vxge-version.h
rename to drivers/net/ethernet/neterion/vxge/vxge-version.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 18/72] ehea/ibm*: Move the IBM drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (16 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 17/72] s2io/vxge: Move the Exar drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 14:39   ` Oliver Hartkopp
  2011-06-25 13:58 ` [RFC 19/72] enic: Move the Cisco driver Jeff Kirsher
                   ` (56 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Christoph Raisch, Alfred Arnold,
	Santiago Leon, Benjamin Herrenschmidt

Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
necessary Kconfig and Makefile changes.

CC: Christoph Raisch <raisch@de.ibm.com>
CC: Alfred Arnold <alfred.arnold@lancom.de>
CC: Santiago Leon <santil@linux.vnet.ibm.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    4 +-
 drivers/net/Kconfig                                |   37 --------------
 drivers/net/Makefile                               |    4 --
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/ibm/Kconfig                   |   53 ++++++++++++++++++++
 drivers/net/ethernet/ibm/Makefile                  |    8 +++
 drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig |    2 +-
 .../net/{ => ethernet/ibm}/ibm_newemac/Makefile    |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c  |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h  |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h  |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h   |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c  |    0
 drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h  |    0
 drivers/net/{ => ethernet/ibm}/ibmlana.c           |    0
 drivers/net/{ => ethernet/ibm}/ibmlana.h           |    0
 drivers/net/{ => ethernet/ibm}/ibmveth.c           |    0
 drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
 37 files changed, 66 insertions(+), 44 deletions(-)
 create mode 100644 drivers/net/ethernet/ibm/Kconfig
 create mode 100644 drivers/net/ethernet/ibm/Makefile
 rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig (97%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/Makefile (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibmlana.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibmlana.h (100%)
 rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
 rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 816c665..0176793 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2432,7 +2432,7 @@ EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
 M:	Breno Leitao <leitao@linux.vnet.ibm.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/ehea/
+F:	drivers/net/ethernet/ibm/ehea/
 
 EMBEDDED LINUX
 M:	Paul Gortmaker <paul.gortmaker@windriver.com>
@@ -3131,7 +3131,7 @@ IBM Power Virtual Ethernet Device Driver
 M:	Santiago Leon <santil@linux.vnet.ibm.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/ibmveth.*
+F:	drivers/net/ethernet/ibm/ibmveth.*
 
 IBM ServeRAID RAID DRIVER
 P:	Jack Hammer
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6294de0..7f28373 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -770,33 +770,6 @@ config SEEQ8005
 	  To compile this driver as a module, choose M here. The module
 	  will be called seeq8005.
 
-config IBMLANA
-	tristate "IBM LAN Adapter/A support"
-	depends on MCA
-	---help---
-	  This is a Micro Channel Ethernet adapter.  You need to set
-	  CONFIG_MCA to use this driver.  It is both available as an in-kernel
-	  driver and as a module.
-
-	  To compile this driver as a module, choose M here. The only
-	  currently supported card is the IBM LAN Adapter/A for Ethernet.  It
-	  will both support 16K and 32K memory windows, however a 32K window
-	  gives a better security against packet losses.  Usage of multiple
-	  boards with this driver should be possible, but has not been tested
-	  up to now due to lack of hardware.
-
-config IBMVETH
-	tristate "IBM LAN Virtual Ethernet support"
-	depends on PPC_PSERIES
-	---help---
-	  This driver supports virtual ethernet adapters on newer IBM iSeries
-	  and pSeries systems.
-
-	  To compile this driver as a module, choose M here. The module will
-	  be called ibmveth.
-
-source "drivers/net/ibm_newemac/Kconfig"
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
@@ -1652,16 +1625,6 @@ if NETDEV_10000
 config MDIO
 	tristate
 
-config EHEA
-	tristate "eHEA Ethernet support"
-	depends on IBMEBUS && INET && SPARSEMEM
-	select INET_LRO
-	---help---
-	  This driver supports the IBM pSeries eHEA ethernet adapter.
-
-	  To compile the driver as a module, choose M here. The module
-	  will be called ehea.
-
 config ENIC
 	tristate "Cisco VIC Ethernet NIC Support"
 	depends on PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 5241d6e..f0efba2 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -10,9 +10,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
 obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
 
-obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
 obj-$(CONFIG_IP1000) += ipg.o
-obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_ATL1) += atlx/
@@ -127,7 +125,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_IBMLANA) += ibmlana.o
 obj-$(CONFIG_EEXPRESS) += eexpress.o
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
 obj-$(CONFIG_8139CP) += 8139cp.o
@@ -165,7 +162,6 @@ obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_SMSC911X) += smsc911x.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index a23ea19..0fd163e 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
+source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 690421d..43c912f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
+obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
new file mode 100644
index 0000000..ac755a3
--- /dev/null
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -0,0 +1,53 @@
+#
+# IBM device configuration.
+#
+
+config NET_VENDOR_IBM
+	bool "IBM devices"
+	depends on MCA || PPC_PSERIES || PPC_DCR || IBMEBUS
+	---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 IBM devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config IBMLANA
+	tristate "IBM LAN Adapter/A support"
+	depends on NET_VENDOR_IBM && MCA
+	---help---
+	  This is a Micro Channel Ethernet adapter.  You need to set
+	  CONFIG_MCA to use this driver.  It is both available as an in-kernel
+	  driver and as a module.
+
+	  To compile this driver as a module, choose M here. The only
+	  currently supported card is the IBM LAN Adapter/A for Ethernet.  It
+	  will both support 16K and 32K memory windows, however a 32K window
+	  gives a better security against packet losses.  Usage of multiple
+	  boards with this driver should be possible, but has not been tested
+	  up to now due to lack of hardware.
+
+config IBMVETH
+	tristate "IBM LAN Virtual Ethernet support"
+	depends on NET_VENDOR_IBM && PPC_PSERIES
+	---help---
+	  This driver supports virtual ethernet adapters on newer IBM iSeries
+	  and pSeries systems.
+
+	  To compile this driver as a module, choose M here. The module will
+	  be called ibmveth.
+
+source "drivers/net/ethernet/ibm/ibm_newemac/Kconfig"
+
+config EHEA
+	tristate "eHEA Ethernet support"
+	depends on NET_VENDOR_IBM && IBMEBUS && INET && SPARSEMEM
+	select INET_LRO
+	---help---
+	  This driver supports the IBM pSeries eHEA ethernet adapter.
+
+	  To compile the driver as a module, choose M here. The module
+	  will be called ehea.
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile
new file mode 100644
index 0000000..a63a8c3
--- /dev/null
+++ b/drivers/net/ethernet/ibm/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for th IBM network device drivers.
+#
+
+obj-$(CONFIG_IBMLANA) += ibmlana.o
+obj-$(CONFIG_IBMVETH) += ibmveth.o
+obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
+obj-$(CONFIG_EHEA) += ehea/
diff --git a/drivers/net/ehea/Makefile b/drivers/net/ethernet/ibm/ehea/Makefile
similarity index 100%
rename from drivers/net/ehea/Makefile
rename to drivers/net/ethernet/ibm/ehea/Makefile
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h
similarity index 100%
rename from drivers/net/ehea/ehea.h
rename to 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
similarity index 100%
rename from drivers/net/ehea/ehea_ethtool.c
rename to 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
similarity index 100%
rename from drivers/net/ehea/ehea_hw.h
rename to 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
similarity index 100%
rename from drivers/net/ehea/ehea_main.c
rename to 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
similarity index 100%
rename from drivers/net/ehea/ehea_phyp.c
rename to 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
similarity index 100%
rename from drivers/net/ehea/ehea_phyp.h
rename to 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
similarity index 100%
rename from drivers/net/ehea/ehea_qmr.c
rename to 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
similarity index 100%
rename from drivers/net/ehea/ehea_qmr.h
rename to drivers/net/ethernet/ibm/ehea/ehea_qmr.h
diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ethernet/ibm/ibm_newemac/Kconfig
similarity index 97%
rename from drivers/net/ibm_newemac/Kconfig
rename to drivers/net/ethernet/ibm/ibm_newemac/Kconfig
index 78a1628..7e370b0 100644
--- a/drivers/net/ibm_newemac/Kconfig
+++ b/drivers/net/ethernet/ibm/ibm_newemac/Kconfig
@@ -1,6 +1,6 @@
 config IBM_NEW_EMAC
 	tristate "IBM EMAC Ethernet support"
-	depends on PPC_DCR
+	depends on NET_VENDOR_IBM && PPC_DCR
 	select CRC32
 	help
 	  This driver supports the IBM EMAC family of Ethernet controllers
diff --git a/drivers/net/ibm_newemac/Makefile b/drivers/net/ethernet/ibm/ibm_newemac/Makefile
similarity index 100%
rename from drivers/net/ibm_newemac/Makefile
rename to drivers/net/ethernet/ibm/ibm_newemac/Makefile
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ethernet/ibm/ibm_newemac/core.c
similarity index 100%
rename from drivers/net/ibm_newemac/core.c
rename to drivers/net/ethernet/ibm/ibm_newemac/core.c
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ethernet/ibm/ibm_newemac/core.h
similarity index 100%
rename from drivers/net/ibm_newemac/core.h
rename to drivers/net/ethernet/ibm/ibm_newemac/core.h
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ethernet/ibm/ibm_newemac/debug.c
similarity index 100%
rename from drivers/net/ibm_newemac/debug.c
rename to drivers/net/ethernet/ibm/ibm_newemac/debug.c
diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ethernet/ibm/ibm_newemac/debug.h
similarity index 100%
rename from drivers/net/ibm_newemac/debug.h
rename to drivers/net/ethernet/ibm/ibm_newemac/debug.h
diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ethernet/ibm/ibm_newemac/emac.h
similarity index 100%
rename from drivers/net/ibm_newemac/emac.h
rename to drivers/net/ethernet/ibm/ibm_newemac/emac.h
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ethernet/ibm/ibm_newemac/mal.c
similarity index 100%
rename from drivers/net/ibm_newemac/mal.c
rename to drivers/net/ethernet/ibm/ibm_newemac/mal.c
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ethernet/ibm/ibm_newemac/mal.h
similarity index 100%
rename from drivers/net/ibm_newemac/mal.h
rename to drivers/net/ethernet/ibm/ibm_newemac/mal.h
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ethernet/ibm/ibm_newemac/phy.c
similarity index 100%
rename from drivers/net/ibm_newemac/phy.c
rename to drivers/net/ethernet/ibm/ibm_newemac/phy.c
diff --git a/drivers/net/ibm_newemac/phy.h b/drivers/net/ethernet/ibm/ibm_newemac/phy.h
similarity index 100%
rename from drivers/net/ibm_newemac/phy.h
rename to drivers/net/ethernet/ibm/ibm_newemac/phy.h
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ethernet/ibm/ibm_newemac/rgmii.c
similarity index 100%
rename from drivers/net/ibm_newemac/rgmii.c
rename to drivers/net/ethernet/ibm/ibm_newemac/rgmii.c
diff --git a/drivers/net/ibm_newemac/rgmii.h b/drivers/net/ethernet/ibm/ibm_newemac/rgmii.h
similarity index 100%
rename from drivers/net/ibm_newemac/rgmii.h
rename to drivers/net/ethernet/ibm/ibm_newemac/rgmii.h
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ethernet/ibm/ibm_newemac/tah.c
similarity index 100%
rename from drivers/net/ibm_newemac/tah.c
rename to drivers/net/ethernet/ibm/ibm_newemac/tah.c
diff --git a/drivers/net/ibm_newemac/tah.h b/drivers/net/ethernet/ibm/ibm_newemac/tah.h
similarity index 100%
rename from drivers/net/ibm_newemac/tah.h
rename to drivers/net/ethernet/ibm/ibm_newemac/tah.h
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ethernet/ibm/ibm_newemac/zmii.c
similarity index 100%
rename from drivers/net/ibm_newemac/zmii.c
rename to drivers/net/ethernet/ibm/ibm_newemac/zmii.c
diff --git a/drivers/net/ibm_newemac/zmii.h b/drivers/net/ethernet/ibm/ibm_newemac/zmii.h
similarity index 100%
rename from drivers/net/ibm_newemac/zmii.h
rename to drivers/net/ethernet/ibm/ibm_newemac/zmii.h
diff --git a/drivers/net/ibmlana.c b/drivers/net/ethernet/ibm/ibmlana.c
similarity index 100%
rename from drivers/net/ibmlana.c
rename to drivers/net/ethernet/ibm/ibmlana.c
diff --git a/drivers/net/ibmlana.h b/drivers/net/ethernet/ibm/ibmlana.h
similarity index 100%
rename from drivers/net/ibmlana.h
rename to drivers/net/ethernet/ibm/ibmlana.h
diff --git a/drivers/net/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
similarity index 100%
rename from drivers/net/ibmveth.c
rename to drivers/net/ethernet/ibm/ibmveth.c
diff --git a/drivers/net/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h
similarity index 100%
rename from drivers/net/ibmveth.h
rename to drivers/net/ethernet/ibm/ibmveth.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 19/72] enic: Move the Cisco driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (17 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 18/72] ehea/ibm*: Move the IBM drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 20/72] pasemic_mac*: Move the PA Semi driver Jeff Kirsher
                   ` (55 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Scott Feldman, Christian Benvenuti,
	Vasanthy Kolluri, Roopa Prabhu, David Wang

Move the Cisco driver into drivers/net/ethernet/cisco/ and make the
necessary Kconfig and Makefile changes.

CC: Scott Feldman <scofeldm@cisco.com>
CC: Christian Benvenuti <benve@cisco.com>
CC: Vasanthy Kolluri <vkolluri@cisco.com>
CC: Roopa Prabhu <roprabhu@cisco.com>
CC: David Wang <dwang2@cisco.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |    6 ------
 drivers/net/Makefile                               |    1 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/cisco/Kconfig                 |   18 ++++++++++++++++++
 drivers/net/ethernet/cisco/Makefile                |    5 +++++
 drivers/net/ethernet/cisco/enic/Kconfig            |    9 +++++++++
 drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
 drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
 .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
 drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
 .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
 .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
 .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
 .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
 39 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 drivers/net/ethernet/cisco/Kconfig
 create mode 100644 drivers/net/ethernet/cisco/Makefile
 create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
 rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
 rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0176793..5fd73ec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1735,7 +1735,7 @@ M:	Vasanthy Kolluri <vkolluri@cisco.com>
 M:	Roopa Prabhu <roprabhu@cisco.com>
 M:	David Wang <dwang2@cisco.com>
 S:	Supported
-F:	drivers/net/enic/
+F:	drivers/net/ethernet/cisco/enic/
 
 CIRRUS LOGIC EP93XX ETHERNET DRIVER
 M:	Hartley Sweeten <hsweeten@visionengravers.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7f28373..802e246 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1625,12 +1625,6 @@ if NETDEV_10000
 config MDIO
 	tristate
 
-config ENIC
-	tristate "Cisco VIC Ethernet NIC Support"
-	depends on PCI && INET
-	help
-	  This enables the support for the Cisco VIC Ethernet card.
-
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
 	depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f0efba2..6198d42 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -20,7 +20,6 @@ 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_ENIC) += enic/
 obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_VMXNET3) += vmxnet3/
 
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 0fd163e..9b333a7 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -17,6 +17,7 @@ source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/cisco/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 43c912f..6f14a35 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
diff --git a/drivers/net/ethernet/cisco/Kconfig b/drivers/net/ethernet/cisco/Kconfig
new file mode 100644
index 0000000..6d72c34
--- /dev/null
+++ b/drivers/net/ethernet/cisco/Kconfig
@@ -0,0 +1,18 @@
+#
+# Cisco device configuration
+#
+
+config NET_VENDOR_CISCO
+	bool "Cisco devices"
+	depends on PCI || INET
+	---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 Cisco cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+source "drivers/net/ethernet/cisco/enic/Kconfig"
diff --git a/drivers/net/ethernet/cisco/Makefile b/drivers/net/ethernet/cisco/Makefile
new file mode 100644
index 0000000..6c7437b
--- /dev/null
+++ b/drivers/net/ethernet/cisco/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cisco device drivers.
+#
+
+obj-$(CONFIG_ENIC) += enic/
diff --git a/drivers/net/ethernet/cisco/enic/Kconfig b/drivers/net/ethernet/cisco/enic/Kconfig
new file mode 100644
index 0000000..dc137af
--- /dev/null
+++ b/drivers/net/ethernet/cisco/enic/Kconfig
@@ -0,0 +1,9 @@
+#
+# Cisco device configuration
+#
+
+config ENIC
+	tristate "Cisco VIC Ethernet NIC Support"
+	depends on NET_VENDOR_CISCO && PCI && INET
+	---help---
+	  This enables the support for the Cisco VIC Ethernet card.
diff --git a/drivers/net/enic/Makefile b/drivers/net/ethernet/cisco/enic/Makefile
similarity index 100%
rename from drivers/net/enic/Makefile
rename to drivers/net/ethernet/cisco/enic/Makefile
diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/ethernet/cisco/enic/cq_desc.h
similarity index 100%
rename from drivers/net/enic/cq_desc.h
rename to drivers/net/ethernet/cisco/enic/cq_desc.h
diff --git a/drivers/net/enic/cq_enet_desc.h b/drivers/net/ethernet/cisco/enic/cq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/cq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/cq_enet_desc.h
diff --git a/drivers/net/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
similarity index 100%
rename from drivers/net/enic/enic.h
rename to drivers/net/ethernet/cisco/enic/enic.h
diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c
similarity index 100%
rename from drivers/net/enic/enic_dev.c
rename to drivers/net/ethernet/cisco/enic/enic_dev.c
diff --git a/drivers/net/enic/enic_dev.h b/drivers/net/ethernet/cisco/enic/enic_dev.h
similarity index 100%
rename from drivers/net/enic/enic_dev.h
rename to drivers/net/ethernet/cisco/enic/enic_dev.h
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
similarity index 100%
rename from drivers/net/enic/enic_main.c
rename to drivers/net/ethernet/cisco/enic/enic_main.c
diff --git a/drivers/net/enic/enic_pp.c b/drivers/net/ethernet/cisco/enic/enic_pp.c
similarity index 100%
rename from drivers/net/enic/enic_pp.c
rename to drivers/net/ethernet/cisco/enic/enic_pp.c
diff --git a/drivers/net/enic/enic_pp.h b/drivers/net/ethernet/cisco/enic/enic_pp.h
similarity index 100%
rename from drivers/net/enic/enic_pp.h
rename to drivers/net/ethernet/cisco/enic/enic_pp.h
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/ethernet/cisco/enic/enic_res.c
similarity index 100%
rename from drivers/net/enic/enic_res.c
rename to drivers/net/ethernet/cisco/enic/enic_res.c
diff --git a/drivers/net/enic/enic_res.h b/drivers/net/ethernet/cisco/enic/enic_res.h
similarity index 100%
rename from drivers/net/enic/enic_res.h
rename to drivers/net/ethernet/cisco/enic/enic_res.h
diff --git a/drivers/net/enic/rq_enet_desc.h b/drivers/net/ethernet/cisco/enic/rq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/rq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/rq_enet_desc.h
diff --git a/drivers/net/enic/vnic_cq.c b/drivers/net/ethernet/cisco/enic/vnic_cq.c
similarity index 100%
rename from drivers/net/enic/vnic_cq.c
rename to drivers/net/ethernet/cisco/enic/vnic_cq.c
diff --git a/drivers/net/enic/vnic_cq.h b/drivers/net/ethernet/cisco/enic/vnic_cq.h
similarity index 100%
rename from drivers/net/enic/vnic_cq.h
rename to drivers/net/ethernet/cisco/enic/vnic_cq.h
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c
similarity index 100%
rename from drivers/net/enic/vnic_dev.c
rename to drivers/net/ethernet/cisco/enic/vnic_dev.c
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/ethernet/cisco/enic/vnic_dev.h
similarity index 100%
rename from drivers/net/enic/vnic_dev.h
rename to drivers/net/ethernet/cisco/enic/vnic_dev.h
diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/ethernet/cisco/enic/vnic_devcmd.h
similarity index 100%
rename from drivers/net/enic/vnic_devcmd.h
rename to drivers/net/ethernet/cisco/enic/vnic_devcmd.h
diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/ethernet/cisco/enic/vnic_enet.h
similarity index 100%
rename from drivers/net/enic/vnic_enet.h
rename to drivers/net/ethernet/cisco/enic/vnic_enet.h
diff --git a/drivers/net/enic/vnic_intr.c b/drivers/net/ethernet/cisco/enic/vnic_intr.c
similarity index 100%
rename from drivers/net/enic/vnic_intr.c
rename to drivers/net/ethernet/cisco/enic/vnic_intr.c
diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/ethernet/cisco/enic/vnic_intr.h
similarity index 100%
rename from drivers/net/enic/vnic_intr.h
rename to drivers/net/ethernet/cisco/enic/vnic_intr.h
diff --git a/drivers/net/enic/vnic_nic.h b/drivers/net/ethernet/cisco/enic/vnic_nic.h
similarity index 100%
rename from drivers/net/enic/vnic_nic.h
rename to drivers/net/ethernet/cisco/enic/vnic_nic.h
diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/ethernet/cisco/enic/vnic_resource.h
similarity index 100%
rename from drivers/net/enic/vnic_resource.h
rename to drivers/net/ethernet/cisco/enic/vnic_resource.h
diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c
similarity index 100%
rename from drivers/net/enic/vnic_rq.c
rename to drivers/net/ethernet/cisco/enic/vnic_rq.c
diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/ethernet/cisco/enic/vnic_rq.h
similarity index 100%
rename from drivers/net/enic/vnic_rq.h
rename to drivers/net/ethernet/cisco/enic/vnic_rq.h
diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/ethernet/cisco/enic/vnic_rss.h
similarity index 100%
rename from drivers/net/enic/vnic_rss.h
rename to drivers/net/ethernet/cisco/enic/vnic_rss.h
diff --git a/drivers/net/enic/vnic_stats.h b/drivers/net/ethernet/cisco/enic/vnic_stats.h
similarity index 100%
rename from drivers/net/enic/vnic_stats.h
rename to drivers/net/ethernet/cisco/enic/vnic_stats.h
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/ethernet/cisco/enic/vnic_vic.c
similarity index 100%
rename from drivers/net/enic/vnic_vic.c
rename to drivers/net/ethernet/cisco/enic/vnic_vic.c
diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/ethernet/cisco/enic/vnic_vic.h
similarity index 100%
rename from drivers/net/enic/vnic_vic.h
rename to drivers/net/ethernet/cisco/enic/vnic_vic.h
diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c
similarity index 100%
rename from drivers/net/enic/vnic_wq.c
rename to drivers/net/ethernet/cisco/enic/vnic_wq.c
diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/ethernet/cisco/enic/vnic_wq.h
similarity index 100%
rename from drivers/net/enic/vnic_wq.h
rename to drivers/net/ethernet/cisco/enic/vnic_wq.h
diff --git a/drivers/net/enic/wq_enet_desc.h b/drivers/net/ethernet/cisco/enic/wq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/wq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/wq_enet_desc.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 20/72] pasemic_mac*: Move the PA Semi driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (18 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 19/72] enic: Move the Cisco driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-26  1:34   ` Olof Johansson
  2011-06-25 13:58 ` [RFC 21/72] tehuti: Move the Tehuti driver Jeff Kirsher
                   ` (54 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Olof Johansson

Move the PA Semi driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                     |    2 +-
 drivers/net/Kconfig                             |    9 ---------
 drivers/net/Makefile                            |    2 --
 drivers/net/ethernet/Kconfig                    |   10 ++++++++++
 drivers/net/ethernet/Makefile                   |    1 +
 drivers/net/{ => ethernet}/pasemi_mac.c         |    0
 drivers/net/{ => ethernet}/pasemi_mac.h         |    0
 drivers/net/{ => ethernet}/pasemi_mac_ethtool.c |    0
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename drivers/net/{ => ethernet}/pasemi_mac.c (100%)
 rename drivers/net/{ => ethernet}/pasemi_mac.h (100%)
 rename drivers/net/{ => ethernet}/pasemi_mac_ethtool.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5fd73ec..65f1282 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4719,7 +4719,7 @@ PA SEMI ETHERNET DRIVER
 M:	Olof Johansson <olof@lixom.net>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/pasemi_mac.*
+F:	drivers/net/ethernet/pasemi_mac*
 
 PA SEMI SMBUS DRIVER
 M:	Olof Johansson <olof@lixom.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 802e246..de6ff15 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1625,15 +1625,6 @@ if NETDEV_10000
 config MDIO
 	tristate
 
-config PASEMI_MAC
-	tristate "PA Semi 1/10Gbit MAC"
-	depends on PPC_PASEMI && PCI && INET
-	select PHYLIB
-	select INET_LRO
-	help
-	  This driver supports the on-chip 1/10Gbit Ethernet controller on
-	  PA Semi's PWRficient line of chips.
-
 config TEHUTI
 	tristate "Tehuti Networks 10G Ethernet"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6198d42..a7bbf98 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -166,8 +166,6 @@ obj-$(CONFIG_SMSC911X) += smsc911x.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
-obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
-pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 9b333a7..3174234 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -24,6 +24,16 @@ source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
+
+config PASEMI_MAC
+	tristate "PA Semi 1/10Gbit MAC"
+	depends on PPC_PASEMI && PCI && INET
+	select PHYLIB
+	select INET_LRO
+	---help---
+	  This driver supports the on-chip 1/10Gbit Ethernet controller on
+	  PA Semi's PWRficient line of chips.
+
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 6f14a35..a7eee02 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/ethernet/pasemi_mac.c
similarity index 100%
rename from drivers/net/pasemi_mac.c
rename to drivers/net/ethernet/pasemi_mac.c
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/ethernet/pasemi_mac.h
similarity index 100%
rename from drivers/net/pasemi_mac.h
rename to drivers/net/ethernet/pasemi_mac.h
diff --git a/drivers/net/pasemi_mac_ethtool.c b/drivers/net/ethernet/pasemi_mac_ethtool.c
similarity index 100%
rename from drivers/net/pasemi_mac_ethtool.c
rename to drivers/net/ethernet/pasemi_mac_ethtool.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 21/72] tehuti: Move the Tehuti driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (19 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 20/72] pasemic_mac*: Move the PA Semi driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 22/72] stmmac: Move the STMicroelectronics driver Jeff Kirsher
                   ` (53 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Alexander Indenbaum, Andy Gospodarek

Move the Tehuti driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Alexander Indenbaum <baum@tehutinetworks.net>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.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@tehutinetworks.net>
 M:	Andy Gospodarek <andy@greyhouse.net>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/tehuti*
+F:	drivers/net/ethernet/tehuti*
 
 Telecom Clock Driver for MCPL0010
 M:	Mark Gross <mark.gross@intel.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


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 22/72] stmmac: Move the STMicroelectronics driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (20 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 21/72] tehuti: Move the Tehuti driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 23/72] bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers Jeff Kirsher
                   ` (52 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Giuseppe Cavallaro

Move the STMicroelectronics driver into driver/net/ethernet/stmicro/ and
make the necessary Kconfig and Makefile changes.

CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |    2 --
 drivers/net/Makefile                               |    1 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/stmicro/Kconfig               |   18 ++++++++++++++++++
 drivers/net/ethernet/stmicro/Makefile              |    5 +++++
 drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +++++++-------
 drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
 drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
 drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
 .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
 .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
 .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
 .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
 .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
 .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
 .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
 .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
 .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
 .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
 drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
 27 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 drivers/net/ethernet/stmicro/Kconfig
 create mode 100644 drivers/net/ethernet/stmicro/Makefile
 rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (92%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 015e658..6f822c6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1996,7 +1996,7 @@ M:	Giuseppe Cavallaro <peppe.cavallaro@st.com>
 L:	netdev@vger.kernel.org
 W:	http://www.stlinux.com
 S:	Supported
-F:	drivers/net/stmmac/
+F:	drivers/net/ethernet/stmicro/stmmac/
 
 CYBERPRO FB DRIVER
 M:	Russell King <linux@arm.linux.org.uk>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1e157e7..4be1bcf 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1574,8 +1574,6 @@ config S6GMAC
 	  To compile this driver as a module, choose M here. The module
 	  will be called s6gmac.
 
-source "drivers/net/stmmac/Kconfig"
-
 config PCH_GBE
 	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2c90508..9a73e0f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -69,7 +69,6 @@ obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
 obj-$(CONFIG_SH_ETH) += sh_eth.o
-obj-$(CONFIG_STMMAC_ETH) += stmmac/
 
 #
 # end link order section
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 74573fa..4714825 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -38,6 +38,7 @@ source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
+source "drivers/net/ethernet/stmicro/Kconfig"
 source "drivers/net/ethernet/sun/Kconfig"
 
 config TEHUTI
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index d98ae32..76ea04b 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -20,5 +20,6 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
+obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
 obj-$(CONFIG_TEHUTI) += tehuti.o
diff --git a/drivers/net/ethernet/stmicro/Kconfig b/drivers/net/ethernet/stmicro/Kconfig
new file mode 100644
index 0000000..d4f7e02
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/Kconfig
@@ -0,0 +1,18 @@
+#
+# STMicroelectronics device configuration
+#
+
+config NET_VENDOR_STMICRO
+	bool "STMicroelectronics devices"
+	depends on HAS_IOMEM
+	---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 STMicroelectronics cards. If you say Y, you will
+	  be asked for your specific card in the following questions.
+
+source "drivers/net/ethernet/stmicro/stmmac/Kconfig"
diff --git a/drivers/net/ethernet/stmicro/Makefile b/drivers/net/ethernet/stmicro/Makefile
new file mode 100644
index 0000000..9b3bfdd
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the STMicroelectronics device drivers.
+#
+
+obj-$(CONFIG_STMMAC_ETH) += stmmac/
diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
similarity index 92%
rename from drivers/net/stmmac/Kconfig
rename to drivers/net/ethernet/stmicro/stmmac/Kconfig
index 7df7df4..e1d915d 100644
--- a/drivers/net/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -1,10 +1,10 @@
 config STMMAC_ETH
 	tristate "STMicroelectronics 10/100/1000 Ethernet driver"
+	depends on NET_VENDOR_STMICRO && HAS_IOMEM
 	select MII
 	select PHYLIB
 	select CRC32
-	depends on NETDEVICES && HAS_IOMEM
-	help
+	---help---
 	  This is the driver for the Ethernet IPs are built around a
 	  Synopsys IP Core and only tested on the STMicroelectronics
 	  platforms.
@@ -14,7 +14,7 @@ if STMMAC_ETH
 config STMMAC_DA
 	bool "STMMAC DMA arbitration scheme"
 	default n
-	help
+	---help---
 	  Selecting this option, rx has priority over Tx (only for Giga
 	  Ethernet device).
 	  By default, the DMA arbitration scheme is based on Round-robin
@@ -24,7 +24,7 @@ config STMMAC_DUAL_MAC
 	bool "STMMAC: dual mac support (EXPERIMENTAL)"
 	default n
         depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER
-	help
+	---help---
 	  Some ST SoCs (for example the stx7141 and stx7200c2) have two
 	  Ethernet Controllers. This option turns on the second Ethernet
 	  device on this kind of platforms.
@@ -33,7 +33,7 @@ config STMMAC_TIMER
 	bool "STMMAC Timer optimisation"
 	default n
 	depends on RTC_HCTOSYS_DEVICE
-	help
+	---help---
 	  Use an external timer for mitigating the number of network
 	  interrupts. Currently, for SH architectures, it is possible
 	  to use the TMU channel 2 and the SH-RTC device.
@@ -45,12 +45,12 @@ choice
 config STMMAC_TMU_TIMER
         bool "TMU channel 2"
         depends on CPU_SH4
-	help
+	---help---
 
 config STMMAC_RTC_TIMER
         bool "Real time clock"
         depends on RTC_CLASS
-	help
+	---help---
 
 endchoice
 
diff --git a/drivers/net/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
similarity index 100%
rename from drivers/net/stmmac/Makefile
rename to drivers/net/ethernet/stmicro/stmmac/Makefile
diff --git a/drivers/net/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
similarity index 100%
rename from drivers/net/stmmac/common.h
rename to drivers/net/ethernet/stmicro/stmmac/common.h
diff --git a/drivers/net/stmmac/descs.h b/drivers/net/ethernet/stmicro/stmmac/descs.h
similarity index 100%
rename from drivers/net/stmmac/descs.h
rename to drivers/net/ethernet/stmicro/stmmac/descs.h
diff --git a/drivers/net/stmmac/dwmac100.h b/drivers/net/ethernet/stmicro/stmmac/dwmac100.h
similarity index 100%
rename from drivers/net/stmmac/dwmac100.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100.h
diff --git a/drivers/net/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
similarity index 100%
rename from drivers/net/stmmac/dwmac1000.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
similarity index 100%
rename from drivers/net/stmmac/dwmac1000_core.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
diff --git a/drivers/net/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
similarity index 100%
rename from drivers/net/stmmac/dwmac1000_dma.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
diff --git a/drivers/net/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
similarity index 100%
rename from drivers/net/stmmac/dwmac100_core.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
diff --git a/drivers/net/stmmac/dwmac100_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
similarity index 100%
rename from drivers/net/stmmac/dwmac100_dma.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
diff --git a/drivers/net/stmmac/dwmac_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
similarity index 100%
rename from drivers/net/stmmac/dwmac_dma.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
diff --git a/drivers/net/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
similarity index 100%
rename from drivers/net/stmmac/dwmac_lib.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
diff --git a/drivers/net/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
similarity index 100%
rename from drivers/net/stmmac/enh_desc.c
rename to drivers/net/ethernet/stmicro/stmmac/enh_desc.c
diff --git a/drivers/net/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
similarity index 100%
rename from drivers/net/stmmac/norm_desc.c
rename to drivers/net/ethernet/stmicro/stmmac/norm_desc.c
diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
similarity index 100%
rename from drivers/net/stmmac/stmmac.h
rename to drivers/net/ethernet/stmicro/stmmac/stmmac.h
diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_ethtool.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_main.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
diff --git a/drivers/net/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_mdio.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
diff --git a/drivers/net/stmmac/stmmac_timer.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_timer.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
diff --git a/drivers/net/stmmac/stmmac_timer.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h
similarity index 100%
rename from drivers/net/stmmac/stmmac_timer.h
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 23/72] bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (21 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 22/72] stmmac: Move the STMicroelectronics driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 24/72] *sonic/natsemi/ns83829: Move the National Semi-conductor drivers Jeff Kirsher
                   ` (51 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Paul Mackerras, Paul Mackerras, Russell Nelson

Move the Apple drivers into driver/net/ethernet/apple/ and make the
necessary Kconfig and Makefile changes.

CC: Paul Mackerras <paulus@samba.org>
CC: Paul Mackerras <paulus@au.ibm.com>
CC: Russell Nelson <nelson@crynwr.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                        |   75 ----------------------
 drivers/net/Makefile                       |    6 --
 drivers/net/ethernet/Kconfig               |    1 +
 drivers/net/ethernet/Makefile              |    1 +
 drivers/net/ethernet/apple/Kconfig         |   92 ++++++++++++++++++++++++++++
 drivers/net/ethernet/apple/Makefile        |    9 +++
 drivers/net/{ => ethernet/apple}/bmac.c    |    0
 drivers/net/{ => ethernet/apple}/bmac.h    |    0
 drivers/net/{ => ethernet/apple}/cs89x0.c  |    0
 drivers/net/{ => ethernet/apple}/cs89x0.h  |    0
 drivers/net/{ => ethernet/apple}/mac89x0.c |    0
 drivers/net/{ => ethernet/apple}/mace.c    |    0
 drivers/net/{ => ethernet/apple}/mace.h    |    0
 drivers/net/{ => ethernet/apple}/macmace.c |    0
 14 files changed, 103 insertions(+), 81 deletions(-)
 create mode 100644 drivers/net/ethernet/apple/Kconfig
 create mode 100644 drivers/net/ethernet/apple/Makefile
 rename drivers/net/{ => ethernet/apple}/bmac.c (100%)
 rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
 rename drivers/net/{ => ethernet/apple}/cs89x0.c (100%)
 rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
 rename drivers/net/{ => ethernet/apple}/mac89x0.c (100%)
 rename drivers/net/{ => ethernet/apple}/mace.c (100%)
 rename drivers/net/{ => ethernet/apple}/mace.h (100%)
 rename drivers/net/{ => ethernet/apple}/macmace.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4be1bcf..56c963a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -237,40 +237,6 @@ config MACB
 
 source "drivers/net/arm/Kconfig"
 
-config MACE
-	tristate "MACE (Power Mac ethernet) support"
-	depends on PPC_PMAC && PPC32
-	select CRC32
-	help
-	  Power Macintoshes and clones with Ethernet built-in on the
-	  motherboard will usually use a MACE (Medium Access Control for
-	  Ethernet) interface. Say Y to include support for the MACE chip.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called mace.
-
-config MACE_AAUI_PORT
-	bool "Use AAUI port instead of TP by default"
-	depends on MACE
-	help
-	  Some Apple machines (notably the Apple Network Server) which use the
-	  MACE ethernet chip have an Apple AUI port (small 15-pin connector),
-	  instead of an 8-pin RJ45 connector for twisted-pair ethernet.  Say
-	  Y here if you have such a machine.  If unsure, say N.
-	  The driver will default to AAUI on ANS anyway, and if you use it as
-	  a module, you can provide the port_aaui=0|1 to force the driver.
-
-config BMAC
-	tristate "BMAC (G3 ethernet) support"
-	depends on PPC_PMAC && PPC32
-	select CRC32
-	help
-	  Say Y for support of BMAC Ethernet interfaces. These are used on G3
-	  computers.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called bmac.
-
 config ARIADNE
 	tristate "Ariadne support"
 	depends on ZORRO
@@ -292,18 +258,6 @@ config A2065
 	  To compile this driver as a module, choose M here: the module
 	  will be called a2065.
 
-config MAC89x0
-	tristate "Macintosh CS89x0 based ethernet cards"
-	depends on MAC
-	---help---
-	  Support for CS89x0 chipset based Ethernet cards.  If you have a
-	  Nubus or LC-PDS network (Ethernet) card of this type, say Y and
-	  read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. This module will
-	  be called mac89x0.
-
 config MACSONIC
 	tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
 	depends on MAC
@@ -317,16 +271,6 @@ config MACSONIC
 	  To compile this driver as a module, choose M here. This module will
 	  be called macsonic.
 
-config MACMACE
-	bool "Macintosh (AV) onboard MACE ethernet"
-	depends on MAC
-	select CRC32
-	help
-	  Support for the onboard AMD 79C940 MACE Ethernet controller used in
-	  the 660AV and 840AV Macintosh.  If you have one of these Macintoshes
-	  say Y and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
 config MVME16x_NET
 	tristate "MVME16x Ethernet support"
 	depends on MVME16x
@@ -831,25 +775,6 @@ config FORCEDETH
 	  To compile this driver as a module, choose M here. The module
 	  will be called forcedeth.
 
-config CS89x0
-	tristate "CS89x0 support"
-	depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
-		|| ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440)
-	---help---
-	  Support for CS89x0 chipset based Ethernet cards. If you have a
-	  network (Ethernet) card of this type, say Y and read the
-	  Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto> as well as
-	  <file:Documentation/networking/cs89x0.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called cs89x0.
-
-config CS89x0_NONISA_IRQ
-	def_bool y
-	depends on CS89x0 != n
-	depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
-
 config TC35815
 	tristate "TOSHIBA TC35815 Ethernet support"
 	depends on NET_PCI && PCI && MIPS
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9a73e0f..9ac99cd 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -38,9 +38,6 @@ obj-$(CONFIG_PLIP) += plip.o
 
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
-obj-$(CONFIG_MACE) += mace.o
-obj-$(CONFIG_BMAC) += bmac.o
-
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
 obj-$(CONFIG_SIS190) += sis190.o
@@ -150,10 +147,7 @@ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
 obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_ARIADNE) += ariadne.o
-obj-$(CONFIG_CS89x0) += cs89x0.o
 obj-$(CONFIG_MACSONIC) += macsonic.o
-obj-$(CONFIG_MACMACE) += macmace.o
-obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 4714825..28b473b 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -14,6 +14,7 @@ if ETHERNET
 source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
+source "drivers/net/ethernet/apple/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 76ea04b..40dded7 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -5,6 +5,7 @@
 obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
+obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig
new file mode 100644
index 0000000..018fab6
--- /dev/null
+++ b/drivers/net/ethernet/apple/Kconfig
@@ -0,0 +1,92 @@
+#
+# Apple device configuration
+#
+
+config NET_VENDOR_APPLE
+	bool "Apple devices"
+	depends on PPC_PMAC || PPC32 || MAC || ISA || EISA || MACH_IXDP2351 \
+		|| ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
+	---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 IBM devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config MACE
+	tristate "MACE (Power Mac ethernet) support"
+	depends on NET_VENDOR_APPLE && PPC_PMAC && PPC32
+	select CRC32
+	---help---
+	  Power Macintoshes and clones with Ethernet built-in on the
+	  motherboard will usually use a MACE (Medium Access Control for
+	  Ethernet) interface. Say Y to include support for the MACE chip.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called mace.
+
+config MACE_AAUI_PORT
+	bool "Use AAUI port instead of TP by default"
+	depends on MACE
+	---help---
+	  Some Apple machines (notably the Apple Network Server) which use the
+	  MACE ethernet chip have an Apple AUI port (small 15-pin connector),
+	  instead of an 8-pin RJ45 connector for twisted-pair ethernet.  Say
+	  Y here if you have such a machine.  If unsure, say N.
+	  The driver will default to AAUI on ANS anyway, and if you use it as
+	  a module, you can provide the port_aaui=0|1 to force the driver.
+
+config BMAC
+	tristate "BMAC (G3 ethernet) support"
+	depends on NET_VENDOR_APPLE && PPC_PMAC && PPC32
+	select CRC32
+	---help---
+	  Say Y for support of BMAC Ethernet interfaces. These are used on G3
+	  computers.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called bmac.
+
+config MAC89x0
+	tristate "Macintosh CS89x0 based ethernet cards"
+	depends on NET_VENDOR_APPLE && MAC
+	---help---
+	  Support for CS89x0 chipset based Ethernet cards.  If you have a
+	  Nubus or LC-PDS network (Ethernet) card of this type, say Y and
+	  read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. This module will
+	  be called mac89x0.
+
+config MACMACE
+	bool "Macintosh (AV) onboard MACE ethernet"
+	depends on NET_VENDOR_APPLE && MAC
+	select CRC32
+	---help---
+	  Support for the onboard AMD 79C940 MACE Ethernet controller used in
+	  the 660AV and 840AV Macintosh.  If you have one of these Macintoshes
+	  say Y and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+config CS89x0
+	tristate "CS89x0 support"
+	depends on NET_VENDOR_APPLE && (ISA || EISA || MACH_IXDP2351 \
+		|| ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440)
+	---help---
+	  Support for CS89x0 chipset based Ethernet cards. If you have a
+	  network (Ethernet) card of this type, say Y and read the
+	  Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto> as well as
+	  <file:Documentation/networking/cs89x0.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called cs89x0.
+
+config CS89x0_NONISA_IRQ
+	def_bool y
+	depends on CS89x0 != n
+	depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
diff --git a/drivers/net/ethernet/apple/Makefile b/drivers/net/ethernet/apple/Makefile
new file mode 100644
index 0000000..9d30086
--- /dev/null
+++ b/drivers/net/ethernet/apple/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the Apple network device drivers.
+#
+
+obj-$(CONFIG_MACE) += mace.o
+obj-$(CONFIG_BMAC) += bmac.o
+obj-$(CONFIG_MAC89x0) += mac89x0.o
+obj-$(CONFIG_CS89x0) += cs89x0.o
+obj-$(CONFIG_MACMACE) += macmace.o
diff --git a/drivers/net/bmac.c b/drivers/net/ethernet/apple/bmac.c
similarity index 100%
rename from drivers/net/bmac.c
rename to drivers/net/ethernet/apple/bmac.c
diff --git a/drivers/net/bmac.h b/drivers/net/ethernet/apple/bmac.h
similarity index 100%
rename from drivers/net/bmac.h
rename to drivers/net/ethernet/apple/bmac.h
diff --git a/drivers/net/cs89x0.c b/drivers/net/ethernet/apple/cs89x0.c
similarity index 100%
rename from drivers/net/cs89x0.c
rename to drivers/net/ethernet/apple/cs89x0.c
diff --git a/drivers/net/cs89x0.h b/drivers/net/ethernet/apple/cs89x0.h
similarity index 100%
rename from drivers/net/cs89x0.h
rename to drivers/net/ethernet/apple/cs89x0.h
diff --git a/drivers/net/mac89x0.c b/drivers/net/ethernet/apple/mac89x0.c
similarity index 100%
rename from drivers/net/mac89x0.c
rename to drivers/net/ethernet/apple/mac89x0.c
diff --git a/drivers/net/mace.c b/drivers/net/ethernet/apple/mace.c
similarity index 100%
rename from drivers/net/mace.c
rename to drivers/net/ethernet/apple/mace.c
diff --git a/drivers/net/mace.h b/drivers/net/ethernet/apple/mace.h
similarity index 100%
rename from drivers/net/mace.h
rename to drivers/net/ethernet/apple/mace.h
diff --git a/drivers/net/macmace.c b/drivers/net/ethernet/apple/macmace.c
similarity index 100%
rename from drivers/net/macmace.c
rename to drivers/net/ethernet/apple/macmace.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 24/72] *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (22 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 23/72] bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 17:21   ` Marc Gauthier
  2011-06-25 13:58 ` [RFC 25/72] smsc*/smc911x: Move the SMSC drivers Jeff Kirsher
                   ` (50 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Thomas Bogendoerfer, Harald Welte,
	Tim Hockin, linux-ns83820, Kevin Chea, Marc Gauthier,
	Chris Zankel

Move the National Semi-conductor drivers into drivers/net/ethernet/natsemi/
and make the necessary Kconfig and Makefile changes.  Also moved the 8390
(National Semi-conductor) devices as a sub-menu of National Semi-conductor
devices.

CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
CC: Harald Welte <laforge@gnumonks.org>
CC: Tim Hockin <thockin@hockin.org>
CC: <linux-ns83820@kvack.org>
CC: Kevin Chea <kchea@yahoo.com>
CC: Marc Gauthier <marc@linux-xtensa.org>
CC: Chris Zankel <chris@zankel.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                    |    4 +-
 drivers/net/Kconfig                            |   47 ------------------
 drivers/net/Makefile                           |    6 --
 drivers/net/ethernet/8390/Kconfig              |    7 ++-
 drivers/net/ethernet/Kconfig                   |    3 +-
 drivers/net/ethernet/Makefile                  |    1 +
 drivers/net/ethernet/natsemi/Kconfig           |   63 ++++++++++++++++++++++++
 drivers/net/ethernet/natsemi/Makefile          |    9 +++
 drivers/net/{ => ethernet/natsemi}/jazzsonic.c |    0
 drivers/net/{ => ethernet/natsemi}/macsonic.c  |    0
 drivers/net/{ => ethernet/natsemi}/natsemi.c   |    0
 drivers/net/{ => ethernet/natsemi}/ns83820.c   |    0
 drivers/net/{ => ethernet/natsemi}/sonic.c     |    0
 drivers/net/{ => ethernet/natsemi}/sonic.h     |    0
 drivers/net/{ => ethernet/natsemi}/xtsonic.c   |    0
 15 files changed, 81 insertions(+), 59 deletions(-)
 create mode 100644 drivers/net/ethernet/natsemi/Kconfig
 create mode 100644 drivers/net/ethernet/natsemi/Makefile
 rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/macsonic.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/natsemi.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/ns83820.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
 rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
 rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f822c6..76e60e4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4281,7 +4281,7 @@ F:	drivers/net/ethernet/myricom/myri10ge/
 NATSEMI ETHERNET DRIVER (DP8381x)
 M:	Tim Hockin <thockin@hockin.org>
 S:	Maintained
-F:	drivers/net/natsemi.c
+F:	drivers/net/ethernet/natsemi/natsemi.c
 
 NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
 M:	Daniel Mack <zonque@gmail.com>
@@ -5852,7 +5852,7 @@ SONIC NETWORK DRIVER
 M:	Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/sonic.*
+F:	drivers/net/ethernet/natsemi/sonic.*
 
 SONICS SILICON BACKPLANE DRIVER (SSB)
 M:	Michael Buesch <mb@bu3sch.de>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 56c963a..305b8b9 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -258,19 +258,6 @@ config A2065
 	  To compile this driver as a module, choose M here: the module
 	  will be called a2065.
 
-config MACSONIC
-	tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
-	depends on MAC
-	---help---
-	  Support for NatSemi SONIC based Ethernet devices.  This includes
-	  the onboard Ethernet in many Quadras as well as some LC-PDS,
-	  a few Nubus and all known Comm Slot Ethernet cards.  If you have
-	  one of these say Y and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. This module will
-	  be called macsonic.
-
 config MVME16x_NET
 	tristate "MVME16x Ethernet support"
 	depends on MVME16x
@@ -310,19 +297,6 @@ config KORINA
 	  If you have a Mikrotik RouterBoard 500 or IDT RC32434
 	  based system say Y. Otherwise say N.
 
-config MIPS_JAZZ_SONIC
-	tristate "MIPS JAZZ onboard SONIC Ethernet support"
-	depends on MACH_JAZZ
-	help
-	  This is the driver for the onboard card of MIPS Magnum 4000,
-	  Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
-
-config XTENSA_XT2000_SONIC
-	tristate "Xtensa XT2000 onboard SONIC Ethernet support"
-	depends on XTENSA_PLATFORM_XT2000
-	help
-	  This is the driver for the onboard card of the Xtensa XT2000 board.
-
 config MIPS_AU1X00_ENET
 	tristate "MIPS AU1000 Ethernet support"
 	depends on MIPS_ALCHEMY
@@ -789,17 +763,6 @@ config FEALNX
 	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
 	  cards. <http://www.myson.com.tw/>
 
-config NATSEMI
-	tristate "National Semiconductor DP8381x series PCI Ethernet support"
-	depends on NET_PCI && PCI
-	select CRC32
-	help
-	  This driver is for the National Semiconductor DP83810 series,
-	  which is used in cards from PureData, NetGear, Linksys
-	  and others, including the 83815 chip.
-	  More specific information and updates are available from
-	  <http://www.scyld.com/network/natsemi.html>.
-
 config 8139CP
 	tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
 	depends on NET_PCI && PCI && EXPERIMENTAL
@@ -1220,16 +1183,6 @@ config IP1000
 
 source "drivers/net/ixp2000/Kconfig"
 
-config NS83820
-	tristate "National Semiconductor DP83820 support"
-	depends on PCI
-	help
-	  This is a driver for the National Semiconductor DP83820 series
-	  of gigabit ethernet MACs.  Cards using this chipset include
-	  the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,
-	  SOHO-GA2000T, SOHO-GA2500T.  The driver supports the use of
-	  zero copy.
-
 config HAMACHI
 	tristate "Packet Engines Hamachi GNIC-II support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9ac99cd..04d7613 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -45,8 +45,6 @@ obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
-obj-$(CONFIG_NATSEMI) += natsemi.o
-obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 spidernet-y += spider_net.o spider_net_ethtool.o
 obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
@@ -141,13 +139,11 @@ obj-$(CONFIG_LP486E) += lp486e.o
 obj-$(CONFIG_ETH16I) += eth16i.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
-obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
 obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_ARIADNE) += ariadne.o
-obj-$(CONFIG_MACSONIC) += macsonic.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
@@ -163,8 +159,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
 obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
 
-obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
-
 obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_S6GMAC) += s6gmac.o
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index db03f52..0d82137 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -4,9 +4,10 @@
 
 config NET_VENDOR_8390
 	bool "National Semi-conductor 8390 devices"
-	depends on AMIGA_PCMCIA || PCI || SUPERH || ISA || MCA || EISA ||  \
-		   MAC || M32R || MACH_TX49XX || MCA_LEGACY || H8300 ||  \
-		   ARM || MIPS || ZORRO || PCMCIA || EXPERIMENTAL
+	depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
+		   ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
+		   MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \
+		   EXPERIMENTAL)
 	---help---
 	  If you have a network (Ethernet) card belonging to this class, say Y
 	  and read the Ethernet-HOWTO, available from
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 28b473b..704e664 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -12,7 +12,6 @@ menuconfig ETHERNET
 if ETHERNET
 
 source "drivers/net/ethernet/3com/Kconfig"
-source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
@@ -25,6 +24,8 @@ source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
+source "drivers/net/ethernet/natsemi/Kconfig"
+source "drivers/net/ethernet/8390/Kconfig"
 
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 40dded7..e5c02d9 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
+obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
diff --git a/drivers/net/ethernet/natsemi/Kconfig b/drivers/net/ethernet/natsemi/Kconfig
new file mode 100644
index 0000000..dc1852b
--- /dev/null
+++ b/drivers/net/ethernet/natsemi/Kconfig
@@ -0,0 +1,63 @@
+#
+# National Semi-conductor device configuration
+#
+
+config NET_VENDOR_NATSEMI
+	bool "National Semi-conductor devices"
+	depends on MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000
+	---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 National Semi-conductor devices. If you say Y,
+	  you will be asked for your specific card in the following questions.
+
+config MACSONIC
+	tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
+	depends on NET_VENDOR_NATSEMI && MAC
+	---help---
+	  Support for NatSemi SONIC based Ethernet devices.  This includes
+	  the onboard Ethernet in many Quadras as well as some LC-PDS,
+	  a few Nubus and all known Comm Slot Ethernet cards.  If you have
+	  one of these say Y and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. This module will
+	  be called macsonic.
+
+config MIPS_JAZZ_SONIC
+	tristate "MIPS JAZZ onboard SONIC Ethernet support"
+	depends on NET_VENDOR_NATSEMI && MACH_JAZZ
+	---help---
+	  This is the driver for the onboard card of MIPS Magnum 4000,
+	  Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
+
+config NATSEMI
+	tristate "National Semiconductor DP8381x series PCI Ethernet support"
+	depends on NET_VENDOR_NATSEMI && PCI
+	select CRC32
+	---help---
+	  This driver is for the National Semiconductor DP83810 series,
+	  which is used in cards from PureData, NetGear, Linksys
+	  and others, including the 83815 chip.
+	  More specific information and updates are available from
+	  <http://www.scyld.com/network/natsemi.html>.
+
+config NS83820
+	tristate "National Semiconductor DP83820 support"
+	depends on NET_VENDOR_NATSEMI && PCI
+	---help---
+	  This is a driver for the National Semiconductor DP83820 series
+	  of gigabit ethernet MACs.  Cards using this chipset include
+	  the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,
+	  SOHO-GA2000T, SOHO-GA2500T.  The driver supports the use of
+	  zero copy.
+
+config XTENSA_XT2000_SONIC
+	tristate "Xtensa XT2000 onboard SONIC Ethernet support"
+	depends on NET_VENDOR_NATSEMI && XTENSA_PLATFORM_XT2000
+	---help---
+	  This is the driver for the onboard card of the Xtensa XT2000 board.
diff --git a/drivers/net/ethernet/natsemi/Makefile b/drivers/net/ethernet/natsemi/Makefile
new file mode 100644
index 0000000..764c532
--- /dev/null
+++ b/drivers/net/ethernet/natsemi/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the National Semi-conductor Sonic devices.
+#
+
+obj-$(CONFIG_MACSONIC) += macsonic.o
+obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
+obj-$(CONFIG_NATSEMI) += natsemi.o
+obj-$(CONFIG_NS83820) += ns83820.o
+obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
diff --git a/drivers/net/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
similarity index 100%
rename from drivers/net/jazzsonic.c
rename to drivers/net/ethernet/natsemi/jazzsonic.c
diff --git a/drivers/net/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
similarity index 100%
rename from drivers/net/macsonic.c
rename to drivers/net/ethernet/natsemi/macsonic.c
diff --git a/drivers/net/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
similarity index 100%
rename from drivers/net/natsemi.c
rename to drivers/net/ethernet/natsemi/natsemi.c
diff --git a/drivers/net/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
similarity index 100%
rename from drivers/net/ns83820.c
rename to drivers/net/ethernet/natsemi/ns83820.c
diff --git a/drivers/net/sonic.c b/drivers/net/ethernet/natsemi/sonic.c
similarity index 100%
rename from drivers/net/sonic.c
rename to drivers/net/ethernet/natsemi/sonic.c
diff --git a/drivers/net/sonic.h b/drivers/net/ethernet/natsemi/sonic.h
similarity index 100%
rename from drivers/net/sonic.h
rename to drivers/net/ethernet/natsemi/sonic.h
diff --git a/drivers/net/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
similarity index 100%
rename from drivers/net/xtsonic.c
rename to drivers/net/ethernet/natsemi/xtsonic.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 25/72] smsc*/smc911x: Move the SMSC drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (23 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 24/72] *sonic/natsemi/ns83829: Move the National Semi-conductor drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 26/72] arm: Move the ARM/ACORN drivers Jeff Kirsher
                   ` (49 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Dustin McIntire, Steve Glendinning

Move the SMSC drivers into drivers/net/ethernet/smsc/ and make the
necessary Kconfig and Makefile changes.

CC: Dustin McIntire <dustin@sensoria.com>
CC: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                |    4 +-
 drivers/net/Kconfig                        |   54 ---------------------
 drivers/net/Makefile                       |    3 -
 drivers/net/ethernet/Kconfig               |    1 +
 drivers/net/ethernet/Makefile              |    1 +
 drivers/net/ethernet/smsc/Kconfig          |   71 ++++++++++++++++++++++++++++
 drivers/net/ethernet/smsc/Makefile         |    7 +++
 drivers/net/{ => ethernet/smsc}/smc911x.c  |    0
 drivers/net/{ => ethernet/smsc}/smc911x.h  |    0
 drivers/net/{ => ethernet/smsc}/smsc911x.c |    0
 drivers/net/{ => ethernet/smsc}/smsc911x.h |    0
 drivers/net/{ => ethernet/smsc}/smsc9420.c |    0
 drivers/net/{ => ethernet/smsc}/smsc9420.h |    0
 13 files changed, 82 insertions(+), 59 deletions(-)
 create mode 100644 drivers/net/ethernet/smsc/Kconfig
 create mode 100644 drivers/net/ethernet/smsc/Makefile
 rename drivers/net/{ => ethernet/smsc}/smc911x.c (100%)
 rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
 rename drivers/net/{ => ethernet/smsc}/smsc911x.c (100%)
 rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
 rename drivers/net/{ => ethernet/smsc}/smsc9420.c (100%)
 rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 76e60e4..90925d9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5812,13 +5812,13 @@ M:	Steve Glendinning <steve.glendinning@smsc.com>
 L:	netdev@vger.kernel.org
 S:	Supported
 F:	include/linux/smsc911x.h
-F:	drivers/net/smsc911x.*
+F:	drivers/net/ethernet/smsc/smsc911x.*
 
 SMSC9420 PCI ETHERNET DRIVER
 M:	Steve Glendinning <steve.glendinning@smsc.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/smsc9420.*
+F:	drivers/net/ethernet/smsc/smsc9420.*
 
 SN-IA64 (Itanium) SUB-PLATFORM
 M:	Jes Sorensen <jes@sgi.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 305b8b9..a2c032c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -503,44 +503,6 @@ config GRETH
 	help
 	  Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
 
-config SMC911X
-	tristate "SMSC LAN911[5678] support"
-	select CRC32
-	select MII
-	depends on ARM || SUPERH || MN10300
-	help
-	  This is a driver for SMSC's LAN911x series of Ethernet chipsets
-	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.
-	  Say Y if you want it compiled into the kernel, 
-	  and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  This driver is also available as a module. The module will be 
-	  called smc911x.  If you want to compile it as a module, say M 
-	  here and read <file:Documentation/kbuild/modules.txt>
-
-config SMSC911X
-	tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
-	depends on ARM || SUPERH || BLACKFIN || MIPS || MN10300
-	select CRC32
-	select MII
-	select PHYLIB
-	---help---
-	  Say Y here if you want support for SMSC LAN911x and LAN921x families
-	  of ethernet controllers.
-
-	  To compile this driver as a module, choose M here and read
-	  <file:Documentation/networking/net-modules.txt>. The module
-	  will be called smsc911x.
-
-config SMSC911X_ARCH_HOOKS
-	def_bool n
-	depends on SMSC911X
-	help
-	  If the arch enables this, it allows the arch to implement various
-	  hooks for more comprehensive interrupt control and also to override
-	  the source of the MAC address.
-
 config DNET
 	tristate "Dave ethernet support (DNET)"
 	depends on NET_ETHERNET && HAS_IOMEM
@@ -859,22 +821,6 @@ config SIS900
 	  To compile this driver as a module, choose M here: the module
 	  will be called sis900.  This is recommended.
 
-config SMSC9420
-	tristate "SMSC LAN9420 PCI ethernet adapter support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select PHYLIB
-	select SMSC_PHY
-	help
-	  This is a driver for SMSC's LAN9420 PCI ethernet adapter.
-	  Say Y if you want it compiled into the kernel,
-	  and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  This driver is also available as a module. The module will be
-	  called smsc9420.  If you want to compile it as a module, say M
-	  here and read <file:Documentation/kbuild/modules.txt>
-
 config SUNDANCE
 	tristate "Sundance Alta support"
 	depends on NET_PCI && PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 04d7613..0d016c1 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_PLIP) += plip.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
 obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_SMSC9420) += smsc9420.o
 obj-$(CONFIG_SIS190) += sis190.o
 obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_R6040) += r6040.o
@@ -149,8 +148,6 @@ obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_SMC911X) += smc911x.o
-obj-$(CONFIG_SMSC911X) += smsc911x.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 704e664..4daf50d 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -40,6 +40,7 @@ source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
+source "drivers/net/ethernet/smsc/Kconfig"
 source "drivers/net/ethernet/stmicro/Kconfig"
 source "drivers/net/ethernet/sun/Kconfig"
 
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e5c02d9..2bce3e6 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
+obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
 obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
 obj-$(CONFIG_TEHUTI) += tehuti.o
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
new file mode 100644
index 0000000..6f6d36f
--- /dev/null
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -0,0 +1,71 @@
+#
+# SMSC device configuration
+#
+
+config NET_VENDOR_SMSC
+	bool "SMSC (Smart Mixed-Signal Connectivity) devices"
+	depends on ARM || SUPERH || BLACKFIN || MIPS || MN10300 || 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 SMSC devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config SMC911X
+	tristate "SMSC LAN911[5678] support"
+	depends on NET_VENDOR_SMSC && (ARM || SUPERH || MN10300)
+	select CRC32
+	select MII
+	---help---
+	  This is a driver for SMSC's LAN911x series of Ethernet chipsets
+	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.
+	  Say Y if you want it compiled into the kernel,
+	  and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  This driver is also available as a module. The module will be
+	  called smc911x.  If you want to compile it as a module, say M
+	  here and read <file:Documentation/kbuild/modules.txt>
+
+config SMSC911X
+	tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
+	depends on NET_VENDOR_SMSC && (ARM || SUPERH || BLACKFIN || MIPS || \
+		 MN10300)
+	select CRC32
+	select MII
+	select PHYLIB
+	---help---
+	  Say Y here if you want support for SMSC LAN911x and LAN921x families
+	  of ethernet controllers.
+
+	  To compile this driver as a module, choose M here and read
+	  <file:Documentation/networking/net-modules.txt>. The module
+	  will be called smsc911x.
+
+config SMSC911X_ARCH_HOOKS
+	def_bool n
+	depends on SMSC911X
+	---help---
+	  If the arch enables this, it allows the arch to implement various
+	  hooks for more comprehensive interrupt control and also to override
+	  the source of the MAC address.
+
+config SMSC9420
+	tristate "SMSC LAN9420 PCI ethernet adapter support"
+	depends on NET_VENDOR_SMSC && PCI
+	select CRC32
+	select PHYLIB
+	select SMSC_PHY
+	---help---
+	  This is a driver for SMSC's LAN9420 PCI ethernet adapter.
+	  Say Y if you want it compiled into the kernel,
+	  and read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  This driver is also available as a module. The module will be
+	  called smsc9420.  If you want to compile it as a module, say M
+	  here and read <file:Documentation/kbuild/modules.txt>
diff --git a/drivers/net/ethernet/smsc/Makefile b/drivers/net/ethernet/smsc/Makefile
new file mode 100644
index 0000000..7520c7c
--- /dev/null
+++ b/drivers/net/ethernet/smsc/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the SMSC network device drivers.
+#
+
+obj-$(CONFIG_SMC911X) += smc911x.o
+obj-$(CONFIG_SMSC911X) += smsc911x.o
+obj-$(CONFIG_SMSC9420) += smsc9420.o
diff --git a/drivers/net/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
similarity index 100%
rename from drivers/net/smc911x.c
rename to drivers/net/ethernet/smsc/smc911x.c
diff --git a/drivers/net/smc911x.h b/drivers/net/ethernet/smsc/smc911x.h
similarity index 100%
rename from drivers/net/smc911x.h
rename to drivers/net/ethernet/smsc/smc911x.h
diff --git a/drivers/net/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
similarity index 100%
rename from drivers/net/smsc911x.c
rename to drivers/net/ethernet/smsc/smsc911x.c
diff --git a/drivers/net/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h
similarity index 100%
rename from drivers/net/smsc911x.h
rename to drivers/net/ethernet/smsc/smsc911x.h
diff --git a/drivers/net/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
similarity index 100%
rename from drivers/net/smsc9420.c
rename to drivers/net/ethernet/smsc/smsc9420.c
diff --git a/drivers/net/smsc9420.h b/drivers/net/ethernet/smsc/smsc9420.h
similarity index 100%
rename from drivers/net/smsc9420.h
rename to drivers/net/ethernet/smsc/smsc9420.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (24 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 25/72] smsc*/smc911x: Move the SMSC drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 14:48   ` Arnd Bergmann
  2011-06-25 13:58 ` [RFC 27/72] ftgmac100/ftmac100: Move the Faraday drivers Jeff Kirsher
                   ` (48 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Sriram, Vinay Hegde, Cyril Chemparathy,
	Russell King, Wan ZongShun, Lennert Buytenhek, Krzysztof Halasa

Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
necessary Kconfig and Makefile changes.
There were 4 drivers (TI Davinci & ftmac100) not in the
drivers/net/arm/ which should have been since they are only supported
under ARM, so they were added to the new directory structure.

NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
CC'ing the last 3 major contributors from TI.

CC: Sriram <srk@ti.com>
CC: Vinay Hegde <vinay.hegde@ti.com>
CC: Cyril Chemparathy <cyril@ti.com>
CC: Russell King <linux@arm.linux.org.uk>
CC: Wan ZongShun <mcuos.com@gmail.com>
CC: Lennert Buytenhek <kernel@wantstofly.org>
CC: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                    |   10 +-
 drivers/net/Kconfig                            |   33 -------
 drivers/net/Makefile                           |    5 -
 drivers/net/arm/Kconfig                        |   74 ---------------
 drivers/net/ethernet/Kconfig                   |    1 +
 drivers/net/ethernet/Makefile                  |    1 +
 drivers/net/ethernet/arm/Kconfig               |  120 ++++++++++++++++++++++++
 drivers/net/{ => ethernet}/arm/Makefile        |    4 +-
 drivers/net/{ => ethernet}/arm/am79c961a.c     |    0
 drivers/net/{ => ethernet}/arm/am79c961a.h     |    0
 drivers/net/{ => ethernet}/arm/at91_ether.c    |    0
 drivers/net/{ => ethernet}/arm/at91_ether.h    |    0
 drivers/net/{ => ethernet/arm}/davinci_cpdma.c |    0
 drivers/net/{ => ethernet/arm}/davinci_cpdma.h |    0
 drivers/net/{ => ethernet/arm}/davinci_emac.c  |    0
 drivers/net/{ => ethernet/arm}/davinci_mdio.c  |    0
 drivers/net/{ => ethernet}/arm/ep93xx_eth.c    |    0
 drivers/net/{ => ethernet}/arm/ether1.c        |    0
 drivers/net/{ => ethernet}/arm/ether1.h        |    0
 drivers/net/{ => ethernet}/arm/ether3.c        |    0
 drivers/net/{ => ethernet}/arm/ether3.h        |    0
 drivers/net/{ => ethernet}/arm/etherh.c        |    0
 drivers/net/{ => ethernet}/arm/ixp4xx_eth.c    |    0
 drivers/net/{ => ethernet}/arm/ks8695net.c     |    0
 drivers/net/{ => ethernet}/arm/ks8695net.h     |    0
 drivers/net/{ => ethernet}/arm/w90p910_ether.c |    0
 26 files changed, 130 insertions(+), 118 deletions(-)
 delete mode 100644 drivers/net/arm/Kconfig
 create mode 100644 drivers/net/ethernet/arm/Kconfig
 rename drivers/net/{ => ethernet}/arm/Makefile (74%)
 rename drivers/net/{ => ethernet}/arm/am79c961a.c (100%)
 rename drivers/net/{ => ethernet}/arm/am79c961a.h (100%)
 rename drivers/net/{ => ethernet}/arm/at91_ether.c (100%)
 rename drivers/net/{ => ethernet}/arm/at91_ether.h (100%)
 rename drivers/net/{ => ethernet/arm}/davinci_cpdma.c (100%)
 rename drivers/net/{ => ethernet/arm}/davinci_cpdma.h (100%)
 rename drivers/net/{ => ethernet/arm}/davinci_emac.c (100%)
 rename drivers/net/{ => ethernet/arm}/davinci_mdio.c (100%)
 rename drivers/net/{ => ethernet}/arm/ep93xx_eth.c (100%)
 rename drivers/net/{ => ethernet}/arm/ether1.c (100%)
 rename drivers/net/{ => ethernet}/arm/ether1.h (100%)
 rename drivers/net/{ => ethernet}/arm/ether3.c (100%)
 rename drivers/net/{ => ethernet}/arm/ether3.h (100%)
 rename drivers/net/{ => ethernet}/arm/etherh.c (100%)
 rename drivers/net/{ => ethernet}/arm/ixp4xx_eth.c (100%)
 rename drivers/net/{ => ethernet}/arm/ks8695net.c (100%)
 rename drivers/net/{ => ethernet}/arm/ks8695net.h (100%)
 rename drivers/net/{ => ethernet}/arm/w90p910_ether.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 90925d9..7469e6c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -726,7 +726,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:	http://www.arm.linux.org.uk/
 S:	Maintained
 F:	arch/arm/mach-ebsa110/
-F:	drivers/net/arm/am79c961a.*
+F:	drivers/net/ethernet/arm/am79c961a.*
 
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 M:	Daniel Ribeiro <drwyrm@gmail.com>
@@ -995,7 +995,7 @@ F:	arch/arm/include/asm/hardware/ioc.h
 F:	arch/arm/include/asm/hardware/iomd.h
 F:	arch/arm/include/asm/hardware/memc.h
 F:	arch/arm/mach-rpc/
-F:	drivers/net/arm/ether*
+F:	drivers/net/ethernet/arm/ether*
 F:	drivers/scsi/arm/
 
 ARM/SHARK MACHINE SUPPORT
@@ -1107,7 +1107,7 @@ F:	arch/arm/mach-nuc93x/
 F:	drivers/input/keyboard/w90p910_keypad.c
 F:	drivers/input/touchscreen/w90p910_ts.c
 F:	drivers/watchdog/nuc900_wdt.c
-F:	drivers/net/arm/w90p910_ether.c
+F:	drivers/net/ethernet/arm/w90p910_ether.c
 F:	drivers/mtd/nand/nuc900_nand.c
 F:	drivers/rtc/rtc-nuc900.c
 F:	drivers/spi/spi_nuc900.c
@@ -1741,7 +1741,7 @@ CIRRUS LOGIC EP93XX ETHERNET DRIVER
 M:	Hartley Sweeten <hsweeten@visionengravers.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/arm/ep93xx_eth.c
+F:	drivers/net/ethernet/arm/ep93xx_eth.c
 
 CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
 M:	Lennert Buytenhek <kernel@wantstofly.org>
@@ -3287,7 +3287,7 @@ F:	arch/arm/mach-ixp4xx/include/mach/qmgr.h
 F:	arch/arm/mach-ixp4xx/include/mach/npe.h
 F:	arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
 F:	arch/arm/mach-ixp4xx/ixp4xx_npe.c
-F:	drivers/net/arm/ixp4xx_eth.c
+F:	drivers/net/ethernet/arm/ixp4xx_eth.c
 F:	drivers/net/wan/ixp4xx_hss.c
 
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a2c032c..3568fc2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -235,8 +235,6 @@ config MACB
 	  To compile this driver as a module, choose M here: the module
 	  will be called macb.
 
-source "drivers/net/arm/Kconfig"
-
 config ARIADNE
 	tristate "Ariadne support"
 	depends on ZORRO
@@ -409,37 +407,6 @@ config NET_NETX
 	  To compile this driver as a module, choose M here. The module
 	  will be called netx-eth.
 
-config TI_DAVINCI_EMAC
-	tristate "TI DaVinci EMAC Support"
-	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
-	select TI_DAVINCI_MDIO
-	select TI_DAVINCI_CPDMA
-	select PHYLIB
-	help
-	  This driver supports TI's DaVinci Ethernet .
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called davinci_emac_driver.  This is recommended.
-
-config TI_DAVINCI_MDIO
-	tristate "TI DaVinci MDIO Support"
-	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
-	select PHYLIB
-	help
-	  This driver supports TI's DaVinci MDIO module.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called davinci_mdio.  This is recommended.
-
-config TI_DAVINCI_CPDMA
-	tristate "TI DaVinci CPDMA Support"
-	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
-	help
-	  This driver supports TI's DaVinci CPDMA dma engine.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called davinci_cpdma.  This is recommended.
-
 config DM9000
 	tristate "DM9000 support"
 	depends on ARM || BLACKFIN || MIPS
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0d016c1..d3eb443 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -6,10 +6,6 @@ obj-$(CONFIG_MII) += mii.o
 obj-$(CONFIG_MDIO) += mdio.o
 obj-$(CONFIG_PHYLIB) += phy/
 
-obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
-obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
-obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
-
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
@@ -160,7 +156,6 @@ obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 
-obj-$(CONFIG_ARM) += arm/
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
 obj-$(CONFIG_TR) += tokenring/
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
deleted file mode 100644
index 39e1c0d..0000000
--- a/drivers/net/arm/Kconfig
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Acorn Network device configuration
-#  These are for Acorn's Expansion card network interfaces
-#
-config ARM_AM79C961A
-	bool "ARM EBSA110 AM79C961A support"
-	depends on ARM && ARCH_EBSA110
-	select CRC32
-	help
-	  If you wish to compile a kernel for the EBSA-110, then you should
-	  always answer Y to this.
-
-config ARM_ETHER1
-	tristate "Acorn Ether1 support"
-	depends on ARM && ARCH_ACORN
-	help
-	  If you have an Acorn system with one of these (AKA25) network cards,
-	  you should say Y to this option if you wish to use it with Linux.
-
-config ARM_ETHER3
-	tristate "Acorn/ANT Ether3 support"
-	depends on ARM && ARCH_ACORN
-	help
-	  If you have an Acorn system with one of these network cards, you
-	  should say Y to this option if you wish to use it with Linux.
-
-config ARM_ETHERH
-	tristate "I-cubed EtherH/ANT EtherM support"
-	depends on ARM && ARCH_ACORN
-	select CRC32
-	help
-	  If you have an Acorn system with one of these network cards, you
-	  should say Y to this option if you wish to use it with Linux.
-
-config ARM_AT91_ETHER
-	tristate "AT91RM9200 Ethernet support"
-	depends on ARM && ARCH_AT91RM9200
-	select MII
-	help
-	  If you wish to compile a kernel for the AT91RM9200 and enable
-	  ethernet support, then you should always answer Y to this.
-
-config ARM_KS8695_ETHER
-	tristate "KS8695 Ethernet support"
-	depends on ARM && ARCH_KS8695
-	select MII
-	help
-	  If you wish to compile a kernel for the KS8695 and want to
-	  use the internal ethernet then you should answer Y to this.
-
-config EP93XX_ETH
-	tristate "EP93xx Ethernet support"
-	depends on ARM && ARCH_EP93XX
-	select MII
-	help
-	  This is a driver for the ethernet hardware included in EP93xx CPUs.
-	  Say Y if you are building a kernel for EP93xx based devices.
-
-config IXP4XX_ETH
-	tristate "Intel IXP4xx Ethernet support"
-	depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
-	select PHYLIB
-	help
-	  Say Y here if you want to use built-in Ethernet ports
-	  on IXP4xx processor.
-
-config W90P910_ETH
-	tristate "Nuvoton w90p910 Ethernet support"
-	depends on ARM && ARCH_W90X900
-	select PHYLIB
-	select MII
-	help
-	  Say Y here if you want to use built-in Ethernet ports
-	  on w90p910 processor.
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 4daf50d..76fcaae 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -14,6 +14,7 @@ if ETHERNET
 source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
+source "drivers/net/ethernet/arm/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 2bce3e6..0bdb3ed 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
+obj-$(CONFIG_NET_ARM) += arm/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/arm/Kconfig b/drivers/net/ethernet/arm/Kconfig
new file mode 100644
index 0000000..73e66b7
--- /dev/null
+++ b/drivers/net/ethernet/arm/Kconfig
@@ -0,0 +1,120 @@
+#
+# ARM/Acorn Network device configuration
+#
+
+config NET_ARM
+	bool "ARM devices"
+	depends on ARM
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y.
+	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  If unsure, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the remaining ARM network card questions. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config ARM_AM79C961A
+	bool "ARM EBSA110 AM79C961A support"
+	depends on NET_ARM && ARM && ARCH_EBSA110
+	select CRC32
+	---help---
+	  If you wish to compile a kernel for the EBSA-110, then you should
+	  always answer Y to this.
+
+config ARM_ETHER1
+	tristate "Acorn Ether1 support"
+	depends on NET_ARM && ARM && ARCH_ACORN
+	---help---
+	  If you have an Acorn system with one of these (AKA25) network cards,
+	  you should say Y to this option if you wish to use it with Linux.
+
+config ARM_ETHER3
+	tristate "Acorn/ANT Ether3 support"
+	depends on NET_ARM && ARM && ARCH_ACORN
+	---help---
+	  If you have an Acorn system with one of these network cards, you
+	  should say Y to this option if you wish to use it with Linux.
+
+config ARM_AT91_ETHER
+	tristate "AT91RM9200 Ethernet support"
+	depends on NET_ARM && ARM && ARCH_AT91RM9200
+	select MII
+	---help---
+	  If you wish to compile a kernel for the AT91RM9200 and enable
+	  ethernet support, then you should always answer Y to this.
+
+config EP93XX_ETH
+	tristate "EP93xx Ethernet support"
+	depends on NET_ARM && ARM && ARCH_EP93XX
+	select MII
+	---help---
+	  This is a driver for the ethernet hardware included in EP93xx CPUs.
+	  Say Y if you are building a kernel for EP93xx based devices.
+
+config ARM_ETHERH
+	tristate "I-cubed EtherH/ANT EtherM support"
+	depends on NET_ARM && ARM && ARCH_ACORN
+	select CRC32
+	---help---
+	  If you have an Acorn system with one of these network cards, you
+	  should say Y to this option if you wish to use it with Linux.
+
+config IXP4XX_ETH
+	tristate "Intel IXP4xx Ethernet support"
+	depends on NET_ARM && ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
+	select PHYLIB
+	---help---
+	  Say Y here if you want to use built-in Ethernet ports
+	  on IXP4xx processor.
+
+config ARM_KS8695_ETHER
+	tristate "KS8695 Ethernet support"
+	depends on NET_ARM && ARM && ARCH_KS8695
+	select MII
+	---help---
+	  If you wish to compile a kernel for the KS8695 and want to
+	  use the internal ethernet then you should answer Y to this.
+
+config W90P910_ETH
+	tristate "Nuvoton w90p910 Ethernet support"
+	depends on NET_ARM && ARM && ARCH_W90X900
+	select PHYLIB
+	select MII
+	---help---
+	  Say Y here if you want to use built-in Ethernet ports
+	  on w90p910 processor.
+
+config TI_DAVINCI_EMAC
+	tristate "TI DaVinci EMAC Support"
+	depends on NET_ARM && ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
+	select TI_DAVINCI_MDIO
+	select TI_DAVINCI_CPDMA
+	select PHYLIB
+	---help---
+	  This driver supports TI's DaVinci Ethernet .
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called davinci_emac_driver.  This is recommended.
+
+config TI_DAVINCI_MDIO
+	tristate "TI DaVinci MDIO Support"
+	depends on NET_ARM && ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
+	select PHYLIB
+	---help---
+	  This driver supports TI's DaVinci MDIO module.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called davinci_mdio.  This is recommended.
+
+config TI_DAVINCI_CPDMA
+	tristate "TI DaVinci CPDMA Support"
+	depends on NET_ARM && ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
+	---help---
+	  This driver supports TI's DaVinci CPDMA dma engine.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called davinci_cpdma.  This is recommended.
diff --git a/drivers/net/arm/Makefile b/drivers/net/ethernet/arm/Makefile
similarity index 74%
rename from drivers/net/arm/Makefile
rename to drivers/net/ethernet/arm/Makefile
index 303171f..f2fb6ad 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/ethernet/arm/Makefile
@@ -1,4 +1,3 @@
-# File: drivers/net/arm/Makefile
 #
 # Makefile for the ARM network device drivers
 #
@@ -12,3 +11,6 @@ obj-$(CONFIG_ARM_KS8695_ETHER)	+= ks8695net.o
 obj-$(CONFIG_EP93XX_ETH)	+= ep93xx_eth.o
 obj-$(CONFIG_IXP4XX_ETH)	+= ixp4xx_eth.o
 obj-$(CONFIG_W90P910_ETH)	+= w90p910_ether.o
+obj-$(CONFIG_TI_DAVINCI_EMAC)	+= davinci_emac.o
+obj-$(CONFIG_TI_DAVINCI_MDIO)	+= davinci_mdio.o
+obj-$(CONFIG_TI_DAVINCI_CPDMA)	+= davinci_cpdma.o
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/ethernet/arm/am79c961a.c
similarity index 100%
rename from drivers/net/arm/am79c961a.c
rename to drivers/net/ethernet/arm/am79c961a.c
diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/ethernet/arm/am79c961a.h
similarity index 100%
rename from drivers/net/arm/am79c961a.h
rename to drivers/net/ethernet/arm/am79c961a.h
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/ethernet/arm/at91_ether.c
similarity index 100%
rename from drivers/net/arm/at91_ether.c
rename to drivers/net/ethernet/arm/at91_ether.c
diff --git a/drivers/net/arm/at91_ether.h b/drivers/net/ethernet/arm/at91_ether.h
similarity index 100%
rename from drivers/net/arm/at91_ether.h
rename to drivers/net/ethernet/arm/at91_ether.h
diff --git a/drivers/net/davinci_cpdma.c b/drivers/net/ethernet/arm/davinci_cpdma.c
similarity index 100%
rename from drivers/net/davinci_cpdma.c
rename to drivers/net/ethernet/arm/davinci_cpdma.c
diff --git a/drivers/net/davinci_cpdma.h b/drivers/net/ethernet/arm/davinci_cpdma.h
similarity index 100%
rename from drivers/net/davinci_cpdma.h
rename to drivers/net/ethernet/arm/davinci_cpdma.h
diff --git a/drivers/net/davinci_emac.c b/drivers/net/ethernet/arm/davinci_emac.c
similarity index 100%
rename from drivers/net/davinci_emac.c
rename to drivers/net/ethernet/arm/davinci_emac.c
diff --git a/drivers/net/davinci_mdio.c b/drivers/net/ethernet/arm/davinci_mdio.c
similarity index 100%
rename from drivers/net/davinci_mdio.c
rename to drivers/net/ethernet/arm/davinci_mdio.c
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/ethernet/arm/ep93xx_eth.c
similarity index 100%
rename from drivers/net/arm/ep93xx_eth.c
rename to drivers/net/ethernet/arm/ep93xx_eth.c
diff --git a/drivers/net/arm/ether1.c b/drivers/net/ethernet/arm/ether1.c
similarity index 100%
rename from drivers/net/arm/ether1.c
rename to drivers/net/ethernet/arm/ether1.c
diff --git a/drivers/net/arm/ether1.h b/drivers/net/ethernet/arm/ether1.h
similarity index 100%
rename from drivers/net/arm/ether1.h
rename to drivers/net/ethernet/arm/ether1.h
diff --git a/drivers/net/arm/ether3.c b/drivers/net/ethernet/arm/ether3.c
similarity index 100%
rename from drivers/net/arm/ether3.c
rename to drivers/net/ethernet/arm/ether3.c
diff --git a/drivers/net/arm/ether3.h b/drivers/net/ethernet/arm/ether3.h
similarity index 100%
rename from drivers/net/arm/ether3.h
rename to drivers/net/ethernet/arm/ether3.h
diff --git a/drivers/net/arm/etherh.c b/drivers/net/ethernet/arm/etherh.c
similarity index 100%
rename from drivers/net/arm/etherh.c
rename to drivers/net/ethernet/arm/etherh.c
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/ethernet/arm/ixp4xx_eth.c
similarity index 100%
rename from drivers/net/arm/ixp4xx_eth.c
rename to drivers/net/ethernet/arm/ixp4xx_eth.c
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/ethernet/arm/ks8695net.c
similarity index 100%
rename from drivers/net/arm/ks8695net.c
rename to drivers/net/ethernet/arm/ks8695net.c
diff --git a/drivers/net/arm/ks8695net.h b/drivers/net/ethernet/arm/ks8695net.h
similarity index 100%
rename from drivers/net/arm/ks8695net.h
rename to drivers/net/ethernet/arm/ks8695net.h
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/ethernet/arm/w90p910_ether.c
similarity index 100%
rename from drivers/net/arm/w90p910_ether.c
rename to drivers/net/ethernet/arm/w90p910_ether.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 27/72] ftgmac100/ftmac100: Move the Faraday drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (25 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 26/72] arm: Move the ARM/ACORN drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-27  1:51   ` Po-Yu Chuang
  2011-06-25 13:58 ` [RFC 28/72] 8139*/atp/r8169: Move the Realtek drivers Jeff Kirsher
                   ` (47 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Po-Yu Chuang, Po-Yu Chuang

Move the Faraday driver into drivers/net/ethernet/faraday/ and
make the necessary Kconfig and Makefile changes.

CC: "Po-Yu Chuang" <ratbert@faraday-tech.com>
CC: "Po-Yu Chuang" <ratbert.chuang@gmail.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                            |   18 ------------
 drivers/net/Makefile                           |    2 -
 drivers/net/ethernet/Kconfig                   |    1 +
 drivers/net/ethernet/Makefile                  |    1 +
 drivers/net/ethernet/faraday/Kconfig           |   34 ++++++++++++++++++++++++
 drivers/net/ethernet/faraday/Makefile          |    6 ++++
 drivers/net/{ => ethernet/faraday}/ftgmac100.c |    0
 drivers/net/{ => ethernet/faraday}/ftgmac100.h |    0
 drivers/net/{ => ethernet/faraday}/ftmac100.c  |    0
 drivers/net/{ => ethernet/faraday}/ftmac100.h  |    0
 10 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 drivers/net/ethernet/faraday/Kconfig
 create mode 100644 drivers/net/ethernet/faraday/Makefile
 rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
 rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
 rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
 rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3568fc2..c819982 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1027,15 +1027,6 @@ config XILINX_EMACLITE
 	help
 	  This driver supports the 10/100 Ethernet Lite from Xilinx.
 
-config FTMAC100
-	tristate "Faraday FTMAC100 10/100 Ethernet support"
-	depends on ARM
-	select MII
-	help
-	  This driver supports the FTMAC100 10/100 Ethernet controller
-	  from Faraday. It is used on Faraday A320, Andes AG101 and some
-	  other ARM/NDS32 SoC's.
-
 config LANTIQ_ETOP
 	tristate "Lantiq SoC ETOP driver"
 	depends on SOC_TYPE_XWAY
@@ -1384,15 +1375,6 @@ config PCH_GBE
 	  ML7223 is companion chip for Intel Atom E6xx series.
 	  ML7223 is completely compatible for Intel EG20T PCH.
 
-config FTGMAC100
-	tristate "Faraday FTGMAC100 Gigabit Ethernet support"
-	depends on ARM
-	select PHYLIB
-	help
-	  This driver supports the FTGMAC100 Gigabit Ethernet controller
-	  from Faraday. It is used on Faraday A369, Andes AG102 and some
-	  other ARM/NDS32 SoC's.
-
 endif # NETDEV_1000
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d3eb443..2d50791 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -77,8 +77,6 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
 endif
 obj-$(CONFIG_68360_ENET) += 68360enet.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_FTGMAC100) += ftgmac100.o
-obj-$(CONFIG_FTMAC100) += ftmac100.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 76fcaae..ca05127 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -21,6 +21,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/cisco/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
+source "drivers/net/ethernet/faraday/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0bdb3ed..803882c 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
+obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig
new file mode 100644
index 0000000..32eaee9
--- /dev/null
+++ b/drivers/net/ethernet/faraday/Kconfig
@@ -0,0 +1,34 @@
+#
+# Faraday device configuration
+#
+
+config NET_VENDOR_FARADAY
+	bool "Faraday devices"
+	depends on ARM
+	---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 Faraday cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config FTMAC100
+	tristate "Faraday FTMAC100 10/100 Ethernet support"
+	depends on NET_VENDOR_FARADAY && ARM
+	select MII
+	---help---
+	  This driver supports the FTMAC100 10/100 Ethernet controller
+	  from Faraday. It is used on Faraday A320, Andes AG101 and some
+	  other ARM/NDS32 SoC's.
+
+config FTGMAC100
+	tristate "Faraday FTGMAC100 Gigabit Ethernet support"
+	depends on NET_VENDOR_FARADAY && ARM
+	select PHYLIB
+	---help---
+	  This driver supports the FTGMAC100 Gigabit Ethernet controller
+	  from Faraday. It is used on Faraday A369, Andes AG102 and some
+	  other ARM/NDS32 SoC's.
diff --git a/drivers/net/ethernet/faraday/Makefile b/drivers/net/ethernet/faraday/Makefile
new file mode 100644
index 0000000..408b539
--- /dev/null
+++ b/drivers/net/ethernet/faraday/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Faraday device drivers.
+#
+
+obj-$(CONFIG_FTGMAC100) += ftgmac100.o
+obj-$(CONFIG_FTMAC100) += ftmac100.o
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
similarity index 100%
rename from drivers/net/ftgmac100.c
rename to drivers/net/ethernet/faraday/ftgmac100.c
diff --git a/drivers/net/ftgmac100.h b/drivers/net/ethernet/faraday/ftgmac100.h
similarity index 100%
rename from drivers/net/ftgmac100.h
rename to drivers/net/ethernet/faraday/ftgmac100.h
diff --git a/drivers/net/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
similarity index 100%
rename from drivers/net/ftmac100.c
rename to drivers/net/ethernet/faraday/ftmac100.c
diff --git a/drivers/net/ftmac100.h b/drivers/net/ethernet/faraday/ftmac100.h
similarity index 100%
rename from drivers/net/ftmac100.h
rename to drivers/net/ethernet/faraday/ftmac100.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 28/72] 8139*/atp/r8169: Move the Realtek drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (26 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 27/72] ftgmac100/ftmac100: Move the Faraday drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 29/72] de6*/dl2k: Move the D-Link drivers Jeff Kirsher
                   ` (46 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Realtek linux nic maintainers,
	Francois Romieu, Jeff Garzik, Donald Becker

Move the Realtek drivers into drivers/net/ethernet/realtek/ and make
the necessary Kconfig and Makefile changes.

CC: Realtek linux nic maintainers <nic_swsd@realtek.com>
CC: Francois Romieu <romieu@fr.zoreil.com>
CC: Jeff Garzik <jgarzik@pobox.com>
CC: Donald Becker <becker@scyld.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                  |    2 +-
 drivers/net/Kconfig                          |   94 ----------------------
 drivers/net/Makefile                         |    4 -
 drivers/net/ethernet/Kconfig                 |    1 +
 drivers/net/ethernet/Makefile                |    1 +
 drivers/net/{ => ethernet/realtek}/8139cp.c  |    0
 drivers/net/{ => ethernet/realtek}/8139too.c |    0
 drivers/net/ethernet/realtek/Kconfig         |  110 ++++++++++++++++++++++++++
 drivers/net/ethernet/realtek/Makefile        |    8 ++
 drivers/net/{ => ethernet/realtek}/atp.c     |    0
 drivers/net/{ => ethernet/realtek}/atp.h     |    0
 drivers/net/{ => ethernet/realtek}/r8169.c   |    0
 12 files changed, 121 insertions(+), 99 deletions(-)
 rename drivers/net/{ => ethernet/realtek}/8139cp.c (100%)
 rename drivers/net/{ => ethernet/realtek}/8139too.c (100%)
 create mode 100644 drivers/net/ethernet/realtek/Kconfig
 create mode 100644 drivers/net/ethernet/realtek/Makefile
 rename drivers/net/{ => ethernet/realtek}/atp.c (100%)
 rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
 rename drivers/net/{ => ethernet/realtek}/r8169.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7469e6c..a0ccbea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -155,7 +155,7 @@ M:	Realtek linux nic maintainers <nic_swsd@realtek.com>
 M:	Francois Romieu <romieu@fr.zoreil.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/r8169.c
+F:	drivers/net/ethernet/realtek/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 M:	Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c819982..03bf50b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -692,73 +692,6 @@ config FEALNX
 	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
 	  cards. <http://www.myson.com.tw/>
 
-config 8139CP
-	tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
-	depends on NET_PCI && PCI && EXPERIMENTAL
-	select CRC32
-	select MII
-	help
-	  This is a driver for the Fast Ethernet PCI network cards based on
-	  the RTL8139C+ chips. If you have one of those, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called 8139cp.  This is recommended.
-
-config 8139TOO
-	tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	---help---
-	  This is a driver for the Fast Ethernet PCI network cards based on
-	  the RTL 8129/8130/8139 chips. If you have one of those, say Y and
-	  read the Ethernet-HOWTO <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called 8139too.  This is recommended.
-
-config 8139TOO_PIO
-	bool "Use PIO instead of MMIO"
-	default y
-	depends on 8139TOO
-	help
-	  This instructs the driver to use programmed I/O ports (PIO) instead
-	  of PCI shared memory (MMIO).  This can possibly solve some problems
-	  in case your mainboard has memory consistency issues.  If unsure,
-	  say N.
-
-config 8139TOO_TUNE_TWISTER
-	bool "Support for uncommon RTL-8139 rev. K (automatic channel equalization)"
-	depends on 8139TOO
-	help
-	  This implements a function which might come in handy in case you
-	  are using low quality on long cabling. It is required for RealTek
-	  RTL-8139 revision K boards, and totally unused otherwise.  It tries
-	  to match the transceiver to the cable characteristics. This is
-	  experimental since hardly documented by the manufacturer.
-	  If unsure, say Y.
-
-config 8139TOO_8129
-	bool "Support for older RTL-8129/8130 boards"
-	depends on 8139TOO
-	help
-	  This enables support for the older and uncommon RTL-8129 and
-	  RTL-8130 chips, which support MII via an external transceiver,
-	  instead of an internal one.  Disabling this option will save some
-	  memory by making the code size smaller.  If unsure, say Y.
-
-config 8139_OLD_RX_RESET
-	bool "Use older RX-reset method"
-	depends on 8139TOO
-	help
-	  The 8139too driver was recently updated to contain a more rapid
-	  reset sequence, in the face of severe receive errors.  This "new"
-	  RX-reset method should be adequate for all boards.  But if you
-	  experience problems, you can enable this option to restore the
-	  old RX-reset behavior.  If unsure, say N.
-
 config R6040
 	tristate "RDC R6040 Fast Ethernet Adapter support"
 	depends on NET_PCI && PCI
@@ -917,21 +850,6 @@ config NET_POCKET
 	  the questions about this class of network devices. If you say Y, you
 	  will be asked for your specific device in the following questions.
 
-config ATP
-	tristate "AT-LAN-TEC/RealTek pocket adapter support"
-	depends on NET_POCKET && PARPORT && X86
-	select CRC32
-	---help---
-	  This is a network (Ethernet) device which attaches to your parallel
-	  port. Read <file:drivers/net/atp.c> as well as the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>, if you
-	  want to use this.  If you intend to use this driver, you should have
-	  said N to the "Parallel printer support", because the two drivers
-	  don't like each other.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called atp.
-
 config DE600
 	tristate "D-Link DE600 pocket adapter support"
 	depends on NET_POCKET && PARPORT
@@ -1113,18 +1031,6 @@ config YELLOWFIN
 	  To compile this driver as a module, choose M here: the module
 	  will be called yellowfin.  This is recommended.
 
-config R8169
-	tristate "Realtek 8169 gigabit ethernet support"
-	depends on PCI
-	select FW_LOADER
-	select CRC32
-	select MII
-	---help---
-	  Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called r8169.  This is recommended.
-
 config SIS190
 	tristate "SiS190/SiS191 gigabit ethernet support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2d50791..74beb4a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -112,13 +112,10 @@ obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_EEXPRESS) += eexpress.o
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
-obj-$(CONFIG_8139CP) += 8139cp.o
-obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ZNET) += znet.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_EWRK3) += ewrk3.o
-obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_APRICOT) += 82596.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_SNI_82596) += sni_82596.o
@@ -141,7 +138,6 @@ obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
-obj-$(CONFIG_R8169) += r8169.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ca05127..3613d2d 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -40,6 +40,7 @@ config PASEMI_MAC
 
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
+source "drivers/net/ethernet/realtek/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
 source "drivers/net/ethernet/smsc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 803882c..c1b6275 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
+obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
similarity index 100%
rename from drivers/net/8139cp.c
rename to drivers/net/ethernet/realtek/8139cp.c
diff --git a/drivers/net/8139too.c b/drivers/net/ethernet/realtek/8139too.c
similarity index 100%
rename from drivers/net/8139too.c
rename to drivers/net/ethernet/realtek/8139too.c
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
new file mode 100644
index 0000000..eb8b89f
--- /dev/null
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -0,0 +1,110 @@
+#
+# Realtek device configuration
+#
+
+config NET_VENDOR_REALTEK
+	bool "Realtek devices"
+	depends on X86 || PCI || PARPORT
+	---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 Realtek devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config ATP
+	tristate "AT-LAN-TEC/RealTek pocket adapter support"
+	depends on NET_VENDOR_REALTEK && PARPORT && X86
+	select CRC32
+	---help---
+	  This is a network (Ethernet) device which attaches to your parallel
+	  port. Read <file:drivers/net/atp.c> as well as the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>, if you
+	  want to use this.  If you intend to use this driver, you should have
+	  said N to the "Parallel printer support", because the two drivers
+	  don't like each other.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called atp.
+
+config 8139CP
+	tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
+	depends on NET_VENDOR_REALTEK && PCI && EXPERIMENTAL
+	select CRC32
+	select MII
+	---help---
+	  This is a driver for the Fast Ethernet PCI network cards based on
+	  the RTL8139C+ chips. If you have one of those, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called 8139cp.  This is recommended.
+
+config 8139TOO
+	tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support"
+	depends on NET_VENDOR_REALTEK && PCI
+	select CRC32
+	select MII
+	---help---
+	  This is a driver for the Fast Ethernet PCI network cards based on
+	  the RTL 8129/8130/8139 chips. If you have one of those, say Y and
+	  read the Ethernet-HOWTO <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called 8139too.  This is recommended.
+
+config 8139TOO_PIO
+	bool "Use PIO instead of MMIO"
+	default y
+	depends on 8139TOO
+	---help---
+	  This instructs the driver to use programmed I/O ports (PIO) instead
+	  of PCI shared memory (MMIO).  This can possibly solve some problems
+	  in case your mainboard has memory consistency issues.  If unsure,
+	  say N.
+
+config 8139TOO_TUNE_TWISTER
+	bool "Support for uncommon RTL-8139 rev. K (automatic channel equalization)"
+	depends on 8139TOO
+	---help---
+	  This implements a function which might come in handy in case you
+	  are using low quality on long cabling. It is required for RealTek
+	  RTL-8139 revision K boards, and totally unused otherwise.  It tries
+	  to match the transceiver to the cable characteristics. This is
+	  experimental since hardly documented by the manufacturer.
+	  If unsure, say Y.
+
+config 8139TOO_8129
+	bool "Support for older RTL-8129/8130 boards"
+	depends on 8139TOO
+	---help---
+	  This enables support for the older and uncommon RTL-8129 and
+	  RTL-8130 chips, which support MII via an external transceiver,
+	  instead of an internal one.  Disabling this option will save some
+	  memory by making the code size smaller.  If unsure, say Y.
+
+config 8139_OLD_RX_RESET
+	bool "Use older RX-reset method"
+	depends on 8139TOO
+	---help---
+	  The 8139too driver was recently updated to contain a more rapid
+	  reset sequence, in the face of severe receive errors.  This "new"
+	  RX-reset method should be adequate for all boards.  But if you
+	  experience problems, you can enable this option to restore the
+	  old RX-reset behavior.  If unsure, say N.
+
+config R8169
+	tristate "Realtek 8169 gigabit ethernet support"
+	depends on NET_VENDOR_REALTEK && PCI
+	select FW_LOADER
+	select CRC32
+	select MII
+	---help---
+	  Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called r8169.  This is recommended.
diff --git a/drivers/net/ethernet/realtek/Makefile b/drivers/net/ethernet/realtek/Makefile
new file mode 100644
index 0000000..71b1da3
--- /dev/null
+++ b/drivers/net/ethernet/realtek/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the Realtek network device drivers.
+#
+
+obj-$(CONFIG_8139CP) += 8139cp.o
+obj-$(CONFIG_8139TOO) += 8139too.o
+obj-$(CONFIG_ATP) += atp.o
+obj-$(CONFIG_R8169) += r8169.o
diff --git a/drivers/net/atp.c b/drivers/net/ethernet/realtek/atp.c
similarity index 100%
rename from drivers/net/atp.c
rename to drivers/net/ethernet/realtek/atp.c
diff --git a/drivers/net/atp.h b/drivers/net/ethernet/realtek/atp.h
similarity index 100%
rename from drivers/net/atp.h
rename to drivers/net/ethernet/realtek/atp.h
diff --git a/drivers/net/r8169.c b/drivers/net/ethernet/realtek/r8169.c
similarity index 100%
rename from drivers/net/r8169.c
rename to drivers/net/ethernet/realtek/r8169.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 29/72] de6*/dl2k: Move the D-Link drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (27 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 28/72] 8139*/atp/r8169: Move the Realtek drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 30/72] atl*: Move the Atheros drivers Jeff Kirsher
                   ` (45 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Bjorn Ekwall, Donald Becker, Edward Peng

Move the D-Link drivers into drivers/net/ethernet/dlink/ and
make the necessary Kconfig and Makefile changes.

CC: Bjorn Ekwall <bj0rn@blox.se>
CC: Donald Becker <becker@scyld.com>
CC: Edward Peng <edward_peng@dlink.com.tw>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                      |   44 ----------------------
 drivers/net/Makefile                     |    3 -
 drivers/net/ethernet/Kconfig             |    1 +
 drivers/net/ethernet/Makefile            |    1 +
 drivers/net/ethernet/dlink/Kconfig       |   60 ++++++++++++++++++++++++++++++
 drivers/net/ethernet/dlink/Makefile      |    7 +++
 drivers/net/{ => ethernet/dlink}/de600.c |    0
 drivers/net/{ => ethernet/dlink}/de600.h |    0
 drivers/net/{ => ethernet/dlink}/de620.c |    0
 drivers/net/{ => ethernet/dlink}/de620.h |    0
 drivers/net/{ => ethernet/dlink}/dl2k.c  |    0
 drivers/net/{ => ethernet/dlink}/dl2k.h  |    0
 12 files changed, 69 insertions(+), 47 deletions(-)
 create mode 100644 drivers/net/ethernet/dlink/Kconfig
 create mode 100644 drivers/net/ethernet/dlink/Makefile
 rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
 rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
 rename drivers/net/{ => ethernet/dlink}/de620.c (100%)
 rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
 rename drivers/net/{ => ethernet/dlink}/dl2k.c (100%)
 rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 03bf50b..3961949 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -850,36 +850,6 @@ config NET_POCKET
 	  the questions about this class of network devices. If you say Y, you
 	  will be asked for your specific device in the following questions.
 
-config DE600
-	tristate "D-Link DE600 pocket adapter support"
-	depends on NET_POCKET && PARPORT
-	---help---
-	  This is a network (Ethernet) device which attaches to your parallel
-	  port. Read <file:Documentation/networking/DLINK.txt> as well as the
-	  Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>, if you want to use
-	  this. It is possible to have several devices share a single parallel
-	  port and it is safe to compile the corresponding drivers into the
-	  kernel.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called de600.
-
-config DE620
-	tristate "D-Link DE620 pocket adapter support"
-	depends on NET_POCKET && PARPORT
-	---help---
-	  This is a network (Ethernet) device which attaches to your parallel
-	  port. Read <file:Documentation/networking/DLINK.txt> as well as the
-	  Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>, if you want to use
-	  this. It is possible to have several devices share a single parallel
-	  port and it is safe to compile the corresponding drivers into the
-	  kernel.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called de620.
-
 config SGISEEQ
 	tristate "SGI Seeq ethernet controller support"
 	depends on SGI_HAS_SEEQ
@@ -979,20 +949,6 @@ menuconfig NETDEV_1000
 
 if NETDEV_1000
 
-config DL2K
-	tristate "DL2000/TC902x-based Gigabit Ethernet support"
-	depends on PCI
-	select CRC32
-	help
-	  This driver supports DL2000/TC902x-based Gigabit ethernet cards,
-	  which includes
-	  D-Link DGE-550T Gigabit Ethernet Adapter.
-	  D-Link DL2000-based Gigabit Ethernet Adapter.
-	  Sundance/Tamarack TC902x Gigabit Ethernet Adapter.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called dl2k.
-
 config IP1000
 	tristate "IP1000 Gigabit Ethernet support"
 	depends on PCI && EXPERIMENTAL
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 74beb4a..8cdf289 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -104,8 +104,6 @@ obj-$(CONFIG_DUMMY) += dummy.o
 obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
-obj-$(CONFIG_DE600) += de600.o
-obj-$(CONFIG_DE620) += de620.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
@@ -137,7 +135,6 @@ obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
-obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 3613d2d..b665c32 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/cisco/Kconfig"
+source "drivers/net/ethernet/dlink/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/faraday/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index c1b6275..e3c7243 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
+obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
diff --git a/drivers/net/ethernet/dlink/Kconfig b/drivers/net/ethernet/dlink/Kconfig
new file mode 100644
index 0000000..a4f51b7
--- /dev/null
+++ b/drivers/net/ethernet/dlink/Kconfig
@@ -0,0 +1,60 @@
+#
+# D-Link device configuration
+#
+
+config NET_VENDOR_DLINK
+	bool "D-Link devices"
+	depends on PCI || PARPORT
+	---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 D-Link devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config DE600
+	tristate "D-Link DE600 pocket adapter support"
+	depends on NET_VENDOR_DLINK && PARPORT
+	---help---
+	  This is a network (Ethernet) device which attaches to your parallel
+	  port. Read <file:Documentation/networking/DLINK.txt> as well as the
+	  Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>, if you want to use
+	  this. It is possible to have several devices share a single parallel
+	  port and it is safe to compile the corresponding drivers into the
+	  kernel.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called de600.
+
+config DE620
+	tristate "D-Link DE620 pocket adapter support"
+	depends on NET_VENDOR_DLINK && PARPORT
+	---help---
+	  This is a network (Ethernet) device which attaches to your parallel
+	  port. Read <file:Documentation/networking/DLINK.txt> as well as the
+	  Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>, if you want to use
+	  this. It is possible to have several devices share a single parallel
+	  port and it is safe to compile the corresponding drivers into the
+	  kernel.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called de620.
+
+config DL2K
+	tristate "DL2000/TC902x-based Gigabit Ethernet support"
+	depends on NET_VENDOR_DLINK && PCI
+	select CRC32
+	---help---
+	  This driver supports DL2000/TC902x-based Gigabit ethernet cards,
+	  which includes
+	  D-Link DGE-550T Gigabit Ethernet Adapter.
+	  D-Link DL2000-based Gigabit Ethernet Adapter.
+	  Sundance/Tamarack TC902x Gigabit Ethernet Adapter.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called dl2k.
diff --git a/drivers/net/ethernet/dlink/Makefile b/drivers/net/ethernet/dlink/Makefile
new file mode 100644
index 0000000..7ab33bc
--- /dev/null
+++ b/drivers/net/ethernet/dlink/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the D-Link network device drivers.
+#
+
+obj-$(CONFIG_DE600) += de600.o
+obj-$(CONFIG_DE620) += de620.o
+obj-$(CONFIG_DL2K) += dl2k.o
diff --git a/drivers/net/de600.c b/drivers/net/ethernet/dlink/de600.c
similarity index 100%
rename from drivers/net/de600.c
rename to drivers/net/ethernet/dlink/de600.c
diff --git a/drivers/net/de600.h b/drivers/net/ethernet/dlink/de600.h
similarity index 100%
rename from drivers/net/de600.h
rename to drivers/net/ethernet/dlink/de600.h
diff --git a/drivers/net/de620.c b/drivers/net/ethernet/dlink/de620.c
similarity index 100%
rename from drivers/net/de620.c
rename to drivers/net/ethernet/dlink/de620.c
diff --git a/drivers/net/de620.h b/drivers/net/ethernet/dlink/de620.h
similarity index 100%
rename from drivers/net/de620.h
rename to drivers/net/ethernet/dlink/de620.h
diff --git a/drivers/net/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c
similarity index 100%
rename from drivers/net/dl2k.c
rename to drivers/net/ethernet/dlink/dl2k.c
diff --git a/drivers/net/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h
similarity index 100%
rename from drivers/net/dl2k.h
rename to drivers/net/ethernet/dlink/dl2k.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 30/72] atl*: Move the Atheros drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (28 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 29/72] de6*/dl2k: Move the D-Link drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 18:16   ` Chris Snook
  2011-06-25 13:58 ` [RFC 31/72] tulip: Move the tulip drivers Jeff Kirsher
                   ` (44 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Jay Cliburn, Chris Snook, Jie Yang

Move the Atheros drivers into drivers/net/ethernet/atheros/ and
make the necessary Kconfig and Makefile changes.

CC: Jay Cliburn <jcliburn@gmail.com>
CC: Chris Snook <chris.snook@gmail.com>
CC: Jie Yang <jie.yang@atheros.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |   45 --------------
 drivers/net/Makefile                               |    4 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/atheros/Kconfig               |   61 ++++++++++++++++++++
 drivers/net/ethernet/atheros/Makefile              |    8 +++
 drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
 drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
 .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
 .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |    0
 drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
 drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
 .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
 .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |    0
 .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
 drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
 drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
 drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
 27 files changed, 72 insertions(+), 50 deletions(-)
 create mode 100644 drivers/net/ethernet/atheros/Kconfig
 create mode 100644 drivers/net/ethernet/atheros/Makefile
 rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
 rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index a0ccbea..f72a8bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1263,7 +1263,7 @@ L:	netdev@vger.kernel.org
 W:	http://sourceforge.net/projects/atl1
 W:	http://atl1.sourceforge.net
 S:	Maintained
-F:	drivers/net/atlx/
+F:	drivers/net/ethernet/atheros/
 
 ATM
 M:	Chas Williams <chas@cmf.nrl.navy.mil>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3961949..71efbe4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -897,17 +897,6 @@ config FEC_MPC52xx_MDIO
 	  If not sure, enable.
 	  If compiled as module, it will be called fec_mpc52xx_phy.
 
-config ATL2
-	tristate "Atheros L2 Fast Ethernet support"
-	depends on PCI
-	select CRC32
-	select MII
-	help
-	  This driver supports the Atheros L2 fast ethernet adapter.
-
-	  To compile this driver as a module, choose M here.  The module
-	  will be called atl2.
-
 config XILINX_EMACLITE
 	tristate "Xilinx 10/100 Ethernet Lite support"
 	depends on PPC32 || MICROBLAZE
@@ -1161,40 +1150,6 @@ config XILINX_LL_TEMAC
 	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
 	  core used in Xilinx Spartan and Virtex FPGAs
 
-config ATL1
-	tristate "Atheros/Attansic L1 Gigabit Ethernet support"
-	depends on PCI
-	select CRC32
-	select MII
-	help
-	  This driver supports the Atheros/Attansic L1 gigabit ethernet
-	  adapter.
-
-	  To compile this driver as a module, choose M here.  The module
-	  will be called atl1.
-
-config ATL1E
-	tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
-	depends on PCI && EXPERIMENTAL
-	select CRC32
-	select MII
-	help
-	  This driver supports the Atheros L1E gigabit ethernet adapter.
-
-	  To compile this driver as a module, choose M here.  The module
-	  will be called atl1e.
-
-config ATL1C
-	tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
-	depends on PCI && EXPERIMENTAL
-	select CRC32
-	select MII
-	help
-	  This driver supports the Atheros L1C gigabit ethernet adapter.
-
-	  To compile this driver as a module, choose M here.  The module
-	  will be called atl1c.
-
 config JME
 	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8cdf289..1ac4164 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -9,10 +9,6 @@ obj-$(CONFIG_PHYLIB) += phy/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_ATL1) += atlx/
-obj-$(CONFIG_ATL2) += atlx/
-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_JME) += jme.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index b665c32..6fb1625 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -15,6 +15,7 @@ source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
 source "drivers/net/ethernet/arm/Kconfig"
+source "drivers/net/ethernet/atheros/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e3c7243..1123a3d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_NET_ARM) += arm/
+obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig
new file mode 100644
index 0000000..94b436d
--- /dev/null
+++ b/drivers/net/ethernet/atheros/Kconfig
@@ -0,0 +1,61 @@
+#
+# Atheros device configuration
+#
+
+config NET_VENDOR_ATHEROS
+	bool "Atheros 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 Atheros devices. If you say Y, you will be asked
+	  for your specific card in the following questions.
+
+config ATL2
+	tristate "Atheros L2 Fast Ethernet support"
+	depends on NET_VENDOR_ATHEROS && PCI
+	select CRC32
+	select MII
+	---help---
+	  This driver supports the Atheros L2 fast ethernet adapter.
+
+	  To compile this driver as a module, choose M here.  The module
+	  will be called atl2.
+
+config ATL1
+	tristate "Atheros/Attansic L1 Gigabit Ethernet support"
+	depends on NET_VENDOR_ATHEROS && PCI
+	select CRC32
+	select MII
+	---help---
+	  This driver supports the Atheros/Attansic L1 gigabit ethernet
+	  adapter.
+
+	  To compile this driver as a module, choose M here.  The module
+	  will be called atl1.
+
+config ATL1E
+	tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
+	depends on NET_VENDOR_ATHEROS && PCI && EXPERIMENTAL
+	select CRC32
+	select MII
+	---help---
+	  This driver supports the Atheros L1E gigabit ethernet adapter.
+
+	  To compile this driver as a module, choose M here.  The module
+	  will be called atl1e.
+
+config ATL1C
+	tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
+	depends on NET_VENDOR_ATHEROS && PCI && EXPERIMENTAL
+	select CRC32
+	select MII
+	---help---
+	  This driver supports the Atheros L1C gigabit ethernet adapter.
+
+	  To compile this driver as a module, choose M here.  The module
+	  will be called atl1c.
diff --git a/drivers/net/ethernet/atheros/Makefile b/drivers/net/ethernet/atheros/Makefile
new file mode 100644
index 0000000..e7e76fb
--- /dev/null
+++ b/drivers/net/ethernet/atheros/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the Atheros network device drivers.
+#
+
+obj-$(CONFIG_ATL1) += atlx/
+obj-$(CONFIG_ATL2) += atlx/
+obj-$(CONFIG_ATL1E) += atl1e/
+obj-$(CONFIG_ATL1C) += atl1c/
diff --git a/drivers/net/atl1c/Makefile b/drivers/net/ethernet/atheros/atl1c/Makefile
similarity index 100%
rename from drivers/net/atl1c/Makefile
rename to drivers/net/ethernet/atheros/atl1c/Makefile
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h
similarity index 100%
rename from drivers/net/atl1c/atl1c.h
rename to drivers/net/ethernet/atheros/atl1c/atl1c.h
diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_ethtool.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_hw.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
diff --git a/drivers/net/atl1c/atl1c_hw.h b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
similarity index 100%
rename from drivers/net/atl1c/atl1c_hw.h
rename to drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_main.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_main.c
diff --git a/drivers/net/atl1e/Makefile b/drivers/net/ethernet/atheros/atl1e/Makefile
similarity index 100%
rename from drivers/net/atl1e/Makefile
rename to drivers/net/ethernet/atheros/atl1e/Makefile
diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/ethernet/atheros/atl1e/atl1e.h
similarity index 100%
rename from drivers/net/atl1e/atl1e.h
rename to drivers/net/ethernet/atheros/atl1e/atl1e.h
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_ethtool.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
diff --git a/drivers/net/atl1e/atl1e_hw.c b/drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_hw.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
diff --git a/drivers/net/atl1e/atl1e_hw.h b/drivers/net/ethernet/atheros/atl1e/atl1e_hw.h
similarity index 100%
rename from drivers/net/atl1e/atl1e_hw.h
rename to drivers/net/ethernet/atheros/atl1e/atl1e_hw.h
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_main.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_main.c
diff --git a/drivers/net/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_param.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_param.c
diff --git a/drivers/net/atlx/Makefile b/drivers/net/ethernet/atheros/atlx/Makefile
similarity index 100%
rename from drivers/net/atlx/Makefile
rename to drivers/net/ethernet/atheros/atlx/Makefile
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
similarity index 100%
rename from drivers/net/atlx/atl1.c
rename to drivers/net/ethernet/atheros/atlx/atl1.c
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h
similarity index 100%
rename from drivers/net/atlx/atl1.h
rename to drivers/net/ethernet/atheros/atlx/atl1.h
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
similarity index 100%
rename from drivers/net/atlx/atl2.c
rename to drivers/net/ethernet/atheros/atlx/atl2.c
diff --git a/drivers/net/atlx/atl2.h b/drivers/net/ethernet/atheros/atlx/atl2.h
similarity index 100%
rename from drivers/net/atlx/atl2.h
rename to drivers/net/ethernet/atheros/atlx/atl2.h
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
similarity index 100%
rename from drivers/net/atlx/atlx.c
rename to drivers/net/ethernet/atheros/atlx/atlx.c
diff --git a/drivers/net/atlx/atlx.h b/drivers/net/ethernet/atheros/atlx/atlx.h
similarity index 100%
rename from drivers/net/atlx/atlx.h
rename to drivers/net/ethernet/atheros/atlx/atlx.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 31/72] tulip: Move the tulip drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (29 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 30/72] atl*: Move the Atheros drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-07-03  0:04   ` Grant Grundler
  2011-06-25 13:58 ` [RFC 32/72] ioc3-eth/meth/sgiseeq: Move the SGI drivers Jeff Kirsher
                   ` (43 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Tobias Ringstrom, Grant Grundler

Move the tulip driver into drivers/net/ethernet/tulip/ and make
the necessary Kconfig and Makefile changes.

CC: Tobias Ringstrom <tori@unhappy.mine.nu>
CC: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                    |    4 +-
 drivers/net/Kconfig                            |    2 -
 drivers/net/Makefile                           |    1 -
 drivers/net/ethernet/Kconfig                   |    2 +
 drivers/net/ethernet/Makefile                  |    1 +
 drivers/net/{ => ethernet}/tulip/21142.c       |    0
 drivers/net/{ => ethernet}/tulip/Kconfig       |   34 ++++++++++-------------
 drivers/net/{ => ethernet}/tulip/Makefile      |    0
 drivers/net/{ => ethernet}/tulip/de2104x.c     |    0
 drivers/net/{ => ethernet}/tulip/de4x5.c       |    0
 drivers/net/{ => ethernet}/tulip/de4x5.h       |    0
 drivers/net/{ => ethernet}/tulip/dmfe.c        |    0
 drivers/net/{ => ethernet}/tulip/eeprom.c      |    0
 drivers/net/{ => ethernet}/tulip/interrupt.c   |    0
 drivers/net/{ => ethernet}/tulip/media.c       |    0
 drivers/net/{ => ethernet}/tulip/pnic.c        |    0
 drivers/net/{ => ethernet}/tulip/pnic2.c       |    0
 drivers/net/{ => ethernet}/tulip/timer.c       |    0
 drivers/net/{ => ethernet}/tulip/tulip.h       |    0
 drivers/net/{ => ethernet}/tulip/tulip_core.c  |    0
 drivers/net/{ => ethernet}/tulip/uli526x.c     |    0
 drivers/net/{ => ethernet}/tulip/winbond-840.c |    0
 drivers/net/{ => ethernet}/tulip/xircom_cb.c   |    0
 23 files changed, 20 insertions(+), 24 deletions(-)
 rename drivers/net/{ => ethernet}/tulip/21142.c (100%)
 rename drivers/net/{ => ethernet}/tulip/Kconfig (93%)
 rename drivers/net/{ => ethernet}/tulip/Makefile (100%)
 rename drivers/net/{ => ethernet}/tulip/de2104x.c (100%)
 rename drivers/net/{ => ethernet}/tulip/de4x5.c (100%)
 rename drivers/net/{ => ethernet}/tulip/de4x5.h (100%)
 rename drivers/net/{ => ethernet}/tulip/dmfe.c (100%)
 rename drivers/net/{ => ethernet}/tulip/eeprom.c (100%)
 rename drivers/net/{ => ethernet}/tulip/interrupt.c (100%)
 rename drivers/net/{ => ethernet}/tulip/media.c (100%)
 rename drivers/net/{ => ethernet}/tulip/pnic.c (100%)
 rename drivers/net/{ => ethernet}/tulip/pnic2.c (100%)
 rename drivers/net/{ => ethernet}/tulip/timer.c (100%)
 rename drivers/net/{ => ethernet}/tulip/tulip.h (100%)
 rename drivers/net/{ => ethernet}/tulip/tulip_core.c (100%)
 rename drivers/net/{ => ethernet}/tulip/uli526x.c (100%)
 rename drivers/net/{ => ethernet}/tulip/winbond-840.c (100%)
 rename drivers/net/{ => ethernet}/tulip/xircom_cb.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index f72a8bd..26d1029 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2040,7 +2040,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 L:	netdev@vger.kernel.org
 S:	Orphan
 F:	Documentation/networking/dmfe.txt
-F:	drivers/net/tulip/dmfe.c
+F:	drivers/net/ethernet/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
 M:	Kurt Garloff <garloff@suse.de>
@@ -6278,7 +6278,7 @@ TULIP NETWORK DRIVERS
 M:	Grant Grundler <grundler@parisc-linux.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/tulip/
+F:	drivers/net/ethernet/tulip/
 
 TUN/TAP driver
 M:	Maxim Krasnyansky <maxk@qualcomm.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 71efbe4..0846518 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -481,8 +481,6 @@ config DNET
 	  To compile this driver as a module, choose M here: the module
 	  will be called dnet.
 
-source "drivers/net/tulip/Kconfig"
-
 config AT1700
 	tristate "AT1700/1720 support (EXPERIMENTAL)"
 	depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 1ac4164..ec07331 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -160,7 +160,6 @@ obj-$(CONFIG_USB_ZD1201)        += usb/
 obj-$(CONFIG_USB_IPHETH)        += usb/
 
 obj-$(CONFIG_WLAN) += wireless/
-obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/
 obj-$(CONFIG_IRDA) += irda/
 obj-$(CONFIG_ETRAX_ETHERNET) += cris/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6fb1625..369f5bb 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -55,4 +55,6 @@ config TEHUTI
 	---help---
 	  Tehuti Networks 10G Ethernet NIC
 
+source "drivers/net/ethernet/tulip/Kconfig"
+
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 1123a3d..189d112 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -31,3 +31,4 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
 obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
 obj-$(CONFIG_TEHUTI) += tehuti.o
+obj-$(CONFIG_NET_TULIP) += tulip/
diff --git a/drivers/net/tulip/21142.c b/drivers/net/ethernet/tulip/21142.c
similarity index 100%
rename from drivers/net/tulip/21142.c
rename to drivers/net/ethernet/tulip/21142.c
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/ethernet/tulip/Kconfig
similarity index 93%
rename from drivers/net/tulip/Kconfig
rename to drivers/net/ethernet/tulip/Kconfig
index 1f8d4a8..c298a08 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/ethernet/tulip/Kconfig
@@ -2,17 +2,15 @@
 # Tulip family network device configuration
 #
 
-menuconfig NET_TULIP
-	bool "\"Tulip\" family network device support"
+config NET_TULIP
+	bool "\"Tulip\" family network devices"
 	depends on PCI || EISA || CARDBUS
-	help
+	---help---
 	  This selects the "Tulip" family of EISA/PCI network cards.
 
-if NET_TULIP
-
 config DE2104X
 	tristate "Early DECchip Tulip (dc2104x) PCI support"
-	depends on PCI
+	depends on NET_TULIP && PCI
 	select CRC32
 	---help---
 	  This driver is developed for the SMC EtherPower series Ethernet
@@ -32,7 +30,7 @@ config DE2104X_DSL
 	depends on DE2104X
 	range 0 31
 	default 0
-	help
+	---help---
 	  Setting this value allows to align ring buffer descriptors into their
 	  own cache lines. Value of 4 corresponds to the typical 32 byte line
 	  (the descriptor is 16 bytes). This is necessary on systems that lack
@@ -41,7 +39,7 @@ config DE2104X_DSL
 
 config TULIP
 	tristate "DECchip Tulip (dc2114x) PCI support"
-	depends on PCI
+	depends on NET_TULIP && PCI
 	select CRC32
 	---help---
 	  This driver is developed for the SMC EtherPower series Ethernet
@@ -59,7 +57,7 @@ config TULIP
 config TULIP_MWI
 	bool "New bus configuration (EXPERIMENTAL)"
 	depends on TULIP && EXPERIMENTAL
-	help
+	---help---
 	  This configures your Tulip card specifically for the card and
 	  system cache line size type you are using.
 
@@ -70,7 +68,7 @@ config TULIP_MWI
 config TULIP_MMIO
 	bool "Use PCI shared mem for NIC registers"
 	depends on TULIP
-	help
+	---help---
 	  Use PCI shared memory for the NIC registers, rather than going through
 	  the Tulip's PIO (programmed I/O ports).  Faster, but could produce
 	  obscure bugs if your mainboard has memory controller timing issues.
@@ -79,7 +77,7 @@ config TULIP_MMIO
 config TULIP_NAPI
 	bool "Use RX polling (NAPI)"
 	depends on TULIP
-	help
+	---help---
 	  NAPI is a new driver API designed to reduce CPU and interrupt load
 	  when the driver is receiving lots of packets from the card. It is
 	  still somewhat experimental and thus not yet enabled by default.
@@ -107,7 +105,7 @@ config TULIP_DM910X
 
 config DE4X5
 	tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
-	depends on PCI || EISA
+	depends on NET_TULIP && (PCI || EISA)
 	select CRC32
 	---help---
 	  This is support for the DIGITAL series of PCI/EISA Ethernet cards.
@@ -123,10 +121,10 @@ config DE4X5
 
 config WINBOND_840
 	tristate "Winbond W89c840 Ethernet support"
-	depends on PCI
+	depends on NET_TULIP && PCI
 	select CRC32
 	select MII
-	help
+	---help---
 	  This driver is for the Winbond W89c840 chip.  It also works with 
 	  the TX9882 chip on the Compex RL100-ATX board.
 	  More specific information and updates are available from
@@ -134,7 +132,7 @@ config WINBOND_840
 
 config DM9102
 	tristate "Davicom DM910x/DM980x support"
-	depends on PCI
+	depends on NET_TULIP && PCI
 	select CRC32
 	---help---
 	  This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from
@@ -147,7 +145,7 @@ config DM9102
 
 config ULI526X
 	tristate "ULi M526x controller support"
-	depends on PCI
+	depends on NET_TULIP && PCI
 	select CRC32
 	---help---
 	  This driver is for ULi M5261/M5263 10/100M Ethernet Controller
@@ -158,7 +156,7 @@ config ULI526X
 	  
 config PCMCIA_XIRCOM
 	tristate "Xircom CardBus support"
-	depends on CARDBUS
+	depends on NET_TULIP && CARDBUS
 	---help---
 	  This driver is for the Digital "Tulip" Ethernet CardBus adapters.
 	  It should work with most DEC 21*4*-based chips/ethercards, as well
@@ -167,5 +165,3 @@ config PCMCIA_XIRCOM
 
 	  To compile this driver as a module, choose M here. The module will
 	  be called xircom_cb.  If unsure, say N.
-
-endif # NET_TULIP
diff --git a/drivers/net/tulip/Makefile b/drivers/net/ethernet/tulip/Makefile
similarity index 100%
rename from drivers/net/tulip/Makefile
rename to drivers/net/ethernet/tulip/Makefile
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/ethernet/tulip/de2104x.c
similarity index 100%
rename from drivers/net/tulip/de2104x.c
rename to drivers/net/ethernet/tulip/de2104x.c
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/ethernet/tulip/de4x5.c
similarity index 100%
rename from drivers/net/tulip/de4x5.c
rename to drivers/net/ethernet/tulip/de4x5.c
diff --git a/drivers/net/tulip/de4x5.h b/drivers/net/ethernet/tulip/de4x5.h
similarity index 100%
rename from drivers/net/tulip/de4x5.h
rename to drivers/net/ethernet/tulip/de4x5.h
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/ethernet/tulip/dmfe.c
similarity index 100%
rename from drivers/net/tulip/dmfe.c
rename to drivers/net/ethernet/tulip/dmfe.c
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/ethernet/tulip/eeprom.c
similarity index 100%
rename from drivers/net/tulip/eeprom.c
rename to drivers/net/ethernet/tulip/eeprom.c
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/ethernet/tulip/interrupt.c
similarity index 100%
rename from drivers/net/tulip/interrupt.c
rename to drivers/net/ethernet/tulip/interrupt.c
diff --git a/drivers/net/tulip/media.c b/drivers/net/ethernet/tulip/media.c
similarity index 100%
rename from drivers/net/tulip/media.c
rename to drivers/net/ethernet/tulip/media.c
diff --git a/drivers/net/tulip/pnic.c b/drivers/net/ethernet/tulip/pnic.c
similarity index 100%
rename from drivers/net/tulip/pnic.c
rename to drivers/net/ethernet/tulip/pnic.c
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/ethernet/tulip/pnic2.c
similarity index 100%
rename from drivers/net/tulip/pnic2.c
rename to drivers/net/ethernet/tulip/pnic2.c
diff --git a/drivers/net/tulip/timer.c b/drivers/net/ethernet/tulip/timer.c
similarity index 100%
rename from drivers/net/tulip/timer.c
rename to drivers/net/ethernet/tulip/timer.c
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/ethernet/tulip/tulip.h
similarity index 100%
rename from drivers/net/tulip/tulip.h
rename to drivers/net/ethernet/tulip/tulip.h
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/ethernet/tulip/tulip_core.c
similarity index 100%
rename from drivers/net/tulip/tulip_core.c
rename to drivers/net/ethernet/tulip/tulip_core.c
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/ethernet/tulip/uli526x.c
similarity index 100%
rename from drivers/net/tulip/uli526x.c
rename to drivers/net/ethernet/tulip/uli526x.c
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/ethernet/tulip/winbond-840.c
similarity index 100%
rename from drivers/net/tulip/winbond-840.c
rename to drivers/net/ethernet/tulip/winbond-840.c
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/ethernet/tulip/xircom_cb.c
similarity index 100%
rename from drivers/net/tulip/xircom_cb.c
rename to drivers/net/ethernet/tulip/xircom_cb.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 32/72] ioc3-eth/meth/sgiseeq: Move the SGI drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (30 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 31/72] tulip: Move the tulip drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 33/72] pch_gbe: Move the OKI driver Jeff Kirsher
                   ` (42 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Ralf Baechle

Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
necessary Kconfig and Makefile changes.

CC: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                               |    2 +-
 drivers/net/Kconfig                       |   21 ----------------
 drivers/net/Makefile                      |    3 --
 drivers/net/ethernet/Kconfig              |    1 +
 drivers/net/ethernet/Makefile             |    1 +
 drivers/net/ethernet/sgi/Kconfig          |   37 +++++++++++++++++++++++++++++
 drivers/net/ethernet/sgi/Makefile         |    7 +++++
 drivers/net/{ => ethernet/sgi}/ioc3-eth.c |    0
 drivers/net/{ => ethernet/sgi}/meth.c     |    0
 drivers/net/{ => ethernet/sgi}/meth.h     |    0
 drivers/net/{ => ethernet/sgi}/sgiseeq.c  |    0
 drivers/net/{ => ethernet/sgi}/sgiseeq.h  |    0
 12 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100644 drivers/net/ethernet/sgi/Kconfig
 create mode 100644 drivers/net/ethernet/sgi/Makefile
 rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (100%)
 rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
 rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
 rename drivers/net/{ => ethernet/sgi}/sgiseeq.c (100%)
 rename drivers/net/{ => ethernet/sgi}/sgiseeq.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 26d1029..c9bf3b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3386,7 +3386,7 @@ IOC3 ETHERNET DRIVER
 M:	Ralf Baechle <ralf@linux-mips.org>
 L:	linux-mips@linux-mips.org
 S:	Maintained
-F:	drivers/net/ioc3-eth.c
+F:	drivers/net/ethernet/sgi/ioc3-eth.c
 
 IOC3 SERIAL DRIVER
 M:	Pat Gefre <pfg@sgi.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0846518..17db195 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -304,16 +304,6 @@ config MIPS_AU1X00_ENET
 	  If you have an Alchemy Semi AU1X00 based system
 	  say Y.  Otherwise, say N.
 
-config SGI_IOC3_ETH
-	bool "SGI IOC3 Ethernet"
-	depends on PCI && SGI_IP27
-	select CRC32
-	select MII
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
 config MIPS_SIM_NET
 	tristate "MIPS simulator Network device"
 	depends on MIPS_SIM
@@ -322,10 +312,6 @@ config MIPS_SIM_NET
 	  emulated by the MIPS Simulator.
 	  If you are not using a MIPSsim or are unsure, say N.
 
-config SGI_O2MACE_ETH
-	tristate "SGI O2 MACE Fast Ethernet support"
-	depends on SGI_IP32=y
-
 config SH_ETH
 	tristate "Renesas SuperH Ethernet support"
 	depends on SUPERH && \
@@ -848,13 +834,6 @@ config NET_POCKET
 	  the questions about this class of network devices. If you say Y, you
 	  will be asked for your specific device in the following questions.
 
-config SGISEEQ
-	tristate "SGI Seeq ethernet controller support"
-	depends on SGI_HAS_SEEQ
-	help
-	  Say Y here if you have an Seeq based Ethernet network card. This is
-	  used in many Silicon Graphics machines.
-
 config 68360_ENET
 	bool "Motorola 68360 ethernet controller"
 	depends on M68360
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index ec07331..24d89c0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -101,8 +101,6 @@ obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
-obj-$(CONFIG_SGISEEQ) += sgiseeq.o
-obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_EEXPRESS) += eexpress.o
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
@@ -125,7 +123,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
-obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
 obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_TUN) += tun.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 369f5bb..0c4ba94 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -44,6 +44,7 @@ source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/realtek/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
+source "drivers/net/ethernet/sgi/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
 source "drivers/net/ethernet/smsc/Kconfig"
 source "drivers/net/ethernet/stmicro/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 189d112..5a27837 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_SFC) += sfc/
+obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
 obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
diff --git a/drivers/net/ethernet/sgi/Kconfig b/drivers/net/ethernet/sgi/Kconfig
new file mode 100644
index 0000000..a6fed1d
--- /dev/null
+++ b/drivers/net/ethernet/sgi/Kconfig
@@ -0,0 +1,37 @@
+#
+# SGI device configuration
+#
+
+config NET_VENDOR_SGI
+	bool "SGI devices"
+	depends on (PCI && SGI_IP27) || SGI_IP32 || SGI_HAS_SEEQ
+	---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 SGI devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config SGI_IOC3_ETH
+	bool "SGI IOC3 Ethernet"
+	depends on NET_VENDOR_SGI && PCI && SGI_IP27
+	select CRC32
+	select MII
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+config SGI_O2MACE_ETH
+	tristate "SGI O2 MACE Fast Ethernet support"
+	depends on NET_VENDOR_SGI && SGI_IP32=y
+
+config SGISEEQ
+	tristate "SGI Seeq ethernet controller support"
+	depends on NET_VENDOR_SGI && SGI_HAS_SEEQ
+	---help---
+	  Say Y here if you have an Seeq based Ethernet network card. This is
+	  used in many Silicon Graphics machines.
diff --git a/drivers/net/ethernet/sgi/Makefile b/drivers/net/ethernet/sgi/Makefile
new file mode 100644
index 0000000..3c5ba8c
--- /dev/null
+++ b/drivers/net/ethernet/sgi/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the SGI device drivers.
+#
+
+obj-$(CONFIG_SGISEEQ) += sgiseeq.o
+obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
+obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
similarity index 100%
rename from drivers/net/ioc3-eth.c
rename to drivers/net/ethernet/sgi/ioc3-eth.c
diff --git a/drivers/net/meth.c b/drivers/net/ethernet/sgi/meth.c
similarity index 100%
rename from drivers/net/meth.c
rename to drivers/net/ethernet/sgi/meth.c
diff --git a/drivers/net/meth.h b/drivers/net/ethernet/sgi/meth.h
similarity index 100%
rename from drivers/net/meth.h
rename to drivers/net/ethernet/sgi/meth.h
diff --git a/drivers/net/sgiseeq.c b/drivers/net/ethernet/sgi/sgiseeq.c
similarity index 100%
rename from drivers/net/sgiseeq.c
rename to drivers/net/ethernet/sgi/sgiseeq.c
diff --git a/drivers/net/sgiseeq.h b/drivers/net/ethernet/sgi/sgiseeq.h
similarity index 100%
rename from drivers/net/sgiseeq.h
rename to drivers/net/ethernet/sgi/sgiseeq.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 33/72] pch_gbe: Move the OKI driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (31 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 32/72] ioc3-eth/meth/sgiseeq: Move the SGI drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-27  1:53   ` Toshiharu Okada
  2011-06-25 13:58 ` [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers Jeff Kirsher
                   ` (41 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Tomoya, Toshiharu Okada

Move the OKI driver into driver/net/ethernet/oki/ and make the
necessary Kconfig and Makefile changes.

Note: there is no documented maintainer for this driver, so I CC'd
the last 2 major contributors.

CC: Tomoya <tomoya-linux@dsn.okisemi.com>
CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                                |   19 -------------------
 drivers/net/Makefile                               |    1 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/oki/Kconfig                   |   18 ++++++++++++++++++
 drivers/net/ethernet/oki/Makefile                  |    5 +++++
 drivers/net/ethernet/oki/pch_gbe/Kconfig           |   20 ++++++++++++++++++++
 drivers/net/{ => ethernet/oki}/pch_gbe/Makefile    |    0
 drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe.h   |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.c   |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.h   |    0
 .../{ => ethernet/oki}/pch_gbe/pch_gbe_ethtool.c   |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_main.c  |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_param.c |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.c   |    0
 .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.h   |    0
 16 files changed, 45 insertions(+), 20 deletions(-)
 create mode 100644 drivers/net/ethernet/oki/Kconfig
 create mode 100644 drivers/net/ethernet/oki/Makefile
 create mode 100644 drivers/net/ethernet/oki/pch_gbe/Kconfig
 rename drivers/net/{ => ethernet/oki}/pch_gbe/Makefile (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe.h (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.h (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_ethtool.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_main.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_param.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.c (100%)
 rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 17db195..27e18b9 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1150,25 +1150,6 @@ config S6GMAC
 	  To compile this driver as a module, choose M here. The module
 	  will be called s6gmac.
 
-config PCH_GBE
-	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"
-	depends on PCI
-	select MII
-	---help---
-	  This is a gigabit ethernet driver for EG20T PCH.
-	  EG20T PCH is the platform controller hub that is used in Intel's
-	  general embedded platform.
-	  EG20T PCH has Gigabit Ethernet interface.
-	  Using this interface, it is able to access system devices connected
-	  to Gigabit Ethernet.
-	  This driver enables Gigabit Ethernet function.
-
-	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
-	  Output Hub), ML7223.
-	  ML7223 IOH is for MP(Media Phone) use.
-	  ML7223 is companion chip for Intel Atom E6xx series.
-	  ML7223 is completely compatible for Intel EG20T PCH.
-
 endif # NETDEV_1000
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 24d89c0..fee2851 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -172,5 +172,4 @@ obj-$(CONFIG_WIMAX) += wimax/
 obj-$(CONFIG_CAIF) += caif/
 
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
-obj-$(CONFIG_PCH_GBE) += pch_gbe/
 obj-$(CONFIG_TILE_NET) += tile/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 0c4ba94..cd3fd17 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -30,6 +30,7 @@ source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
+source "drivers/net/ethernet/oki/Kconfig"
 
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 5a27837..f4b36b6 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
+obj-$(CONFIG_NET_VENDOR_OKI) += oki/
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
diff --git a/drivers/net/ethernet/oki/Kconfig b/drivers/net/ethernet/oki/Kconfig
new file mode 100644
index 0000000..a20f442
--- /dev/null
+++ b/drivers/net/ethernet/oki/Kconfig
@@ -0,0 +1,18 @@
+#
+# OKI Semiconductor device configuration
+#
+
+config NET_VENDOR_OKI
+	bool "OKI Semiconductor 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 OKI Semiconductor cards. If you say Y, you will
+	  be asked for your specific card in the following questions.
+
+source "drivers/net/ethernet/oki/pch_gbe/Kconfig"
diff --git a/drivers/net/ethernet/oki/Makefile b/drivers/net/ethernet/oki/Makefile
new file mode 100644
index 0000000..b6780c8
--- /dev/null
+++ b/drivers/net/ethernet/oki/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the OKI Semiconductor device drivers.
+#
+
+obj-$(CONFIG_PCH_GBE) += pch_gbe/
diff --git a/drivers/net/ethernet/oki/pch_gbe/Kconfig b/drivers/net/ethernet/oki/pch_gbe/Kconfig
new file mode 100644
index 0000000..f66fefa
--- /dev/null
+++ b/drivers/net/ethernet/oki/pch_gbe/Kconfig
@@ -0,0 +1,20 @@
+#
+# OKI Semiconductor device configuration
+#
+
+config PCH_GBE
+	tristate "OKI SEMICONDUCTOR ML7223 IOH GbE (Intel EG20T PCH)"
+	depends on NET_VENDOR_OKI && PCI
+	select MII
+	---help---
+	  This is a gigabit ethernet driver for EG20T PCH.
+	  EG20T PCH is the platform controller hub that is used in Intel's
+	  general embedded platform.  EG20T PCH has Gigabit Ethernet interface.
+	  Using this interface, it is able to access system devices connected
+	  to Gigabit Ethernet.  This driver enables Gigabit Ethernet function.
+
+	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
+	  Output Hub), ML7223.
+	  ML7223 IOH is for MP(Media Phone) use.
+	  ML7223 is companion chip for Intel Atom E6xx series.
+	  ML7223 is completely compatible for Intel EG20T PCH.
diff --git a/drivers/net/pch_gbe/Makefile b/drivers/net/ethernet/oki/pch_gbe/Makefile
similarity index 100%
rename from drivers/net/pch_gbe/Makefile
rename to drivers/net/ethernet/oki/pch_gbe/Makefile
diff --git a/drivers/net/pch_gbe/pch_gbe.h b/drivers/net/ethernet/oki/pch_gbe/pch_gbe.h
similarity index 100%
rename from drivers/net/pch_gbe/pch_gbe.h
rename to drivers/net/ethernet/oki/pch_gbe/pch_gbe.h
diff --git a/drivers/net/pch_gbe/pch_gbe_api.c b/drivers/net/ethernet/oki/pch_gbe/pch_gbe_api.c
similarity index 100%
rename from drivers/net/pch_gbe/pch_gbe_api.c
rename to drivers/net/ethernet/oki/pch_gbe/pch_gbe_api.c
diff --git a/drivers/net/pch_gbe/pch_gbe_api.h b/drivers/net/ethernet/oki/pch_gbe/pch_gbe_api.h
similarity index 100%
rename from drivers/net/pch_gbe/pch_gbe_api.h
rename to drivers/net/ethernet/oki/pch_gbe/pch_gbe_api.h
diff --git a/drivers/net/pch_gbe/pch_gbe_ethtool.c b/drivers/net/ethernet/oki/pch_gbe/pch_gbe_ethtool.c
similarity index 100%
rename from drivers/net/pch_gbe/pch_gbe_ethtool.c
rename to drivers/net/ethernet/oki/pch_gbe/pch_gbe_ethtool.c
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki/pch_gbe/pch_gbe_main.c
similarity index 100%
rename from drivers/net/pch_gbe/pch_gbe_main.c
rename to drivers/net/ethernet/oki/pch_gbe/pch_gbe_main.c
diff --git a/drivers/net/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki/pch_gbe/pch_gbe_param.c
similarity index 100%
rename from drivers/net/pch_gbe/pch_gbe_param.c
rename to drivers/net/ethernet/oki/pch_gbe/pch_gbe_param.c
diff --git a/drivers/net/pch_gbe/pch_gbe_phy.c b/drivers/net/ethernet/oki/pch_gbe/pch_gbe_phy.c
similarity index 100%
rename from drivers/net/pch_gbe/pch_gbe_phy.c
rename to drivers/net/ethernet/oki/pch_gbe/pch_gbe_phy.c
diff --git a/drivers/net/pch_gbe/pch_gbe_phy.h b/drivers/net/ethernet/oki/pch_gbe/pch_gbe_phy.h
similarity index 100%
rename from drivers/net/pch_gbe/pch_gbe_phy.h
rename to drivers/net/ethernet/oki/pch_gbe/pch_gbe_phy.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (32 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 33/72] pch_gbe: Move the OKI driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 14:49   ` Arnd Bergmann
  2011-06-25 13:58 ` [RFC 35/72] via-*: Move the VIA drivers Jeff Kirsher
                   ` (40 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Stephen Hemminger

Move the SysKonnect Ethernet drivers into drivers/net/ethernet/syskonnect/
and make the necessary Kconfig and Makefile changes.

CC: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                  |    3 +-
 drivers/net/Kconfig                          |   58 --------------------
 drivers/net/Makefile                         |    2 -
 drivers/net/ethernet/Kconfig                 |    1 +
 drivers/net/ethernet/Makefile                |    1 +
 drivers/net/ethernet/syskonnect/Kconfig      |   74 ++++++++++++++++++++++++++
 drivers/net/ethernet/syskonnect/Makefile     |    6 ++
 drivers/net/{ => ethernet/syskonnect}/skge.c |    0
 drivers/net/{ => ethernet/syskonnect}/skge.h |    0
 drivers/net/{ => ethernet/syskonnect}/sky2.c |    0
 drivers/net/{ => ethernet/syskonnect}/sky2.h |    0
 11 files changed, 83 insertions(+), 62 deletions(-)
 create mode 100644 drivers/net/ethernet/syskonnect/Kconfig
 create mode 100644 drivers/net/ethernet/syskonnect/Makefile
 rename drivers/net/{ => ethernet/syskonnect}/skge.c (100%)
 rename drivers/net/{ => ethernet/syskonnect}/skge.h (100%)
 rename drivers/net/{ => ethernet/syskonnect}/sky2.c (100%)
 rename drivers/net/{ => ethernet/syskonnect}/sky2.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index c9bf3b5..98b3caf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5762,8 +5762,7 @@ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
 M:	Stephen Hemminger <shemminger@linux-foundation.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/skge.*
-F:	drivers/net/sky2.*
+F:	drivers/net/ethernet/syskonnect/
 
 SLAB ALLOCATOR
 M:	Christoph Lameter <cl@linux-foundation.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 27e18b9..1f0c3bf 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -967,64 +967,6 @@ config SIS190
 	  To compile this driver as a module, choose M here: the module
 	  will be called sis190.  This is recommended.
 
-config SKGE
-	tristate "New SysKonnect GigaEthernet support"
-	depends on PCI
-	select CRC32
-	---help---
-	  This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
-	  and related Gigabit Ethernet adapters. It is a new smaller driver
-	  with better performance and more complete ethtool support.
-
-	  It does not support the link failover and network management 
-	  features that "portable" vendor supplied sk98lin driver does.
-
-	  This driver supports adapters based on the original Yukon chipset:
-	  Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
-	  Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
-
-	  It does not support the newer Yukon2 chipset: a separate driver,
-	  sky2, is provided for Yukon2-based adapters.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called skge.  This is recommended.
-
-config SKGE_DEBUG
-	bool "Debugging interface"
-	depends on SKGE && DEBUG_FS
-	help
-	  This option adds the ability to dump driver state for debugging.
-	  The file /sys/kernel/debug/skge/ethX displays the state of the internal
-	  transmit and receive rings.
-
-	  If unsure, say N.
-
-config SKY2
-	tristate "SysKonnect Yukon2 support"
-	depends on PCI
-	select CRC32
-	---help---
-	  This driver supports Gigabit Ethernet adapters based on the
-	  Marvell Yukon 2 chipset:
-	  Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
-	  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
-
-	  There is companion driver for the older Marvell Yukon and
-	  Genesis based adapters: skge.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sky2.  This is recommended.
-
-config SKY2_DEBUG
-	bool "Debugging interface"
-	depends on SKY2 && DEBUG_FS
-	help
-	  This option adds the ability to dump driver state for debugging.
-	  The file /sys/kernel/debug/sky2/ethX displays the state of the internal
-	  transmit and receive rings.
-
-	  If unsure, say N.
-
 config VIA_VELOCITY
 	tristate "VIA Velocity support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index fee2851..f32b45c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -43,8 +43,6 @@ obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
 gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
 ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
 obj-$(CONFIG_TC35815) += tc35815.o
-obj-$(CONFIG_SKGE) += skge.o
-obj-$(CONFIG_SKY2) += sky2.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_KS8842)	+= ks8842.o
 obj-$(CONFIG_KS8851)	+= ks8851.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index cd3fd17..2795982 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -50,6 +50,7 @@ source "drivers/net/ethernet/smc/Kconfig"
 source "drivers/net/ethernet/smsc/Kconfig"
 source "drivers/net/ethernet/stmicro/Kconfig"
 source "drivers/net/ethernet/sun/Kconfig"
+source "drivers/net/ethernet/syskonnect/Kconfig"
 
 config TEHUTI
 	tristate "Tehuti Networks 10G Ethernet"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index f4b36b6..eb3d827 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -32,5 +32,6 @@ obj-$(CONFIG_NET_VENDOR_SMC) += smc/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
 obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
+obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
 obj-$(CONFIG_TEHUTI) += tehuti.o
 obj-$(CONFIG_NET_TULIP) += tulip/
diff --git a/drivers/net/ethernet/syskonnect/Kconfig b/drivers/net/ethernet/syskonnect/Kconfig
new file mode 100644
index 0000000..85b21c5
--- /dev/null
+++ b/drivers/net/ethernet/syskonnect/Kconfig
@@ -0,0 +1,74 @@
+#
+# SysKonnect device configuration
+#
+
+config NET_VENDOR_SYSKONNECT
+	bool "SysKonnect 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 SysKonnect devices. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config SKGE
+	tristate "New SysKonnect GigaEthernet support"
+	depends on NET_VENDOR_SYSKONNECT && PCI
+	select CRC32
+	---help---
+	  This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
+	  and related Gigabit Ethernet adapters. It is a new smaller driver
+	  with better performance and more complete ethtool support.
+
+	  It does not support the link failover and network management
+	  features that "portable" vendor supplied sk98lin driver does.
+
+	  This driver supports adapters based on the original Yukon chipset:
+	  Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
+	  Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
+
+	  It does not support the newer Yukon2 chipset: a separate driver,
+	  sky2, is provided for Yukon2-based adapters.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called skge.  This is recommended.
+
+config SKGE_DEBUG
+	bool "Debugging interface"
+	depends on SKGE && DEBUG_FS
+	---help---
+	  This option adds the ability to dump driver state for debugging.
+	  The file /sys/kernel/debug/skge/ethX displays the state of the internal
+	  transmit and receive rings.
+
+	  If unsure, say N.
+
+config SKY2
+	tristate "SysKonnect Yukon2 support"
+	depends on NET_VENDOR_SYSKONNECT && PCI
+	select CRC32
+	---help---
+	  This driver supports Gigabit Ethernet adapters based on the
+	  Marvell Yukon 2 chipset:
+	  Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
+	  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
+
+	  There is companion driver for the older Marvell Yukon and
+	  Genesis based adapters: skge.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sky2.  This is recommended.
+
+config SKY2_DEBUG
+	bool "Debugging interface"
+	depends on SKY2 && DEBUG_FS
+	---help---
+	  This option adds the ability to dump driver state for debugging.
+	  The file /sys/kernel/debug/sky2/ethX displays the state of the internal
+	  transmit and receive rings.
+
+	  If unsure, say N.
diff --git a/drivers/net/ethernet/syskonnect/Makefile b/drivers/net/ethernet/syskonnect/Makefile
new file mode 100644
index 0000000..76cc7be
--- /dev/null
+++ b/drivers/net/ethernet/syskonnect/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the SysKonnect device drivers.
+#
+
+obj-$(CONFIG_SKGE) += skge.o
+obj-$(CONFIG_SKY2) += sky2.o
diff --git a/drivers/net/skge.c b/drivers/net/ethernet/syskonnect/skge.c
similarity index 100%
rename from drivers/net/skge.c
rename to drivers/net/ethernet/syskonnect/skge.c
diff --git a/drivers/net/skge.h b/drivers/net/ethernet/syskonnect/skge.h
similarity index 100%
rename from drivers/net/skge.h
rename to drivers/net/ethernet/syskonnect/skge.h
diff --git a/drivers/net/sky2.c b/drivers/net/ethernet/syskonnect/sky2.c
similarity index 100%
rename from drivers/net/sky2.c
rename to drivers/net/ethernet/syskonnect/sky2.c
diff --git a/drivers/net/sky2.h b/drivers/net/ethernet/syskonnect/sky2.h
similarity index 100%
rename from drivers/net/sky2.h
rename to drivers/net/ethernet/syskonnect/sky2.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 35/72] via-*: Move the VIA drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (33 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 36/72] eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers Jeff Kirsher
                   ` (39 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Roger Luethi, Francois Romieu

Move the VIA drivers into drivers/net/ethernet/via/ and make the
necessary Kconfig and Makefile changes.

CC: Roger Luethi <rl@hellgate.ch>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                   |    4 +-
 drivers/net/Kconfig                           |   36 -----------------
 drivers/net/Makefile                          |    2 -
 drivers/net/ethernet/Kconfig                  |    1 +
 drivers/net/ethernet/Makefile                 |    1 +
 drivers/net/ethernet/via/Kconfig              |   52 +++++++++++++++++++++++++
 drivers/net/ethernet/via/Makefile             |    6 +++
 drivers/net/{ => ethernet/via}/via-rhine.c    |    0
 drivers/net/{ => ethernet/via}/via-velocity.c |    0
 drivers/net/{ => ethernet/via}/via-velocity.h |    0
 10 files changed, 62 insertions(+), 40 deletions(-)
 create mode 100644 drivers/net/ethernet/via/Kconfig
 create mode 100644 drivers/net/ethernet/via/Makefile
 rename drivers/net/{ => ethernet/via}/via-rhine.c (100%)
 rename drivers/net/{ => ethernet/via}/via-velocity.c (100%)
 rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 98b3caf..70df907 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6749,7 +6749,7 @@ F:	include/linux/vhost.h
 VIA RHINE NETWORK DRIVER
 M:	Roger Luethi <rl@hellgate.ch>
 S:	Maintained
-F:	drivers/net/via-rhine.c
+F:	drivers/net/ethernet/via/via-rhine.c
 
 VIAPRO SMBUS DRIVER
 M:	Jean Delvare <khali@linux-fr.org>
@@ -6777,7 +6777,7 @@ VIA VELOCITY NETWORK DRIVER
 M:	Francois Romieu <romieu@fr.zoreil.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/via-velocity.*
+F:	drivers/net/ethernet/via/via-velocity.*
 
 VLAN (802.1Q)
 M:	Patrick McHardy <kaber@trash.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1f0c3bf..bb68fac 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -767,30 +767,6 @@ config KS8851_MLL
 	  This platform driver is for Micrel KS8851 Address/data bus
 	  multiplexed network chip.
 
-config VIA_RHINE
-	tristate "VIA Rhine support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
-	  Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type
-	  Ethernet functions can also be found integrated on South Bridges
-	  (e.g. VT8235).
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called via-rhine.
-
-config VIA_RHINE_MMIO
-	bool "Use MMIO instead of PIO"
-	depends on VIA_RHINE
-	help
-	  This instructs the driver to use PCI shared memory (MMIO) instead of
-	  programmed I/O ports (PIO). Enabling this gives an improvement in
-	  processing time in parts of the driver.
-
-	  If unsure, say Y.
-
 config SC92031
 	tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
 	depends on NET_PCI && PCI && EXPERIMENTAL
@@ -967,18 +943,6 @@ config SIS190
 	  To compile this driver as a module, choose M here: the module
 	  will be called sis190.  This is recommended.
 
-config VIA_VELOCITY
-	tristate "VIA Velocity support"
-	depends on PCI
-	select CRC32
-	select CRC_CCITT
-	select MII
-	help
-	  If you have a VIA "Velocity" based network card say Y here.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called via-velocity.
-
 config SPIDER_NET
 	tristate "Spider Gigabit Ethernet driver"
 	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f32b45c..47decf6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -48,8 +48,6 @@ obj-$(CONFIG_KS8842)	+= ks8842.o
 obj-$(CONFIG_KS8851)	+= ks8851.o
 obj-$(CONFIG_KS8851_MLL)	+= ks8851_mll.o
 obj-$(CONFIG_KSZ884X_PCI)	+= ksz884x.o
-obj-$(CONFIG_VIA_RHINE) += via-rhine.o
-obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
 obj-$(CONFIG_SH_ETH) += sh_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 2795982..be94115 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -59,5 +59,6 @@ config TEHUTI
 	  Tehuti Networks 10G Ethernet NIC
 
 source "drivers/net/ethernet/tulip/Kconfig"
+source "drivers/net/ethernet/via/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index eb3d827..e07d818 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -35,3 +35,4 @@ obj-$(CONFIG_NET_VENDOR_SUN) += sun/
 obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
 obj-$(CONFIG_TEHUTI) += tehuti.o
 obj-$(CONFIG_NET_TULIP) += tulip/
+obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig
new file mode 100644
index 0000000..e606aa1
--- /dev/null
+++ b/drivers/net/ethernet/via/Kconfig
@@ -0,0 +1,52 @@
+#
+# VIA device configuration
+#
+
+config NET_VENDOR_VIA
+	bool "VIA 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 VIA devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config VIA_RHINE
+	tristate "VIA Rhine support"
+	depends on NET_VENDOR_VIA && PCI
+	select CRC32
+	select MII
+	---help---
+	  If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
+	  Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type
+	  Ethernet functions can also be found integrated on South Bridges
+	  (e.g. VT8235).
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called via-rhine.
+
+config VIA_RHINE_MMIO
+	bool "Use MMIO instead of PIO"
+	depends on VIA_RHINE
+	---help---
+	  This instructs the driver to use PCI shared memory (MMIO) instead of
+	  programmed I/O ports (PIO). Enabling this gives an improvement in
+	  processing time in parts of the driver.
+
+	  If unsure, say Y.
+
+config VIA_VELOCITY
+	tristate "VIA Velocity support"
+	depends on NET_VENDOR_VIA && PCI
+	select CRC32
+	select CRC_CCITT
+	select MII
+	---help---
+	  If you have a VIA "Velocity" based network card say Y here.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called via-velocity.
diff --git a/drivers/net/ethernet/via/Makefile b/drivers/net/ethernet/via/Makefile
new file mode 100644
index 0000000..46c5d4a
--- /dev/null
+++ b/drivers/net/ethernet/via/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the VIA device drivers.
+#
+
+obj-$(CONFIG_VIA_RHINE) += via-rhine.o
+obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
diff --git a/drivers/net/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
similarity index 100%
rename from drivers/net/via-rhine.c
rename to drivers/net/ethernet/via/via-rhine.c
diff --git a/drivers/net/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
similarity index 100%
rename from drivers/net/via-velocity.c
rename to drivers/net/ethernet/via/via-velocity.c
diff --git a/drivers/net/via-velocity.h b/drivers/net/ethernet/via/via-velocity.h
similarity index 100%
rename from drivers/net/via-velocity.h
rename to drivers/net/ethernet/via/via-velocity.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 36/72] eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (34 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 35/72] via-*: Move the VIA drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers Jeff Kirsher
                   ` (38 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Philip Blundell, Mika Kuoppala, bao.ha,
	aris, David Davies, aeb, Hamish Coleman, Donald Becker

Move the ISA drivers into drivers/net/ethernet/isa/ and make the
necessary Kconfig and Makefile changes.

CC: Philip Blundell <philb@gnu.org>
CC: Mika Kuoppala <miku@iki.fi>
CC: <bao.ha@srs.gov>
CC: <aris@cathedrallabs.org>
CC: David Davies <davies@maniac.ultranet.com>
CC: <aeb@cwi.nl>
CC: Hamish Coleman <hamish@zot.apana.org.au>
CC: Donald Becker <becker@scyld.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                               |    4 +-
 drivers/net/Kconfig                       |   98 ----------------------------
 drivers/net/Makefile                      |   10 ---
 drivers/net/ethernet/Kconfig              |    1 +
 drivers/net/ethernet/Makefile             |    1 +
 drivers/net/ethernet/isa/Kconfig          |  101 +++++++++++++++++++++++++++++
 drivers/net/ethernet/isa/Makefile         |   11 +++
 drivers/net/{ => ethernet/isa}/eepro.c    |    0
 drivers/net/{ => ethernet/isa}/eexpress.c |    0
 drivers/net/{ => ethernet/isa}/eexpress.h |    0
 drivers/net/{ => ethernet/isa}/eth16i.c   |    0
 drivers/net/{ => ethernet/isa}/ewrk3.c    |    0
 drivers/net/{ => ethernet/isa}/ewrk3.h    |    0
 drivers/net/{ => ethernet/isa}/lp486e.c   |    0
 drivers/net/{ => ethernet/isa}/seeq8005.c |    0
 drivers/net/{ => ethernet/isa}/seeq8005.h |    0
 drivers/net/{ => ethernet/isa}/znet.c     |    0
 17 files changed, 116 insertions(+), 110 deletions(-)
 create mode 100644 drivers/net/ethernet/isa/Kconfig
 create mode 100644 drivers/net/ethernet/isa/Makefile
 rename drivers/net/{ => ethernet/isa}/eepro.c (100%)
 rename drivers/net/{ => ethernet/isa}/eexpress.c (100%)
 rename drivers/net/{ => ethernet/isa}/eexpress.h (100%)
 rename drivers/net/{ => ethernet/isa}/eth16i.c (100%)
 rename drivers/net/{ => ethernet/isa}/ewrk3.c (100%)
 rename drivers/net/{ => ethernet/isa}/ewrk3.h (100%)
 rename drivers/net/{ => ethernet/isa}/lp486e.c (100%)
 rename drivers/net/{ => ethernet/isa}/seeq8005.c (100%)
 rename drivers/net/{ => ethernet/isa}/seeq8005.h (100%)
 rename drivers/net/{ => ethernet/isa}/znet.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 70df907..160ce2f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2477,7 +2477,7 @@ ETHEREXPRESS-16 NETWORK DRIVER
 M:	Philip Blundell <philb@gnu.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/eexpress.*
+F:	drivers/net/ethernet/isa/eexpress.*
 
 ETHERNET BRIDGE
 M:	Stephen Hemminger <shemminger@linux-foundation.org>
@@ -2491,7 +2491,7 @@ F:	net/bridge/
 ETHERTEAM 16I DRIVER
 M:	Mika Kuoppala <miku@iki.fi>
 S:	Maintained
-F:	drivers/net/eth16i.c
+F:	drivers/net/ethernet/isa/eth16i.c
 
 EXT2 FILE SYSTEM
 M:	Jan Kara <jack@suse.cz>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bb68fac..e352432 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -503,104 +503,6 @@ config HP100
 	  To compile this driver as a module, choose M here. The module
 	  will be called hp100.
 
-config NET_ISA
-	bool "Other ISA cards"
-	depends on ISA
-	---help---
-	  If your network (Ethernet) card hasn't been mentioned yet and its
-	  bus system (that's the way the cards talks to the other components
-	  of your computer) is ISA (as opposed to EISA, VLB or PCI), say Y.
-	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
-	  available from <http://www.tldp.org/docs.html#howto>.
-
-	  If unsure, say Y.
-
-	  Note that the answer to this question doesn't directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the remaining ISA network card questions. If you say Y, you will be
-	  asked for your specific card in the following questions.
-
-config EWRK3
-	tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
-	depends on NET_ISA
-	select CRC32
-	---help---
-	  This driver supports the DE203, DE204 and DE205 network (Ethernet)
-	  cards. If this is for you, say Y and read
-	  <file:Documentation/networking/ewrk3.txt> in the kernel source as
-	  well as the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ewrk3.
-
-config EEXPRESS
-	tristate "EtherExpress 16 support"
-	depends on NET_ISA
-	---help---
-	  If you have an EtherExpress16 network (Ethernet) card, say Y and
-	  read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.  Note that the Intel
-	  EtherExpress16 card used to be regarded as a very poor choice
-	  because the driver was very unreliable. We now have a new driver
-	  that should do better.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called eexpress.
-
-config EEXPRESS_PRO
-	tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
-	depends on NET_ISA
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y. This
-	  driver supports Intel i82595{FX,TX} based boards. Note however
-	  that the EtherExpress PRO/100 Ethernet card has its own separate
-	  driver.  Please read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called eepro.
-
-config LP486E
-	tristate "LP486E on board Ethernet"
-	depends on NET_ISA
-	help
-	  Say Y here to support the 82596-based on-board Ethernet controller
-	  for the Panther motherboard, which is one of the two shipped in the
-	  Intel Professional Workstation.
-
-config ETH16I
-	tristate "ICL EtherTeam 16i/32 support"
-	depends on NET_ISA
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called eth16i.
-
-config ZNET
-	tristate "Zenith Z-Note support (EXPERIMENTAL)"
-	depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
-	help
-	  The Zenith Z-Note notebook computer has a built-in network
-	  (Ethernet) card, and this is the Linux driver for it. Note that the
-	  IBM Thinkpad 300 is compatible with the Z-Note and is also supported
-	  by this driver. Read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-config SEEQ8005
-	tristate "SEEQ8005 support (EXPERIMENTAL)"
-	depends on NET_ISA && EXPERIMENTAL
-	help
-	  This is a driver for the SEEQ 8005 network (Ethernet) card.  If this
-	  is for you, read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called seeq8005.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 47decf6..eee3091 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -59,7 +59,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
 obj-$(CONFIG_SUNDANCE) += sundance.o
 obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
-obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_FEC) += fec.o
@@ -98,23 +97,14 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_EEXPRESS) += eexpress.o
-obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
-obj-$(CONFIG_ZNET) += znet.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_DEPCA) += depca.o
-obj-$(CONFIG_EWRK3) += ewrk3.o
 obj-$(CONFIG_APRICOT) += 82596.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_SNI_82596) += sni_82596.o
 obj-$(CONFIG_MVME16x_NET) += 82596.o
 obj-$(CONFIG_BVME6000_NET) += 82596.o
 obj-$(CONFIG_SC92031) += sc92031.o
-
-# This is also a 82596 and should probably be merged
-obj-$(CONFIG_LP486E) += lp486e.o
-
-obj-$(CONFIG_ETH16I) += eth16i.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index be94115..c584ba7 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -30,6 +30,7 @@ source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
+source "drivers/net/ethernet/isa/Kconfig"
 source "drivers/net/ethernet/oki/Kconfig"
 
 config PASEMI_MAC
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e07d818..1d8dba7 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
+obj-$(CONFIG_NET_ISA) += isa/
 obj-$(CONFIG_NET_VENDOR_OKI) += oki/
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
diff --git a/drivers/net/ethernet/isa/Kconfig b/drivers/net/ethernet/isa/Kconfig
new file mode 100644
index 0000000..a84bcf3
--- /dev/null
+++ b/drivers/net/ethernet/isa/Kconfig
@@ -0,0 +1,101 @@
+#
+# ISA Network device configuration
+#
+
+config NET_ISA
+	bool "Other ISA devices"
+	depends on ISA
+	---help---
+	  If your network (Ethernet) card hasn't been mentioned yet and its
+	  bus system (that's the way the cards talks to the other components
+	  of your computer) is ISA (as opposed to EISA, VLB or PCI), say Y.
+	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  If unsure, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the remaining ISA network card questions. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config EEXPRESS
+	tristate "EtherExpress 16 support"
+	depends on NET_ISA
+	---help---
+	  If you have an EtherExpress16 network (Ethernet) card, say Y and
+	  read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.  Note that the Intel
+	  EtherExpress16 card used to be regarded as a very poor choice
+	  because the driver was very unreliable. We now have a new driver
+	  that should do better.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called eexpress.
+
+config EEXPRESS_PRO
+	tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
+	depends on NET_ISA
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y. This
+	  driver supports Intel i82595{FX,TX} based boards. Note however
+	  that the EtherExpress PRO/100 Ethernet card has its own separate
+	  driver.  Please read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called eepro.
+
+config EWRK3
+	tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
+	depends on NET_ISA
+	select CRC32
+	---help---
+	  This driver supports the DE203, DE204 and DE205 network (Ethernet)
+	  cards. If this is for you, say Y and read
+	  <file:Documentation/networking/ewrk3.txt> in the kernel source as
+	  well as the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ewrk3.
+
+config ETH16I
+	tristate "ICL EtherTeam 16i/32 support"
+	depends on NET_ISA
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called eth16i.
+
+config LP486E
+	tristate "LP486E on board Ethernet"
+	depends on NET_ISA
+	---help---
+	  Say Y here to support the 82596-based on-board Ethernet controller
+	  for the Panther motherboard, which is one of the two shipped in the
+	  Intel Professional Workstation.
+
+config SEEQ8005
+	tristate "SEEQ8005 support (EXPERIMENTAL)"
+	depends on NET_ISA && EXPERIMENTAL
+	---help---
+	  This is a driver for the SEEQ 8005 network (Ethernet) card.  If this
+	  is for you, read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called seeq8005.
+
+config ZNET
+	tristate "Zenith Z-Note support (EXPERIMENTAL)"
+	depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
+	---help---
+	  The Zenith Z-Note notebook computer has a built-in network
+	  (Ethernet) card, and this is the Linux driver for it. Note that the
+	  IBM Thinkpad 300 is compatible with the Z-Note and is also supported
+	  by this driver. Read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
diff --git a/drivers/net/ethernet/isa/Makefile b/drivers/net/ethernet/isa/Makefile
new file mode 100644
index 0000000..8901588
--- /dev/null
+++ b/drivers/net/ethernet/isa/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the ISA network device drivers.
+#
+
+obj-$(CONFIG_EEXPRESS) += eexpress.o
+obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
+obj-$(CONFIG_ETH16I) += eth16i.o
+obj-$(CONFIG_EWRK3) += ewrk3.o
+obj-$(CONFIG_LP486E) += lp486e.o
+obj-$(CONFIG_SEEQ8005) += seeq8005.o
+obj-$(CONFIG_ZNET) += znet.o
diff --git a/drivers/net/eepro.c b/drivers/net/ethernet/isa/eepro.c
similarity index 100%
rename from drivers/net/eepro.c
rename to drivers/net/ethernet/isa/eepro.c
diff --git a/drivers/net/eexpress.c b/drivers/net/ethernet/isa/eexpress.c
similarity index 100%
rename from drivers/net/eexpress.c
rename to drivers/net/ethernet/isa/eexpress.c
diff --git a/drivers/net/eexpress.h b/drivers/net/ethernet/isa/eexpress.h
similarity index 100%
rename from drivers/net/eexpress.h
rename to drivers/net/ethernet/isa/eexpress.h
diff --git a/drivers/net/eth16i.c b/drivers/net/ethernet/isa/eth16i.c
similarity index 100%
rename from drivers/net/eth16i.c
rename to drivers/net/ethernet/isa/eth16i.c
diff --git a/drivers/net/ewrk3.c b/drivers/net/ethernet/isa/ewrk3.c
similarity index 100%
rename from drivers/net/ewrk3.c
rename to drivers/net/ethernet/isa/ewrk3.c
diff --git a/drivers/net/ewrk3.h b/drivers/net/ethernet/isa/ewrk3.h
similarity index 100%
rename from drivers/net/ewrk3.h
rename to drivers/net/ethernet/isa/ewrk3.h
diff --git a/drivers/net/lp486e.c b/drivers/net/ethernet/isa/lp486e.c
similarity index 100%
rename from drivers/net/lp486e.c
rename to drivers/net/ethernet/isa/lp486e.c
diff --git a/drivers/net/seeq8005.c b/drivers/net/ethernet/isa/seeq8005.c
similarity index 100%
rename from drivers/net/seeq8005.c
rename to drivers/net/ethernet/isa/seeq8005.c
diff --git a/drivers/net/seeq8005.h b/drivers/net/ethernet/isa/seeq8005.h
similarity index 100%
rename from drivers/net/seeq8005.h
rename to drivers/net/ethernet/isa/seeq8005.h
diff --git a/drivers/net/znet.c b/drivers/net/ethernet/isa/znet.c
similarity index 100%
rename from drivers/net/znet.c
rename to drivers/net/ethernet/isa/znet.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (35 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 36/72] eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-29 15:39   ` Tabi Timur-B04825
  2011-06-25 13:58 ` [RFC 38/72] ks8*/ksz8*: Move the Micrel drivers Jeff Kirsher
                   ` (37 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Sandeep Gopalpet, Andy Fleming,
	Shlomi Gridish, Li Yang, Pantelis Antoniou, Vitaly Bordug

Move the Freescale driver into drivers/net/ethernet/freescale/ and
make the necessary Kconfig and Makefile changes.

CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
CC: Andy Fleming <afleming@freescale.com>
CC: Shlomi Gridish <gridish@freescale.com>
CC: Li Yang <leoli@freescale.com>
CC: Pantelis Antoniou <pantelis.antoniou@gmail.com>
CC: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    4 +-
 drivers/net/Kconfig                                |   33 -------------
 drivers/net/Makefile                               |   14 ------
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/freescale/Kconfig             |   48 ++++++++++++++++++++
 drivers/net/ethernet/freescale/Makefile            |   13 +++++
 .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
 .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
 drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
 .../freescale}/fs_enet/fs_enet-main.c              |    0
 .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
 .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
 .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
 .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
 .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
 .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
 drivers/net/{ => ethernet/freescale}/gianfar.c     |    0
 drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
 .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
 drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
 .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
 drivers/net/{ => ethernet/freescale}/ucc_geth.c    |    0
 drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
 .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
 27 files changed, 66 insertions(+), 50 deletions(-)
 create mode 100644 drivers/net/ethernet/freescale/Kconfig
 create mode 100644 drivers/net/ethernet/freescale/Makefile
 rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
 rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar.c (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
 rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
 rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (100%)
 rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
 rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 160ce2f..bbb609b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2656,7 +2656,7 @@ M:	Vitaly Bordug <vbordug@ru.mvista.com>
 L:	linuxppc-dev@lists.ozlabs.org
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/fs_enet/
+F:	drivers/net/ethernet/freescale/fs_enet/
 F:	include/linux/fs_enet_pd.h
 
 FREESCALE QUICC ENGINE LIBRARY
@@ -2678,7 +2678,7 @@ M:	Li Yang <leoli@freescale.com>
 L:	netdev@vger.kernel.org
 L:	linuxppc-dev@lists.ozlabs.org
 S:	Maintained
-F:	drivers/net/ucc_geth*
+F:	drivers/net/ethernet/freescale/ucc_geth*
 
 FREESCALE QUICC ENGINE UCC UART DRIVER
 M:	Timur Tabi <timur@freescale.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e352432..71efe31 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -765,9 +765,6 @@ config LANTIQ_ETOP
 	help
 	  Support for the MII0 inside the Lantiq SoC
 
-
-source "drivers/net/fs_enet/Kconfig"
-
 source "drivers/net/octeon/Kconfig"
 
 endif # NET_ETHERNET
@@ -884,36 +881,6 @@ config GELIC_WIRELESS
 	  the driver automatically distinguishes the models, you can
 	  safely enable this option even if you have a wireless-less model.
 
-config FSL_PQ_MDIO
-	tristate "Freescale PQ MDIO"
-	depends on FSL_SOC
-	select PHYLIB
-	help
-	  This driver supports the MDIO bus used by the gianfar and UCC drivers.
-
-config GIANFAR
-	tristate "Gianfar Ethernet"
-	depends on FSL_SOC
-	select FSL_PQ_MDIO
-	select PHYLIB
-	select CRC32
-	help
-	  This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
-	  and MPC86xx family of chips, and the FEC on the 8540.
-
-config UCC_GETH
-	tristate "Freescale QE Gigabit Ethernet"
-	depends on QUICC_ENGINE
-	select FSL_PQ_MDIO
-	select PHYLIB
-	help
-	  This driver supports the Gigabit Ethernet mode of the QUICC Engine,
-	  which is available on some Freescale SOCs.
-
-config UGETH_TX_ON_DEMAND
-	bool "Transmit on Demand support"
-	depends on UCC_GETH
-
 config MV643XX_ETH
 	tristate "Marvell Discovery (643XX) and Orion ethernet support"
 	depends on (MV64X60 || PPC32 || PLAT_ORION) && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index eee3091..0b1c240 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -5,24 +5,12 @@
 obj-$(CONFIG_MII) += mii.o
 obj-$(CONFIG_MDIO) += mdio.o
 obj-$(CONFIG_PHYLIB) += phy/
-
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_GIANFAR) += gianfar_driver.o
-obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
 obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_VMXNET3) += vmxnet3/
 
-gianfar_driver-objs := gianfar.o \
-		gianfar_ethtool.o \
-		gianfar_sysfs.o
-
-obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
-ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
-
-obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
-
 #
 # link order important here
 #
@@ -150,8 +138,6 @@ obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
 
-obj-$(CONFIG_FS_ENET) += fs_enet/
-
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 
 obj-$(CONFIG_WIMAX) += wimax/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c584ba7..8654b69 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -24,6 +24,7 @@ source "drivers/net/ethernet/dlink/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/faraday/Kconfig"
+source "drivers/net/ethernet/freescale/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 1d8dba7..a09193f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
+obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
new file mode 100644
index 0000000..192286e
--- /dev/null
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -0,0 +1,48 @@
+#
+# Freescale device configuration
+#
+
+config NET_VENDOR_FEESCALE
+	bool "Freescale devices"
+	depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x
+	---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 IBM devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+source "drivers/net/ethernet/freescale/fs_enet/Kconfig"
+
+config FSL_PQ_MDIO
+	tristate "Freescale PQ MDIO"
+	depends on NET_VENDOR_FREESCALE && FSL_SOC
+	select PHYLIB
+	---help---
+	  This driver supports the MDIO bus used by the gianfar and UCC drivers.
+
+config UCC_GETH
+	tristate "Freescale QE Gigabit Ethernet"
+	depends on NET_VENDOR_FREESCALE && QUICC_ENGINE
+	select FSL_PQ_MDIO
+	select PHYLIB
+	---help---
+	  This driver supports the Gigabit Ethernet mode of the QUICC Engine,
+	  which is available on some Freescale SOCs.
+
+config UGETH_TX_ON_DEMAND
+	bool "Transmit on Demand support"
+	depends on UCC_GETH
+
+config GIANFAR
+	tristate "Gianfar Ethernet"
+	depends on NET_VENDOR_FREESCALE && FSL_SOC
+	select FSL_PQ_MDIO
+	select PHYLIB
+	select CRC32
+	---help---
+	  This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
+	  and MPC86xx family of chips, and the FEC on the 8540.
diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile
new file mode 100644
index 0000000..7f7fae9
--- /dev/null
+++ b/drivers/net/ethernet/freescale/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the Freescale network device drivers.
+#
+
+obj-$(CONFIG_FS_ENET) += fs_enet/
+obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
+obj-$(CONFIG_GIANFAR) += gianfar_driver.o
+obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
+gianfar_driver-objs := gianfar.o \
+		gianfar_ethtool.o \
+		gianfar_sysfs.o
+obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
+ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
diff --git a/drivers/net/fs_enet/Kconfig b/drivers/net/ethernet/freescale/fs_enet/Kconfig
similarity index 91%
rename from drivers/net/fs_enet/Kconfig
rename to drivers/net/ethernet/freescale/fs_enet/Kconfig
index fc073b5..be92229 100644
--- a/drivers/net/fs_enet/Kconfig
+++ b/drivers/net/ethernet/freescale/fs_enet/Kconfig
@@ -1,6 +1,6 @@
 config FS_ENET
        tristate "Freescale Ethernet Driver"
-       depends on CPM1 || CPM2 || PPC_MPC512x
+       depends on NET_VENDOR_FREESCALE && (CPM1 || CPM2 || PPC_MPC512x)
        select MII
        select PHYLIB
 
diff --git a/drivers/net/fs_enet/Makefile b/drivers/net/ethernet/freescale/fs_enet/Makefile
similarity index 100%
rename from drivers/net/fs_enet/Makefile
rename to drivers/net/ethernet/freescale/fs_enet/Makefile
diff --git a/drivers/net/fs_enet/fec.h b/drivers/net/ethernet/freescale/fs_enet/fec.h
similarity index 100%
rename from drivers/net/fs_enet/fec.h
rename to drivers/net/ethernet/freescale/fs_enet/fec.h
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
similarity index 100%
rename from drivers/net/fs_enet/fs_enet-main.c
rename to drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
similarity index 100%
rename from drivers/net/fs_enet/fs_enet.h
rename to drivers/net/ethernet/freescale/fs_enet/fs_enet.h
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
similarity index 100%
rename from drivers/net/fs_enet/mac-fcc.c
rename to drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
similarity index 100%
rename from drivers/net/fs_enet/mac-fec.c
rename to drivers/net/ethernet/freescale/fs_enet/mac-fec.c
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
similarity index 100%
rename from drivers/net/fs_enet/mac-scc.c
rename to drivers/net/ethernet/freescale/fs_enet/mac-scc.c
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
similarity index 100%
rename from drivers/net/fs_enet/mii-bitbang.c
rename to drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
similarity index 100%
rename from drivers/net/fs_enet/mii-fec.c
rename to drivers/net/ethernet/freescale/fs_enet/mii-fec.c
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
similarity index 100%
rename from drivers/net/fsl_pq_mdio.c
rename to drivers/net/ethernet/freescale/fsl_pq_mdio.c
diff --git a/drivers/net/fsl_pq_mdio.h b/drivers/net/ethernet/freescale/fsl_pq_mdio.h
similarity index 100%
rename from drivers/net/fsl_pq_mdio.h
rename to drivers/net/ethernet/freescale/fsl_pq_mdio.h
diff --git a/drivers/net/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
similarity index 100%
rename from drivers/net/gianfar.c
rename to drivers/net/ethernet/freescale/gianfar.c
diff --git a/drivers/net/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
similarity index 100%
rename from drivers/net/gianfar.h
rename to drivers/net/ethernet/freescale/gianfar.h
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
similarity index 100%
rename from drivers/net/gianfar_ethtool.c
rename to drivers/net/ethernet/freescale/gianfar_ethtool.c
diff --git a/drivers/net/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
similarity index 100%
rename from drivers/net/gianfar_ptp.c
rename to drivers/net/ethernet/freescale/gianfar_ptp.c
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/ethernet/freescale/gianfar_sysfs.c
similarity index 100%
rename from drivers/net/gianfar_sysfs.c
rename to drivers/net/ethernet/freescale/gianfar_sysfs.c
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
similarity index 100%
rename from drivers/net/ucc_geth.c
rename to drivers/net/ethernet/freescale/ucc_geth.c
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
similarity index 100%
rename from drivers/net/ucc_geth.h
rename to drivers/net/ethernet/freescale/ucc_geth.h
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
similarity index 100%
rename from drivers/net/ucc_geth_ethtool.c
rename to drivers/net/ethernet/freescale/ucc_geth_ethtool.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 38/72] ks8*/ksz8*: Move the Micrel drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (36 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 39/72] mv643xx/pxa168: Move the Marvell drivers Jeff Kirsher
                   ` (36 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Ben Dooks, Tristram Ha

Move the Micrel drivers into drivers/net/ethernet/micrel/ and
make the necessary Kconfig and Makefile changes.

CC: Ben Dooks <ben@simtec.co.uk>
CC: Tristram Ha <Tristram.Ha@micrel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                            |   35 ----------------
 drivers/net/Makefile                           |    4 --
 drivers/net/ethernet/Kconfig                   |    1 +
 drivers/net/ethernet/Makefile                  |    1 +
 drivers/net/ethernet/micrel/Kconfig            |   51 ++++++++++++++++++++++++
 drivers/net/ethernet/micrel/Makefile           |    8 ++++
 drivers/net/{ => ethernet/micrel}/ks8842.c     |    0
 drivers/net/{ => ethernet/micrel}/ks8851.c     |    0
 drivers/net/{ => ethernet/micrel}/ks8851.h     |    0
 drivers/net/{ => ethernet/micrel}/ks8851_mll.c |    0
 drivers/net/{ => ethernet/micrel}/ksz884x.c    |    0
 11 files changed, 61 insertions(+), 39 deletions(-)
 create mode 100644 drivers/net/ethernet/micrel/Kconfig
 create mode 100644 drivers/net/ethernet/micrel/Makefile
 rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
 rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
 rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
 rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
 rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 71efe31..be261ec 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -531,17 +531,6 @@ config ADAPTEC_STARFIRE
 	  To compile this driver as a module, choose M here: the module
 	  will be called starfire.  This is recommended.
 
-config KSZ884X_PCI
-	tristate "Micrel KSZ8841/2 PCI"
-	depends on NET_PCI && PCI
-	select MII
-	select CRC32
-	help
-	  This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ksz884x.
-
 config APRICOT
 	tristate "Apricot Xen-II on board Ethernet"
 	depends on NET_PCI && ISA
@@ -645,30 +634,6 @@ config TLAN
 
 	  Please email feedback to <torben.mathiasen@compaq.com>.
 
-config KS8842
-	tristate "Micrel KSZ8841/42 with generic bus interface"
-	depends on HAS_IOMEM && DMA_ENGINE
-	help
-	  This platform driver is for KSZ8841(1-port) / KS8842(2-port)
-	  ethernet switch chip (managed, VLAN, QoS) from Micrel or
-	  Timberdale(FPGA).
-
-config KS8851
-	tristate "Micrel KS8851 SPI"
-	depends on SPI
-	select MII
-	select CRC32
-	help
-	  SPI driver for Micrel KS8851 SPI attached network chip.
-
-config KS8851_MLL
-	tristate "Micrel KS8851 MLL"
-	depends on HAS_IOMEM
-	select MII
-	help
-	  This platform driver is for Micrel KS8851 Address/data bus
-	  multiplexed network chip.
-
 config SC92031
 	tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
 	depends on NET_PCI && PCI && EXPERIMENTAL
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0b1c240..c68cdea 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -32,10 +32,6 @@ gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
 ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKFP) += skfp/
-obj-$(CONFIG_KS8842)	+= ks8842.o
-obj-$(CONFIG_KS8851)	+= ks8851.o
-obj-$(CONFIG_KS8851_MLL)	+= ks8851_mll.o
-obj-$(CONFIG_KSZ884X_PCI)	+= ksz884x.o
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
 obj-$(CONFIG_SH_ETH) += sh_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 8654b69..f434fc8 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -28,6 +28,7 @@ source "drivers/net/ethernet/freescale/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
+source "drivers/net/ethernet/micrel/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a09193f..3a9f47d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
+obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_ISA) += isa/
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
new file mode 100644
index 0000000..c315bff
--- /dev/null
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -0,0 +1,51 @@
+#
+# Micrel device configuration
+#
+
+config NET_VENDOR_MICREL
+	bool "Micrel devices"
+	depends on HAS_IOMEM || DMA_ENGINE || SPI || 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 Micrel devices. If you say Y, you will be asked
+	  for your specific card in the following questions.
+
+config KS8842
+	tristate "Micrel KSZ8841/42 with generic bus interface"
+	depends on NET_VENDOR_MICREL && HAS_IOMEM && DMA_ENGINE
+	---help---
+	  This platform driver is for KSZ8841(1-port) / KS8842(2-port)
+	  ethernet switch chip (managed, VLAN, QoS) from Micrel or
+	  Timberdale(FPGA).
+
+config KS8851
+	tristate "Micrel KS8851 SPI"
+	depends on NET_VENDOR_MICREL && SPI
+	select MII
+	select CRC32
+	---help---
+	  SPI driver for Micrel KS8851 SPI attached network chip.
+
+config KS8851_MLL
+	tristate "Micrel KS8851 MLL"
+	depends on NET_VENDOR_MICREL && HAS_IOMEM
+	select MII
+	---help---
+	  This platform driver is for Micrel KS8851 Address/data bus
+	  multiplexed network chip.
+
+config KSZ884X_PCI
+	tristate "Micrel KSZ8841/2 PCI"
+	depends on NET_VENDOR_MICREL && PCI
+	select MII
+	select CRC32
+	---help---
+	  This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ksz884x.
diff --git a/drivers/net/ethernet/micrel/Makefile b/drivers/net/ethernet/micrel/Makefile
new file mode 100644
index 0000000..c050942
--- /dev/null
+++ b/drivers/net/ethernet/micrel/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the Micrel network device drivers.
+#
+
+obj-$(CONFIG_KS8842) += ks8842.o
+obj-$(CONFIG_KS8851) += ks8851.o
+obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
+obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o
diff --git a/drivers/net/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
similarity index 100%
rename from drivers/net/ks8842.c
rename to drivers/net/ethernet/micrel/ks8842.c
diff --git a/drivers/net/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
similarity index 100%
rename from drivers/net/ks8851.c
rename to drivers/net/ethernet/micrel/ks8851.c
diff --git a/drivers/net/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h
similarity index 100%
rename from drivers/net/ks8851.h
rename to drivers/net/ethernet/micrel/ks8851.h
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
similarity index 100%
rename from drivers/net/ks8851_mll.c
rename to drivers/net/ethernet/micrel/ks8851_mll.c
diff --git a/drivers/net/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
similarity index 100%
rename from drivers/net/ksz884x.c
rename to drivers/net/ethernet/micrel/ksz884x.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 39/72] mv643xx/pxa168: Move the Marvell drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (37 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 38/72] ks8*/ksz8*: Move the Micrel drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 40/72] spider_net: Move the spider_net (IBM) driver Jeff Kirsher
                   ` (35 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Sachin Sanap, Zhangfei Gao, Philip Rakity,
	Mark Brown, Lennert Buytenhek

Move the Marvell drivers into driver/net/ethernet/marvell and make
the necessary Kconfig and Makefile changes.

CC: Sachin Sanap <ssanap@marvell.com>
CC: Zhangfei Gao <zgao6@marvell.com>
CC: Philip Rakity <prakity@marvell.com>
CC: Mark Brown <markb@marvell.com>
CC: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                      |    2 +-
 drivers/net/Kconfig                              |   23 ------------
 drivers/net/Makefile                             |    2 -
 drivers/net/ethernet/Kconfig                     |    1 +
 drivers/net/ethernet/Makefile                    |    1 +
 drivers/net/ethernet/marvell/Kconfig             |   40 ++++++++++++++++++++++
 drivers/net/ethernet/marvell/Makefile            |    6 +++
 drivers/net/{ => ethernet/marvell}/mv643xx_eth.c |    0
 drivers/net/{ => ethernet/marvell}/pxa168_eth.c  |    0
 9 files changed, 49 insertions(+), 26 deletions(-)
 create mode 100644 drivers/net/ethernet/marvell/Kconfig
 create mode 100644 drivers/net/ethernet/marvell/Makefile
 rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (100%)
 rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index bbb609b..27bb4a2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4076,7 +4076,7 @@ MARVELL MV643XX ETHERNET DRIVER
 M:	Lennert Buytenhek <buytenh@wantstofly.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/mv643xx_eth.*
+F:	drivers/net/ethernet/marvell/mv643xx_eth.*
 F:	include/linux/mv643xx.h
 
 MARVELL MWL8K WIRELESS DRIVER
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index be261ec..4bfd5e3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -373,16 +373,6 @@ config BFIN_MAC_USE_HWSTAMP
 	help
 	  To support the IEEE 1588 Precision Time Protocol (PTP), select y here
 
-config PXA168_ETH
-	tristate "Marvell pxa168 ethernet support"
-	depends on CPU_PXA168
-	select PHYLIB
-	help
-	  This driver supports the pxa168 Ethernet ports.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called pxa168_eth.
-
 config NET_NETX
 	tristate "NetX Ethernet support"
 	select MII
@@ -846,19 +836,6 @@ config GELIC_WIRELESS
 	  the driver automatically distinguishes the models, you can
 	  safely enable this option even if you have a wireless-less model.
 
-config MV643XX_ETH
-	tristate "Marvell Discovery (643XX) and Orion ethernet support"
-	depends on (MV64X60 || PPC32 || PLAT_ORION) && INET
-	select INET_LRO
-	select PHYLIB
-	help
-	  This driver supports the gigabit ethernet MACs in the
-	  Marvell Discovery PPC/MIPS chipset family (MV643XX) and
-	  in the Marvell Orion ARM SoC family.
-
-	  Some boards that use the Discovery chipset are the Momenco
-	  Ocelot C and Jaguar ATX and Pegasos II.
-
 config XILINX_LL_TEMAC
 	tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
 	depends on PPC || MICROBLAZE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c68cdea..3aca65c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_68360_ENET) += 68360enet.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
-obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
 ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
 obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
 obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
@@ -98,7 +97,6 @@ obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
-obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_ENC28J60) += enc28j60.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index f434fc8..9b5eca3 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -27,6 +27,7 @@ source "drivers/net/ethernet/faraday/Kconfig"
 source "drivers/net/ethernet/freescale/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
+source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/micrel/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3a9f47d..23ebc6e 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
 obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
new file mode 100644
index 0000000..c32e941
--- /dev/null
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -0,0 +1,40 @@
+#
+# Marvell device configuration
+#
+
+config NET_VENDOR_MARVELL
+	bool "Marvell devices"
+	depends on CPU_PXA168 || ((MV64X60 || PPC32 || PLAT_ORION) && INET)
+	---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 Marvell devices. If you say Y, you will be asked
+	  for your specific card in the following questions.
+
+config PXA168_ETH
+	tristate "Marvell pxa168 ethernet support"
+	depends on NET_VENDOR_MARVELL && CPU_PXA168
+	select PHYLIB
+	---help---
+	  This driver supports the pxa168 Ethernet ports.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called pxa168_eth.
+
+config MV643XX_ETH
+	tristate "Marvell Discovery (643XX) and Orion ethernet support"
+	depends on NET_VENDOR_MARVELL && (MV64X60 || PPC32 || PLAT_ORION) \
+		   && INET
+	select INET_LRO
+	select PHYLIB
+	---help---
+	  This driver supports the gigabit ethernet MACs in the
+	  Marvell Discovery PPC/MIPS chipset family (MV643XX) and
+	  in the Marvell Orion ARM SoC family.
+
+	  Some boards that use the Discovery chipset are the Momenco
+	  Ocelot C and Jaguar ATX and Pegasos II.
diff --git a/drivers/net/ethernet/marvell/Makefile b/drivers/net/ethernet/marvell/Makefile
new file mode 100644
index 0000000..6809047
--- /dev/null
+++ b/drivers/net/ethernet/marvell/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Marvell network device drivers.
+#
+
+obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
+obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
similarity index 100%
rename from drivers/net/mv643xx_eth.c
rename to drivers/net/ethernet/marvell/mv643xx_eth.c
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
similarity index 100%
rename from drivers/net/pxa168_eth.c
rename to drivers/net/ethernet/marvell/pxa168_eth.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 40/72] spider_net: Move the spider_net (IBM) driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (38 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 39/72] mv643xx/pxa168: Move the Marvell drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 14:34   ` Arnd Bergmann
  2011-06-25 13:58 ` [RFC 41/72] sis*: Move the Silicon Integrated Systems (SiS) drivers Jeff Kirsher
                   ` (34 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Utz Bacher, Jens Osterkamp, Ishizaki Kou

Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/ and
make the necessary Kconfig and Makefile changes

CC: Utz Bacher <utz.bacher@de.ibm.com>
CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |    8 --------
 drivers/net/Makefile                               |    2 --
 drivers/net/ethernet/ibm/Kconfig                   |   11 ++++++++++-
 drivers/net/ethernet/ibm/Makefile                  |    2 ++
 drivers/net/{ => ethernet/ibm}/spider_net.c        |    0
 drivers/net/{ => ethernet/ibm}/spider_net.h        |    2 +-
 .../net/{ => ethernet/ibm}/spider_net_ethtool.c    |    0
 8 files changed, 14 insertions(+), 13 deletions(-)
 rename drivers/net/{ => ethernet/ibm}/spider_net.c (100%)
 rename drivers/net/{ => ethernet/ibm}/spider_net.h (99%)
 rename drivers/net/{ => ethernet/ibm}/spider_net_ethtool.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 27bb4a2..7fa33bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5992,7 +5992,7 @@ M:	Jens Osterkamp <jens@de.ibm.com>
 L:	netdev@vger.kernel.org
 S:	Supported
 F:	Documentation/networking/spider_net.txt
-F:	drivers/net/spider_net*
+F:	drivers/net/ethernet/ibm/spider_net*
 
 SPU FILE SYSTEM
 M:	Jeremy Kerr <jk@ozlabs.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4bfd5e3..b8894ad 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -797,14 +797,6 @@ config SIS190
 	  To compile this driver as a module, choose M here: the module
 	  will be called sis190.  This is recommended.
 
-config SPIDER_NET
-	tristate "Spider Gigabit Ethernet driver"
-	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
-	select FW_LOADER
-	help
-	  This driver supports the Gigabit Ethernet chips present on the
-	  Cell Processor-Based Blades from IBM.
-
 config TSI108_ETH
 	tristate "Tundra TSI108 gigabit Ethernet support"
 	depends on TSI108_BRIDGE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3aca65c..fe9b44c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -25,8 +25,6 @@ obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_FEALNX) += fealnx.o
-spidernet-y += spider_net.o spider_net_ethtool.o
-obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
 gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
 ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
index ac755a3..54fcdcb 100644
--- a/drivers/net/ethernet/ibm/Kconfig
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -4,7 +4,8 @@
 
 config NET_VENDOR_IBM
 	bool "IBM devices"
-	depends on MCA || PPC_PSERIES || PPC_DCR || IBMEBUS
+	depends on MCA || PPC_PSERIES || PPC_DCR || IBMEBUS || (PCI && \
+		  (PPC_IBM_CELL_BLADE || PPC_CELLEB))
 	---help---
 	  If you have a network (Ethernet) card belonging to this class, say Y
 	  and read the Ethernet-HOWTO, available from
@@ -51,3 +52,11 @@ config EHEA
 
 	  To compile the driver as a module, choose M here. The module
 	  will be called ehea.
+
+config SPIDER_NET
+	tristate "Spider Gigabit Ethernet driver"
+	depends on NET_VENDOR_IBM && PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
+	select FW_LOADER
+	---help---
+	  This driver supports the Gigabit Ethernet chips present on the
+	  Cell Processor-Based Blades from IBM.
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile
index a63a8c3..76c1646 100644
--- a/drivers/net/ethernet/ibm/Makefile
+++ b/drivers/net/ethernet/ibm/Makefile
@@ -6,3 +6,5 @@ obj-$(CONFIG_IBMLANA) += ibmlana.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
 obj-$(CONFIG_EHEA) += ehea/
+spidernet-y += spider_net.o spider_net_ethtool.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o ../sun/sungem_phy.o
diff --git a/drivers/net/spider_net.c b/drivers/net/ethernet/ibm/spider_net.c
similarity index 100%
rename from drivers/net/spider_net.c
rename to drivers/net/ethernet/ibm/spider_net.c
diff --git a/drivers/net/spider_net.h b/drivers/net/ethernet/ibm/spider_net.h
similarity index 99%
rename from drivers/net/spider_net.h
rename to drivers/net/ethernet/ibm/spider_net.h
index a891ad0..9bfce7c 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/ethernet/ibm/spider_net.h
@@ -27,7 +27,7 @@
 
 #define VERSION "2.0 B"
 
-#include "./ethernet/sun/sungem_phy.h"
+#include "../sun/sungem_phy.h"
 
 extern int spider_net_stop(struct net_device *netdev);
 extern int spider_net_open(struct net_device *netdev);
diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/ethernet/ibm/spider_net_ethtool.c
similarity index 100%
rename from drivers/net/spider_net_ethtool.c
rename to drivers/net/ethernet/ibm/spider_net_ethtool.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 41/72] sis*: Move the Silicon Integrated Systems (SiS) drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (39 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 40/72] spider_net: Move the spider_net (IBM) driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 42/72] 82586.c/fec*: Move the Motorola drivers Jeff Kirsher
                   ` (33 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Daniele Venzano, Francois Romieu

Move the SiS drivers into drivers/net/ethernet/sis/ and make the
necessary Kconfig and Makefile changes

CC: Daniele Venzano <venza@brownhat.org>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                             |    4 +-
 drivers/net/Kconfig                     |   30 --------------------
 drivers/net/Makefile                    |    2 -
 drivers/net/ethernet/Kconfig            |    1 +
 drivers/net/ethernet/Makefile           |    1 +
 drivers/net/ethernet/sis/Kconfig        |   46 +++++++++++++++++++++++++++++++
 drivers/net/ethernet/sis/Makefile       |    6 ++++
 drivers/net/{ => ethernet/sis}/sis190.c |    0
 drivers/net/{ => ethernet/sis}/sis900.c |    0
 drivers/net/{ => ethernet/sis}/sis900.h |    0
 10 files changed, 56 insertions(+), 34 deletions(-)
 create mode 100644 drivers/net/ethernet/sis/Kconfig
 create mode 100644 drivers/net/ethernet/sis/Makefile
 rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
 rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
 rename drivers/net/{ => ethernet/sis}/sis900.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7fa33bd..fa2f1bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5728,14 +5728,14 @@ SIS 190 ETHERNET DRIVER
 M:	Francois Romieu <romieu@fr.zoreil.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/sis190.c
+F:	drivers/net/ethernet/sis/sis190.c
 
 SIS 900/7016 FAST ETHERNET DRIVER
 M:	Daniele Venzano <venza@brownhat.org>
 W:	http://www.brownhat.org/sis900.html
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/sis900.*
+F:	drivers/net/ethernet/sis/sis900.*
 
 SIS 96X I2C/SMBUS DRIVER
 M:	"Mark M. Hoffman" <mhoffman@lightlink.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b8894ad..37e06ae 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -570,22 +570,6 @@ config R6040
 	  To compile this driver as a module, choose M here: the module
 	  will be called r6040. This is recommended.
 
-config SIS900
-	tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	---help---
-	  This is a driver for the Fast Ethernet PCI network cards based on
-	  the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
-	  SiS 630 and SiS 540 chipsets.
-
-	  This driver also supports AMD 79C901 HomePNA so that you can use
-	  your phone line as a network cable.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sis900.  This is recommended.
-
 config SUNDANCE
 	tristate "Sundance Alta support"
 	depends on NET_PCI && PCI
@@ -783,20 +767,6 @@ config YELLOWFIN
 	  To compile this driver as a module, choose M here: the module
 	  will be called yellowfin.  This is recommended.
 
-config SIS190
-	tristate "SiS190/SiS191 gigabit ethernet support"
-	depends on PCI
-	select CRC32
-	select MII
-	---help---
-	  Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
-	  a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
-	  appear in lan on motherboard designs which are based on SiS 965
-	  and SiS 966 south bridge.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sis190.  This is recommended.
-
 config TSI108_ETH
 	tristate "Tundra TSI108 gigabit Ethernet support"
 	depends on TSI108_BRIDGE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index fe9b44c..d1724fa 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,8 +19,6 @@ obj-$(CONFIG_PLIP) += plip.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
 obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_SIS190) += sis190.o
-obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 9b5eca3..276a19d 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -48,6 +48,7 @@ config PASEMI_MAC
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/realtek/Kconfig"
+source "drivers/net/ethernet/sis/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/sgi/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 23ebc6e..dd94351 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_NET_VENDOR_SIS) += sis/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
diff --git a/drivers/net/ethernet/sis/Kconfig b/drivers/net/ethernet/sis/Kconfig
new file mode 100644
index 0000000..cf40fe6
--- /dev/null
+++ b/drivers/net/ethernet/sis/Kconfig
@@ -0,0 +1,46 @@
+#
+# Silicon Integrated Systems (SiS) device configuration
+#
+
+config NET_VENDOR_SIS
+	bool "Silicon Integrated Systems (SiS) 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 SiS devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config SIS900
+	tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
+	depends on NET_VENDOR_SIS && PCI
+	select CRC32
+	select MII
+	---help---
+	  This is a driver for the Fast Ethernet PCI network cards based on
+	  the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
+	  SiS 630 and SiS 540 chipsets.
+
+	  This driver also supports AMD 79C901 HomePNA so that you can use
+	  your phone line as a network cable.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sis900.  This is recommended.
+
+config SIS190
+	tristate "SiS190/SiS191 gigabit ethernet support"
+	depends on NET_VENDOR_SIS && PCI
+	select CRC32
+	select MII
+	---help---
+	  Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+	  a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+	  appear in lan on motherboard designs which are based on SiS 965
+	  and SiS 966 south bridge.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sis190.  This is recommended.
diff --git a/drivers/net/ethernet/sis/Makefile b/drivers/net/ethernet/sis/Makefile
new file mode 100644
index 0000000..58d3ac1
--- /dev/null
+++ b/drivers/net/ethernet/sis/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for Silicon Integrated Systems (SiS) network device drivers.
+#
+
+obj-$(CONFIG_SIS190) += sis190.o
+obj-$(CONFIG_SIS900) += sis900.o
diff --git a/drivers/net/sis190.c b/drivers/net/ethernet/sis/sis190.c
similarity index 100%
rename from drivers/net/sis190.c
rename to drivers/net/ethernet/sis/sis190.c
diff --git a/drivers/net/sis900.c b/drivers/net/ethernet/sis/sis900.c
similarity index 100%
rename from drivers/net/sis900.c
rename to drivers/net/ethernet/sis/sis900.c
diff --git a/drivers/net/sis900.h b/drivers/net/ethernet/sis/sis900.h
similarity index 100%
rename from drivers/net/sis900.h
rename to drivers/net/ethernet/sis/sis900.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 42/72] 82586.c/fec*: Move the Motorola drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (40 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 41/72] sis*: Move the Silicon Integrated Systems (SiS) drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 16:53   ` Arnd Bergmann
  2011-06-25 13:58 ` [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers Jeff Kirsher
                   ` (32 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Dan Malek, Sylvain Munaut, Richard Hirst

Move the Motorola drivers into drivers/net/ethernet/motorola/ and
make the necessary Kconfig and Makefile changes

CC: Dan Malek <dmalek@jlc.net>
CC: Sylvain Munaut <tnt@246tNt.com>
CC: Richard Hirst <richard@sleepie.demon.co.uk>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                                |   69 ---------------
 drivers/net/Makefile                               |    9 --
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/{ => ethernet/motorola}/82596.c        |    0
 drivers/net/ethernet/motorola/Kconfig              |   88 ++++++++++++++++++++
 drivers/net/ethernet/motorola/Makefile             |   13 +++
 drivers/net/{ => ethernet/motorola}/fec.c          |    0
 drivers/net/{ => ethernet/motorola}/fec.h          |    0
 drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c  |    0
 drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h  |    0
 .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c  |    0
 12 files changed, 103 insertions(+), 78 deletions(-)
 rename drivers/net/{ => ethernet/motorola}/82596.c (100%)
 create mode 100644 drivers/net/ethernet/motorola/Kconfig
 create mode 100644 drivers/net/ethernet/motorola/Makefile
 rename drivers/net/{ => ethernet/motorola}/fec.c (100%)
 rename drivers/net/{ => ethernet/motorola}/fec.h (100%)
 rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c (100%)
 rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h (100%)
 rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx_phy.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 37e06ae..ddbdf3c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -256,24 +256,6 @@ config A2065
 	  To compile this driver as a module, choose M here: the module
 	  will be called a2065.
 
-config MVME16x_NET
-	tristate "MVME16x Ethernet support"
-	depends on MVME16x
-	help
-	  This is the driver for the Ethernet interface on the Motorola
-	  MVME162, 166, 167, 172 and 177 boards.  Say Y here to include the
-	  driver for this chip in your kernel.
-	  To compile this driver as a module, choose M here.
-
-config BVME6000_NET
-	tristate "BVME6000 Ethernet support"
-	depends on BVME6000
-	help
-	  This is the driver for the Ethernet interface on BVME4000 and
-	  BVME6000 VME boards.  Say Y here to include the driver for this chip
-	  in your kernel.
-	  To compile this driver as a module, choose M here.
-
 config LASI_82596
 	tristate "Lasi ethernet"
 	depends on GSC
@@ -521,17 +503,6 @@ config ADAPTEC_STARFIRE
 	  To compile this driver as a module, choose M here: the module
 	  will be called starfire.  This is recommended.
 
-config APRICOT
-	tristate "Apricot Xen-II on board Ethernet"
-	depends on NET_PCI && ISA
-	help
-	  If you have a network (Ethernet) controller of this type, say Y and
-	  read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called apricot.
-
 config FORCEDETH
 	tristate "nForce Ethernet support"
 	depends on NET_PCI && PCI
@@ -651,46 +622,6 @@ config NET_POCKET
 	  the questions about this class of network devices. If you say Y, you
 	  will be asked for your specific device in the following questions.
 
-config 68360_ENET
-	bool "Motorola 68360 ethernet controller"
-	depends on M68360
-	help
-	  Say Y here if you want to use the built-in ethernet controller of
-	  the Motorola 68360 processor.
-
-config FEC
-	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
-	depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
-		IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
-	default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
-	select PHYLIB
-	help
-	  Say Y here if you want to use the built-in 10/100 Fast ethernet
-	  controller on some Motorola ColdFire and Freescale i.MX processors.
-
-config FEC_MPC52xx
-	tristate "MPC52xx FEC driver"
-	depends on PPC_MPC52xx && PPC_BESTCOMM
-	select CRC32
-	select PHYLIB
-	select PPC_BESTCOMM_FEC
-	---help---
-	  This option enables support for the MPC5200's on-chip
-	  Fast Ethernet Controller
-	  If compiled as module, it will be called fec_mpc52xx.
-
-config FEC_MPC52xx_MDIO
-	bool "MPC52xx FEC MDIO bus driver"
-	depends on FEC_MPC52xx
-	default y
-	---help---
-	  The MPC5200's FEC can connect to the Ethernet either with
-	  an external MII PHY chip or 10 Mbps 7-wire interface
-	  (Motorola? industry standard).
-	  If your board uses an external PHY connected to FEC, enable this.
-	  If not sure, enable.
-	  If compiled as module, it will be called fec_mpc52xx_phy.
-
 config XILINX_EMACLITE
 	tristate "Xilinx 10/100 Ethernet Lite support"
 	depends on PPC32 || MICROBLAZE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d1724fa..0d02503 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -41,12 +41,6 @@ obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
-obj-$(CONFIG_FEC) += fec.o
-obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
-ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
-	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
-endif
-obj-$(CONFIG_68360_ENET) += 68360enet.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
@@ -78,11 +72,8 @@ obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_DEPCA) += depca.o
-obj-$(CONFIG_APRICOT) += 82596.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_SNI_82596) += sni_82596.o
-obj-$(CONFIG_MVME16x_NET) += 82596.o
-obj-$(CONFIG_BVME6000_NET) += 82596.o
 obj-$(CONFIG_SC92031) += sc92031.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 276a19d..74d98b3 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -30,6 +30,7 @@ source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/micrel/Kconfig"
+source "drivers/net/ethernet/motorola/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index dd94351..4a682a7 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
+obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_ISA) += isa/
diff --git a/drivers/net/82596.c b/drivers/net/ethernet/motorola/82596.c
similarity index 100%
rename from drivers/net/82596.c
rename to drivers/net/ethernet/motorola/82596.c
diff --git a/drivers/net/ethernet/motorola/Kconfig b/drivers/net/ethernet/motorola/Kconfig
new file mode 100644
index 0000000..8a2e5cf
--- /dev/null
+++ b/drivers/net/ethernet/motorola/Kconfig
@@ -0,0 +1,88 @@
+#
+# Motorola device configuration
+#
+
+config NET_VENDOR_MOTOROLA
+	bool "Motorola devices"
+	depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
+		IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC || M68360 \
+		|| PPC_MPC52xx || PPC_BESTCOMM || MVME16x || ISA || BVME6000
+	---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 Motorola devices. If you say Y, you will be asked
+	  for your specific card in the following questions.
+
+config APRICOT
+	tristate "Apricot Xen-II on board Ethernet"
+	depends on NET_VENDOR_MOTOROLA && ISA
+	---help---
+	  If you have a network (Ethernet) controller of this type, say Y and
+	  read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called apricot.
+
+config BVME6000_NET
+	tristate "BVME6000 Ethernet support"
+	depends on NET_VENDOR_MOTOROLA && BVME6000
+	---help---
+	  This is the driver for the Ethernet interface on BVME4000 and
+	  BVME6000 VME boards.  Say Y here to include the driver for this chip
+	  in your kernel.
+	  To compile this driver as a module, choose M here.
+
+config FEC
+	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
+	depends on NET_VENDOR_MOTOROLA && (AM523x || M527x || M5272 || M528x \
+		|| M520x || M532x || IMX_HAVE_PLATFORM_FEC || \
+		MXS_HAVE_PLATFORM_FEC)
+	default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
+	select PHYLIB
+	---help---
+	  Say Y here if you want to use the built-in 10/100 Fast ethernet
+	  controller on some Motorola ColdFire and Freescale i.MX processors.
+
+config 68360_ENET
+	bool "Motorola 68360 ethernet controller"
+	depends on NET_VENDOR_MOTOROLA && M68360
+	---help---
+	  Say Y here if you want to use the built-in ethernet controller of
+	  the Motorola 68360 processor.
+
+config FEC_MPC52xx
+	tristate "MPC52xx FEC driver"
+	depends on NET_VENDOR_MOTOROLA && PPC_MPC52xx && PPC_BESTCOMM
+	select CRC32
+	select PHYLIB
+	select PPC_BESTCOMM_FEC
+	---help---
+	  This option enables support for the MPC5200's on-chip
+	  Fast Ethernet Controller
+	  If compiled as module, it will be called fec_mpc52xx.
+
+config FEC_MPC52xx_MDIO
+	bool "MPC52xx FEC MDIO bus driver"
+	depends on FEC_MPC52xx
+	default y
+	---help---
+	  The MPC5200's FEC can connect to the Ethernet either with
+	  an external MII PHY chip or 10 Mbps 7-wire interface
+	  (Motorola? industry standard).
+	  If your board uses an external PHY connected to FEC, enable this.
+	  If not sure, enable.
+	  If compiled as module, it will be called fec_mpc52xx_phy.
+
+config MVME16x_NET
+	tristate "MVME16x Ethernet support"
+	depends on NET_VENDOR_MOTOROLA && MVME16x
+	---help---
+	  This is the driver for the Ethernet interface on the Motorola
+	  MVME162, 166, 167, 172 and 177 boards.  Say Y here to include the
+	  driver for this chip in your kernel.
+	  To compile this driver as a module, choose M here.
diff --git a/drivers/net/ethernet/motorola/Makefile b/drivers/net/ethernet/motorola/Makefile
new file mode 100644
index 0000000..b704427
--- /dev/null
+++ b/drivers/net/ethernet/motorola/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for Motorola network device drivers.
+#
+
+obj-$(CONFIG_APRICOT) += 82596.o
+obj-$(CONFIG_68360_ENET) += 68360enet.o
+obj-$(CONFIG_BVME6000_NET) += 82596.o
+obj-$(CONFIG_FEC) += fec.o
+obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
+ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
+	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
+endif
+obj-$(CONFIG_MVME16x_NET) += 82596.o
diff --git a/drivers/net/fec.c b/drivers/net/ethernet/motorola/fec.c
similarity index 100%
rename from drivers/net/fec.c
rename to drivers/net/ethernet/motorola/fec.c
diff --git a/drivers/net/fec.h b/drivers/net/ethernet/motorola/fec.h
similarity index 100%
rename from drivers/net/fec.h
rename to drivers/net/ethernet/motorola/fec.h
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/ethernet/motorola/fec_mpc52xx.c
similarity index 100%
rename from drivers/net/fec_mpc52xx.c
rename to drivers/net/ethernet/motorola/fec_mpc52xx.c
diff --git a/drivers/net/fec_mpc52xx.h b/drivers/net/ethernet/motorola/fec_mpc52xx.h
similarity index 100%
rename from drivers/net/fec_mpc52xx.h
rename to drivers/net/ethernet/motorola/fec_mpc52xx.h
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/ethernet/motorola/fec_mpc52xx_phy.c
similarity index 100%
rename from drivers/net/fec_mpc52xx_phy.c
rename to drivers/net/ethernet/motorola/fec_mpc52xx_phy.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (41 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 42/72] 82586.c/fec*: Move the Motorola drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-28 20:33   ` Geert Uytterhoeven
  2011-06-25 13:58 ` [RFC 44/72] s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers Jeff Kirsher
                   ` (31 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Geert Uytterhoeven

Move the a2065/ariadne drivers to drivers/net/ethernet/ and make
the necessary Kconfig and Makefile changes.

CC: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                  |   21 ---------------------
 drivers/net/Makefile                 |    2 --
 drivers/net/ethernet/Kconfig         |   23 +++++++++++++++++++++++
 drivers/net/ethernet/Makefile        |    2 ++
 drivers/net/{ => ethernet}/a2065.c   |    0
 drivers/net/{ => ethernet}/a2065.h   |    0
 drivers/net/{ => ethernet}/ariadne.c |    0
 drivers/net/{ => ethernet}/ariadne.h |    0
 8 files changed, 25 insertions(+), 23 deletions(-)
 rename drivers/net/{ => ethernet}/a2065.c (100%)
 rename drivers/net/{ => ethernet}/a2065.h (100%)
 rename drivers/net/{ => ethernet}/ariadne.c (100%)
 rename drivers/net/{ => ethernet}/ariadne.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ddbdf3c..ed588b5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -235,27 +235,6 @@ config MACB
 	  To compile this driver as a module, choose M here: the module
 	  will be called macb.
 
-config ARIADNE
-	tristate "Ariadne support"
-	depends on ZORRO
-	help
-	  If you have a Village Tronic Ariadne Ethernet adapter, say Y.
-	  Otherwise, say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called ariadne.
-
-config A2065
-	tristate "A2065 support"
-	depends on ZORRO
-	select CRC32
-	help
-	  If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
-	  say N.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called a2065.
-
 config LASI_82596
 	tristate "Lasi ethernet"
 	depends on GSC
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0d02503..f9f3478 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -79,8 +79,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
-obj-$(CONFIG_A2065) += a2065.o
-obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 74d98b3..9ade631 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -12,8 +12,31 @@ menuconfig ETHERNET
 if ETHERNET
 
 source "drivers/net/ethernet/3com/Kconfig"
+
+config A2065
+	tristate "A2065 support"
+	depends on ZORRO
+	select CRC32
+	---help---
+	  If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
+	  say N.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called a2065.
+
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
+
+config ARIADNE
+	tristate "Ariadne support"
+	depends on ZORRO
+	---help---
+	  If you have a Village Tronic Ariadne Ethernet adapter, say Y.
+	  Otherwise, say N.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called ariadne.
+
 source "drivers/net/ethernet/arm/Kconfig"
 source "drivers/net/ethernet/atheros/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 4a682a7..5704a3b 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -4,8 +4,10 @@
 
 obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
+obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
+obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_NET_ARM) += arm/
 obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
diff --git a/drivers/net/a2065.c b/drivers/net/ethernet/a2065.c
similarity index 100%
rename from drivers/net/a2065.c
rename to drivers/net/ethernet/a2065.c
diff --git a/drivers/net/a2065.h b/drivers/net/ethernet/a2065.h
similarity index 100%
rename from drivers/net/a2065.h
rename to drivers/net/ethernet/a2065.h
diff --git a/drivers/net/ariadne.c b/drivers/net/ethernet/ariadne.c
similarity index 100%
rename from drivers/net/ariadne.c
rename to drivers/net/ethernet/ariadne.c
diff --git a/drivers/net/ariadne.h b/drivers/net/ethernet/ariadne.h
similarity index 100%
rename from drivers/net/ariadne.h
rename to drivers/net/ethernet/ariadne.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 44/72] s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (42 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 45/72] tlan/cpmac: Move the TI drivers Jeff Kirsher
                   ` (30 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Oskar Schirmer, Kong Lai

Move the s6gmac/tsi108_eth drivers to drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.

CC: Oskar Schirmer <os@emlix.com>
CC: Kong Lai <kong.lai@tundra.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                     |   19 -------------------
 drivers/net/Makefile                    |    2 --
 drivers/net/ethernet/Kconfig            |   21 +++++++++++++++++++++
 drivers/net/ethernet/Makefile           |    2 ++
 drivers/net/{ => ethernet}/s6gmac.c     |    0
 drivers/net/{ => ethernet}/tsi108_eth.c |    0
 drivers/net/{ => ethernet}/tsi108_eth.h |    0
 7 files changed, 23 insertions(+), 21 deletions(-)
 rename drivers/net/{ => ethernet}/s6gmac.c (100%)
 rename drivers/net/{ => ethernet}/tsi108_eth.c (100%)
 rename drivers/net/{ => ethernet}/tsi108_eth.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ed588b5..981d7d8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -677,14 +677,6 @@ config YELLOWFIN
 	  To compile this driver as a module, choose M here: the module
 	  will be called yellowfin.  This is recommended.
 
-config TSI108_ETH
-	tristate "Tundra TSI108 gigabit Ethernet support"
-	depends on TSI108_BRIDGE
-	help
-	  This driver supports Tundra TSI108 gigabit Ethernet ports.
-	  To compile this driver as a module, choose M here: the module
-	  will be called tsi108_eth.
-
 config GELIC_NET
 	tristate "PS3 Gigabit Ethernet driver"
 	depends on PPC_PS3
@@ -728,17 +720,6 @@ config JME
 	  To compile this driver as a module, choose M here. The module
 	  will be called jme.
 
-config S6GMAC
-	tristate "S6105 GMAC ethernet support"
-	depends on XTENSA_VARIANT_S6000
-	select PHYLIB
-	help
-	  This driver supports the on chip ethernet device on the
-	  S6105 xtensa processor.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called s6gmac.
-
 endif # NETDEV_1000
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f9f3478..2bb8a4e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -43,7 +43,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 
-obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
 obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
 obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
@@ -91,7 +90,6 @@ obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
 
 obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_MACB) += macb.o
-obj-$(CONFIG_S6GMAC) += s6gmac.o
 
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 9ade631..c23e7b5 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -72,6 +72,18 @@ config PASEMI_MAC
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/realtek/Kconfig"
+
+config S6GMAC
+	tristate "S6105 GMAC ethernet support"
+	depends on XTENSA_VARIANT_S6000
+	select PHYLIB
+	---help---
+	  This driver supports the on chip ethernet device on the
+	  S6105 xtensa processor.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called s6gmac.
+
 source "drivers/net/ethernet/sis/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/sgi/Kconfig"
@@ -88,6 +100,15 @@ config TEHUTI
 	  Tehuti Networks 10G Ethernet NIC
 
 source "drivers/net/ethernet/tulip/Kconfig"
+
+config TSI108_ETH
+	tristate "Tundra TSI108 gigabit Ethernet support"
+	depends on TSI108_BRIDGE
+	---help---
+	  This driver supports Tundra TSI108 gigabit Ethernet ports.
+	  To compile this driver as a module, choose M here: the module
+	  will be called tsi108_eth.
+
 source "drivers/net/ethernet/via/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 5704a3b..a243610 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
@@ -43,4 +44,5 @@ obj-$(CONFIG_NET_VENDOR_SUN) += sun/
 obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
 obj-$(CONFIG_TEHUTI) += tehuti.o
 obj-$(CONFIG_NET_TULIP) += tulip/
+obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/s6gmac.c b/drivers/net/ethernet/s6gmac.c
similarity index 100%
rename from drivers/net/s6gmac.c
rename to drivers/net/ethernet/s6gmac.c
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/ethernet/tsi108_eth.c
similarity index 100%
rename from drivers/net/tsi108_eth.c
rename to drivers/net/ethernet/tsi108_eth.c
diff --git a/drivers/net/tsi108_eth.h b/drivers/net/ethernet/tsi108_eth.h
similarity index 100%
rename from drivers/net/tsi108_eth.h
rename to drivers/net/ethernet/tsi108_eth.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 45/72] tlan/cpmac: Move the TI drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (43 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 44/72] s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 46/72] ixp2000: Move the Radisys driver Jeff Kirsher
                   ` (29 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Samuel Chessman, torben.mathiasen,
	Eugene Konev, Florian Fainelli

Move the TI drivers to drivers/net/ethernet/ti/ and make the
necessary Kconfig and Makefile changes.

CC: Samuel Chessman <chessman@tux.org>
CC: <torben.mathiasen@compaq.com>
CC: Eugene Konev <ejka@imfi.kspu.ru>
CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                           |    4 +-
 drivers/net/Kconfig                   |   25 --------------------
 drivers/net/Makefile                  |    2 -
 drivers/net/ethernet/Kconfig          |    1 +
 drivers/net/ethernet/Makefile         |    1 +
 drivers/net/ethernet/ti/Kconfig       |   41 +++++++++++++++++++++++++++++++++
 drivers/net/ethernet/ti/Makefile      |    6 +++++
 drivers/net/{ => ethernet/ti}/cpmac.c |    0
 drivers/net/{ => ethernet/ti}/tlan.c  |    0
 drivers/net/{ => ethernet/ti}/tlan.h  |    0
 10 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100644 drivers/net/ethernet/ti/Kconfig
 create mode 100644 drivers/net/ethernet/ti/Makefile
 rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
 rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
 rename drivers/net/{ => ethernet/ti}/tlan.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index fa2f1bb..cd97122 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1880,7 +1880,7 @@ CPMAC ETHERNET DRIVER
 M:	Florian Fainelli <florian@openwrt.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/cpmac.c
+F:	drivers/net/ethernet/ti/cpmac.c
 
 CPU FREQUENCY DRIVERS
 M:	Dave Jones <davej@redhat.com>
@@ -6188,7 +6188,7 @@ L:	tlan-devel@lists.sourceforge.net (subscribers-only)
 W:	http://sourceforge.net/projects/tlan/
 S:	Maintained
 F:	Documentation/networking/tlan.txt
-F:	drivers/net/tlan.*
+F:	drivers/net/ethernet/ti/tlan.*
 
 TOMOYO SECURITY MODULE
 M:	Kentaro Takeda <takedakn@nttdata.co.jp>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 981d7d8..7aa7982 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -540,24 +540,6 @@ config SUNDANCE_MMIO
 
 	  If unsure, say N.
 
-config TLAN
-	tristate "TI ThunderLAN support"
-	depends on NET_PCI && (PCI || EISA)
-	---help---
-	  If you have a PCI Ethernet network card based on the ThunderLAN chip
-	  which is supported by this driver, say Y and read the
-	  Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  Devices currently supported by this driver are Compaq Netelligent,
-	  Compaq NetFlex and Olicom cards.  Please read the file
-	  <file:Documentation/networking/tlan.txt> for more details.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called tlan.
-
-	  Please email feedback to <torben.mathiasen@compaq.com>.
-
 config SC92031
 	tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
 	depends on NET_PCI && PCI && EXPERIMENTAL
@@ -570,13 +552,6 @@ config SC92031
 	  To compile this driver as a module, choose M here: the module
 	  will be called sc92031.  This is recommended.
 
-config CPMAC
-	tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
-	depends on NET_ETHERNET && EXPERIMENTAL && AR7
-	select PHYLIB
-	help
-	  TI AR7 CPMAC Ethernet support
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2bb8a4e..4893db5 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_PLIP) += plip.o
 
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
-obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
@@ -69,7 +68,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_SNI_82596) += sni_82596.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c23e7b5..ed7b4a6 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -99,6 +99,7 @@ config TEHUTI
 	---help---
 	  Tehuti Networks 10G Ethernet NIC
 
+source "drivers/net/ethernet/ti/Kconfig"
 source "drivers/net/ethernet/tulip/Kconfig"
 
 config TSI108_ETH
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a243610..444c988 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
 obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
 obj-$(CONFIG_TEHUTI) += tehuti.o
+obj-$(CONFIG_NET_TI) += ti/
 obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
new file mode 100644
index 0000000..3f45912
--- /dev/null
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -0,0 +1,41 @@
+#
+# TI device configuration
+#
+
+config NET_VENDOR_TI
+	bool "TI devices"
+	depends on PCI || EISA || AR7
+	---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 TI devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config TLAN
+	tristate "TI ThunderLAN support"
+	depends on NET_VENDOR_TI && (PCI || EISA)
+	---help---
+	  If you have a PCI Ethernet network card based on the ThunderLAN chip
+	  which is supported by this driver, say Y and read the
+	  Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  Devices currently supported by this driver are Compaq Netelligent,
+	  Compaq NetFlex and Olicom cards.  Please read the file
+	  <file:Documentation/networking/tlan.txt> for more details.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called tlan.
+
+	  Please email feedback to <torben.mathiasen@compaq.com>.
+
+config CPMAC
+	tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
+	depends on NET_VENDOR_TI && EXPERIMENTAL && AR7
+	select PHYLIB
+	---help---
+	  TI AR7 CPMAC Ethernet support
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
new file mode 100644
index 0000000..9d9ad21
--- /dev/null
+++ b/drivers/net/ethernet/ti/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the TI network device drivers.
+#
+
+obj-$(CONFIG_TLAN) += tlan.o
+obj-$(CONFIG_CPMAC) += cpmac.o
diff --git a/drivers/net/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
similarity index 100%
rename from drivers/net/cpmac.c
rename to drivers/net/ethernet/ti/cpmac.c
diff --git a/drivers/net/tlan.c b/drivers/net/ethernet/ti/tlan.c
similarity index 100%
rename from drivers/net/tlan.c
rename to drivers/net/ethernet/ti/tlan.c
diff --git a/drivers/net/tlan.h b/drivers/net/ethernet/ti/tlan.h
similarity index 100%
rename from drivers/net/tlan.h
rename to drivers/net/ethernet/ti/tlan.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 46/72] ixp2000: Move the Radisys driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (44 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 45/72] tlan/cpmac: Move the TI drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-26 11:47   ` Lennert Buytenhek
  2011-06-25 13:58 ` [RFC 47/72] hamachi/yellowfin: Move the packet engine drivers Jeff Kirsher
                   ` (28 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Lennert Buytenhek

Move the Radisys driver into drivers/net/ethernet/radisys/ and
make the necessary Kconfig and Makefile changes

CC: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |    2 --
 drivers/net/Makefile                               |    1 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/radisys/Kconfig               |   16 ++++++++++++++++
 drivers/net/ethernet/radisys/Makefile              |    5 +++++
 drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig |    2 +-
 .../net/{ => ethernet/radisys}/ixp2000/Makefile    |    0
 drivers/net/{ => ethernet/radisys}/ixp2000/caleb.c |    0
 drivers/net/{ => ethernet/radisys}/ixp2000/caleb.h |    0
 .../net/{ => ethernet/radisys}/ixp2000/enp2611.c   |    0
 .../{ => ethernet/radisys}/ixp2000/ixp2400-msf.c   |    0
 .../{ => ethernet/radisys}/ixp2000/ixp2400-msf.h   |    0
 .../{ => ethernet/radisys}/ixp2000/ixp2400_rx.uc   |    0
 .../radisys}/ixp2000/ixp2400_rx.ucode              |    0
 .../{ => ethernet/radisys}/ixp2000/ixp2400_tx.uc   |    0
 .../radisys}/ixp2000/ixp2400_tx.ucode              |    0
 .../net/{ => ethernet/radisys}/ixp2000/ixpdev.c    |    0
 .../net/{ => ethernet/radisys}/ixp2000/ixpdev.h    |    0
 .../{ => ethernet/radisys}/ixp2000/ixpdev_priv.h   |    0
 .../net/{ => ethernet/radisys}/ixp2000/pm3386.c    |    0
 .../net/{ => ethernet/radisys}/ixp2000/pm3386.h    |    0
 23 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 drivers/net/ethernet/radisys/Kconfig
 create mode 100644 drivers/net/ethernet/radisys/Makefile
 rename drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig (80%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/Makefile (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/caleb.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/caleb.h (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/enp2611.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400-msf.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400-msf.h (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_rx.uc (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_rx.ucode (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_tx.uc (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_tx.ucode (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev.h (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev_priv.h (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/pm3386.c (100%)
 rename drivers/net/{ => ethernet/radisys}/ixp2000/pm3386.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index cd97122..07ac87b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3299,7 +3299,7 @@ INTEL IXP2000 ETHERNET DRIVER
 M:	Lennert Buytenhek <kernel@wantstofly.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/ixp2000/
+F:	drivers/net/ethernet/ixp2000/
 
 INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
 M:	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7aa7982..fd11a55 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -624,8 +624,6 @@ config IP1000
 	  To compile this driver as a module, choose M here: the module
 	  will be called ipg.  This is recommended.
 
-source "drivers/net/ixp2000/Kconfig"
-
 config HAMACHI
 	tristate "Packet Engines Hamachi GNIC-II support"
 	depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4893db5..7f63be8 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -109,7 +109,6 @@ obj-$(CONFIG_WLAN) += wireless/
 obj-$(CONFIG_HAMRADIO) += hamradio/
 obj-$(CONFIG_IRDA) += irda/
 obj-$(CONFIG_ETRAX_ETHERNET) += cris/
-obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
 
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ed7b4a6..c000dc2 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -71,6 +71,7 @@ config PASEMI_MAC
 
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
+source "drivers/net/ethernet/radisys/Kconfig"
 source "drivers/net/ethernet/realtek/Kconfig"
 
 config S6GMAC
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 444c988..d54eb3d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_NET_VENDOR_OKI) += oki/
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
+obj-$(CONFIG_NET_VENDOR_RADISYS) += radisys/
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
diff --git a/drivers/net/ethernet/radisys/Kconfig b/drivers/net/ethernet/radisys/Kconfig
new file mode 100644
index 0000000..bcbd604
--- /dev/null
+++ b/drivers/net/ethernet/radisys/Kconfig
@@ -0,0 +1,16 @@
+#
+# Radisys device configuration
+#
+
+config NET_VENDOR_RADISYS
+	bool "Radisys devices"
+	depends on ARCH_ENP2611
+	---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 Radisys cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
diff --git a/drivers/net/ethernet/radisys/Makefile b/drivers/net/ethernet/radisys/Makefile
new file mode 100644
index 0000000..c946cf2
--- /dev/null
+++ b/drivers/net/ethernet/radisys/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Radisys device drivers.
+#
+
+obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
diff --git a/drivers/net/ixp2000/Kconfig b/drivers/net/ethernet/radisys/ixp2000/Kconfig
similarity index 80%
rename from drivers/net/ixp2000/Kconfig
rename to drivers/net/ethernet/radisys/ixp2000/Kconfig
index 2fec241..3cd6ded 100644
--- a/drivers/net/ixp2000/Kconfig
+++ b/drivers/net/ethernet/radisys/ixp2000/Kconfig
@@ -1,6 +1,6 @@
 config ENP2611_MSF_NET
 	tristate "Radisys ENP2611 MSF network interface support"
-	depends on ARCH_ENP2611
+	depends on NET_VENDOR_RADISYS && ARCH_ENP2611
 	help
 	  This is a driver for the MSF network interface unit in
 	  the IXP2400 on the Radisys ENP2611 platform.
diff --git a/drivers/net/ixp2000/Makefile b/drivers/net/ethernet/radisys/ixp2000/Makefile
similarity index 100%
rename from drivers/net/ixp2000/Makefile
rename to drivers/net/ethernet/radisys/ixp2000/Makefile
diff --git a/drivers/net/ixp2000/caleb.c b/drivers/net/ethernet/radisys/ixp2000/caleb.c
similarity index 100%
rename from drivers/net/ixp2000/caleb.c
rename to drivers/net/ethernet/radisys/ixp2000/caleb.c
diff --git a/drivers/net/ixp2000/caleb.h b/drivers/net/ethernet/radisys/ixp2000/caleb.h
similarity index 100%
rename from drivers/net/ixp2000/caleb.h
rename to drivers/net/ethernet/radisys/ixp2000/caleb.h
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ethernet/radisys/ixp2000/enp2611.c
similarity index 100%
rename from drivers/net/ixp2000/enp2611.c
rename to drivers/net/ethernet/radisys/ixp2000/enp2611.c
diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ethernet/radisys/ixp2000/ixp2400-msf.c
similarity index 100%
rename from drivers/net/ixp2000/ixp2400-msf.c
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400-msf.c
diff --git a/drivers/net/ixp2000/ixp2400-msf.h b/drivers/net/ethernet/radisys/ixp2000/ixp2400-msf.h
similarity index 100%
rename from drivers/net/ixp2000/ixp2400-msf.h
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400-msf.h
diff --git a/drivers/net/ixp2000/ixp2400_rx.uc b/drivers/net/ethernet/radisys/ixp2000/ixp2400_rx.uc
similarity index 100%
rename from drivers/net/ixp2000/ixp2400_rx.uc
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400_rx.uc
diff --git a/drivers/net/ixp2000/ixp2400_rx.ucode b/drivers/net/ethernet/radisys/ixp2000/ixp2400_rx.ucode
similarity index 100%
rename from drivers/net/ixp2000/ixp2400_rx.ucode
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400_rx.ucode
diff --git a/drivers/net/ixp2000/ixp2400_tx.uc b/drivers/net/ethernet/radisys/ixp2000/ixp2400_tx.uc
similarity index 100%
rename from drivers/net/ixp2000/ixp2400_tx.uc
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400_tx.uc
diff --git a/drivers/net/ixp2000/ixp2400_tx.ucode b/drivers/net/ethernet/radisys/ixp2000/ixp2400_tx.ucode
similarity index 100%
rename from drivers/net/ixp2000/ixp2400_tx.ucode
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400_tx.ucode
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ethernet/radisys/ixp2000/ixpdev.c
similarity index 100%
rename from drivers/net/ixp2000/ixpdev.c
rename to drivers/net/ethernet/radisys/ixp2000/ixpdev.c
diff --git a/drivers/net/ixp2000/ixpdev.h b/drivers/net/ethernet/radisys/ixp2000/ixpdev.h
similarity index 100%
rename from drivers/net/ixp2000/ixpdev.h
rename to drivers/net/ethernet/radisys/ixp2000/ixpdev.h
diff --git a/drivers/net/ixp2000/ixpdev_priv.h b/drivers/net/ethernet/radisys/ixp2000/ixpdev_priv.h
similarity index 100%
rename from drivers/net/ixp2000/ixpdev_priv.h
rename to drivers/net/ethernet/radisys/ixp2000/ixpdev_priv.h
diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ethernet/radisys/ixp2000/pm3386.c
similarity index 100%
rename from drivers/net/ixp2000/pm3386.c
rename to drivers/net/ethernet/radisys/ixp2000/pm3386.c
diff --git a/drivers/net/ixp2000/pm3386.h b/drivers/net/ethernet/radisys/ixp2000/pm3386.h
similarity index 100%
rename from drivers/net/ixp2000/pm3386.h
rename to drivers/net/ethernet/radisys/ixp2000/pm3386.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 47/72] hamachi/yellowfin: Move the packet engine drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (45 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 46/72] ixp2000: Move the Radisys driver Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:58 ` [RFC 48/72] octeon: Move the Cavium driver Jeff Kirsher
                   ` (27 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Donald Becker

Move the packet engine drivers to drivers/net/ethernet/pktgen/ and
the necessary Kconfig and Makefile changes.

CC: Donald Becker <becker@scyld.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                                |   26 ------------
 drivers/net/Makefile                               |    2 -
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/packetengines/Kconfig         |   42 ++++++++++++++++++++
 drivers/net/ethernet/packetengines/Makefile        |    6 +++
 drivers/net/{ => ethernet/packetengines}/hamachi.c |    0
 .../net/{ => ethernet/packetengines}/yellowfin.c   |    0
 8 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 drivers/net/ethernet/packetengines/Kconfig
 create mode 100644 drivers/net/ethernet/packetengines/Makefile
 rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
 rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fd11a55..fb16747 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -624,32 +624,6 @@ config IP1000
 	  To compile this driver as a module, choose M here: the module
 	  will be called ipg.  This is recommended.
 
-config HAMACHI
-	tristate "Packet Engines Hamachi GNIC-II support"
-	depends on PCI
-	select MII
-	help
-	  If you have a Gigabit Ethernet card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module will be
-	  called hamachi.
-
-config YELLOWFIN
-	tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
-	depends on PCI && EXPERIMENTAL
-	select CRC32
-	---help---
-	  Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
-	  adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is
-	  used by the Beowulf Linux cluster project.  See
-	  <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more
-	  information about this driver in particular and Beowulf in general.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called yellowfin.  This is recommended.
-
 config GELIC_NET
 	tristate "PS3 Gigabit Ethernet driver"
 	depends on PPC_PS3
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 7f63be8..f473c26 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_PLIP) += plip.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
 obj-$(CONFIG_R6040) += r6040.o
-obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
@@ -36,7 +35,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
 #
 
 obj-$(CONFIG_SUNDANCE) += sundance.o
-obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c000dc2..cf3da85 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -59,6 +59,7 @@ source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/isa/Kconfig"
 source "drivers/net/ethernet/oki/Kconfig"
+source "drivers/net/ethernet/packetengines/Kconfig"
 
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index d54eb3d..0c6c7a5 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_NET_ISA) += isa/
+obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
 obj-$(CONFIG_NET_VENDOR_OKI) += oki/
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
diff --git a/drivers/net/ethernet/packetengines/Kconfig b/drivers/net/ethernet/packetengines/Kconfig
new file mode 100644
index 0000000..3fa8d39
--- /dev/null
+++ b/drivers/net/ethernet/packetengines/Kconfig
@@ -0,0 +1,42 @@
+#
+# Packet engine device configuration
+#
+
+config NET_PACKET_ENGINE
+	bool "Packet Engine 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 packet engine devices. If you say Y, you will
+	  be asked for your specific card in the following questions.
+
+config HAMACHI
+	tristate "Packet Engines Hamachi GNIC-II support"
+	depends on NET_PACKET_ENGINE && PCI
+	select MII
+	---help---
+	  If you have a Gigabit Ethernet card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module will be
+	  called hamachi.
+
+config YELLOWFIN
+	tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
+	depends on NET_PACKET_ENGINE && PCI && EXPERIMENTAL
+	select CRC32
+	---help---
+	  Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
+	  adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is
+	  used by the Beowulf Linux cluster project.  See
+	  <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more
+	  information about this driver in particular and Beowulf in general.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called yellowfin.  This is recommended.
diff --git a/drivers/net/ethernet/packetengines/Makefile b/drivers/net/ethernet/packetengines/Makefile
new file mode 100644
index 0000000..995ccd0
--- /dev/null
+++ b/drivers/net/ethernet/packetengines/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Packet Engine network device drivers.
+#
+
+obj-$(CONFIG_HAMACHI) += hamachi.o
+obj-$(CONFIG_YELLOWFIN) += yellowfin.o
diff --git a/drivers/net/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
similarity index 100%
rename from drivers/net/hamachi.c
rename to drivers/net/ethernet/packetengines/hamachi.c
diff --git a/drivers/net/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
similarity index 100%
rename from drivers/net/yellowfin.c
rename to drivers/net/ethernet/packetengines/yellowfin.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 48/72] octeon: Move the Cavium driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (46 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 47/72] hamachi/yellowfin: Move the packet engine drivers Jeff Kirsher
@ 2011-06-25 13:58 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 49/72] jme: Move the JME driver Jeff Kirsher
                   ` (26 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, David Daney

Move the Cavium driver to drivers/net/ethernet/octeon/ and
make the necessary Kconfig and Makefile changes.

CC: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                             |    2 --
 drivers/net/Makefile                            |    1 -
 drivers/net/ethernet/Kconfig                    |    1 +
 drivers/net/ethernet/Makefile                   |    1 +
 drivers/net/{ => ethernet}/octeon/Kconfig       |    0
 drivers/net/{ => ethernet}/octeon/Makefile      |    0
 drivers/net/{ => ethernet}/octeon/octeon_mgmt.c |    0
 7 files changed, 2 insertions(+), 3 deletions(-)
 rename drivers/net/{ => ethernet}/octeon/Kconfig (100%)
 rename drivers/net/{ => ethernet}/octeon/Makefile (100%)
 rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fb16747..f4708d4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -589,8 +589,6 @@ config LANTIQ_ETOP
 	help
 	  Support for the MII0 inside the Lantiq SoC
 
-source "drivers/net/octeon/Kconfig"
-
 endif # NET_ETHERNET
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f473c26..a53f0b3 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -115,5 +115,4 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 obj-$(CONFIG_WIMAX) += wimax/
 obj-$(CONFIG_CAIF) += caif/
 
-obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_TILE_NET) += tile/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index cf3da85..7e83747 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -57,6 +57,7 @@ source "drivers/net/ethernet/motorola/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
+source "drivers/net/ethernet/octeon/Kconfig"
 source "drivers/net/ethernet/isa/Kconfig"
 source "drivers/net/ethernet/oki/Kconfig"
 source "drivers/net/ethernet/packetengines/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0c6c7a5..b2f51c5 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_NET_ISA) += isa/
 obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
 obj-$(CONFIG_NET_VENDOR_OKI) += oki/
diff --git a/drivers/net/octeon/Kconfig b/drivers/net/ethernet/octeon/Kconfig
similarity index 100%
rename from drivers/net/octeon/Kconfig
rename to drivers/net/ethernet/octeon/Kconfig
diff --git a/drivers/net/octeon/Makefile b/drivers/net/ethernet/octeon/Makefile
similarity index 100%
rename from drivers/net/octeon/Makefile
rename to drivers/net/ethernet/octeon/Makefile
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
similarity index 100%
rename from drivers/net/octeon/octeon_mgmt.c
rename to drivers/net/ethernet/octeon/octeon_mgmt.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 49/72] jme: Move the JME driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (47 preceding siblings ...)
  2011-06-25 13:58 ` [RFC 48/72] octeon: Move the Cavium driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 50/72] xilinx/ll_temac: Move the Xilinx drivers Jeff Kirsher
                   ` (25 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Guo-Fu Tseng

Move the JME driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                      |    2 +-
 drivers/net/Kconfig              |   12 ------------
 drivers/net/Makefile             |    1 -
 drivers/net/ethernet/Kconfig     |   13 +++++++++++++
 drivers/net/ethernet/Makefile    |    1 +
 drivers/net/{ => ethernet}/jme.c |    0
 drivers/net/{ => ethernet}/jme.h |    0
 7 files changed, 15 insertions(+), 14 deletions(-)
 rename drivers/net/{ => ethernet}/jme.c (100%)
 rename drivers/net/{ => ethernet}/jme.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 07ac87b..a0759c4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3553,7 +3553,7 @@ JME NETWORK DRIVER
 M:	Guo-Fu Tseng <cooldavid@cooldavid.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/jme.*
+F:	drivers/net/ethernet/jme.*
 
 JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
 M:	David Woodhouse <dwmw2@infradead.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f4708d4..0e13828 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -653,18 +653,6 @@ config XILINX_LL_TEMAC
 	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
 	  core used in Xilinx Spartan and Virtex FPGAs
 
-config JME
-	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
-	depends on PCI
-	select CRC32
-	select MII
-	---help---
-	  This driver supports the PCI-Express gigabit ethernet adapters
-	  based on JMicron JMC250 chipset.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called jme.
-
 endif # NETDEV_1000
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a53f0b3..58d1c38 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_PHYLIB) += phy/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_VMXNET3) += vmxnet3/
 
 #
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 7e83747..0ae98cb 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -50,6 +50,19 @@ source "drivers/net/ethernet/faraday/Kconfig"
 source "drivers/net/ethernet/freescale/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
+
+config JME
+	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
+	depends on PCI
+	select CRC32
+	select MII
+	---help---
+	  This driver supports the PCI-Express gigabit ethernet adapters
+	  based on JMicron JMC250 chipset.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called jme.
+
 source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/micrel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index b2f51c5..9b5df9f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
 obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
diff --git a/drivers/net/jme.c b/drivers/net/ethernet/jme.c
similarity index 100%
rename from drivers/net/jme.c
rename to drivers/net/ethernet/jme.c
diff --git a/drivers/net/jme.h b/drivers/net/ethernet/jme.h
similarity index 100%
rename from drivers/net/jme.h
rename to drivers/net/ethernet/jme.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 50/72] xilinx/ll_temac: Move the Xilinx drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (48 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 49/72] jme: Move the JME driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 51/72] ipg: Move the IC Plus driver Jeff Kirsher
                   ` (24 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, John Williams, David H. Lynch Jr.

Move the Xilinx drivers into drivers/net/ethernet/xilinx/ and
make the necessary Kconfig and Makefile changes.

CC: John Williams <john.williams@petalogix.com>
CC: "David H. Lynch Jr." <dhlii@dlasys.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                                |   15 ---------
 drivers/net/Makefile                               |    4 --
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/xilinx/Kconfig                |   31 ++++++++++++++++++++
 drivers/net/ethernet/xilinx/Makefile               |    7 ++++
 drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
 drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    0
 drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
 .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
 10 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 drivers/net/ethernet/xilinx/Kconfig
 create mode 100644 drivers/net/ethernet/xilinx/Makefile
 rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
 rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
 rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
 rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0e13828..05534af 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -576,13 +576,6 @@ config NET_POCKET
 	  the questions about this class of network devices. If you say Y, you
 	  will be asked for your specific device in the following questions.
 
-config XILINX_EMACLITE
-	tristate "Xilinx 10/100 Ethernet Lite support"
-	depends on PPC32 || MICROBLAZE
-	select PHYLIB
-	help
-	  This driver supports the 10/100 Ethernet Lite from Xilinx.
-
 config LANTIQ_ETOP
 	tristate "Lantiq SoC ETOP driver"
 	depends on SOC_TYPE_XWAY
@@ -645,14 +638,6 @@ config GELIC_WIRELESS
 	  the driver automatically distinguishes the models, you can
 	  safely enable this option even if you have a wireless-less model.
 
-config XILINX_LL_TEMAC
-	tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
-	depends on PPC || MICROBLAZE
-	select PHYLIB
-	help
-	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
-	  core used in Xilinx Spartan and Virtex FPGAs
-
 endif # NETDEV_1000
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 58d1c38..eee20c5 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -39,10 +39,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 
-ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
-obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
-obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
-
 obj-$(CONFIG_PPP) += ppp_generic.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
 obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 0ae98cb..8c57df8 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -127,5 +127,6 @@ config TSI108_ETH
 	  will be called tsi108_eth.
 
 source "drivers/net/ethernet/via/Kconfig"
+source "drivers/net/ethernet/xilinx/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 9b5df9f..e802591 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -51,3 +51,4 @@ obj-$(CONFIG_NET_TI) += ti/
 obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 obj-$(CONFIG_NET_VENDOR_VIA) += via/
+obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig
new file mode 100644
index 0000000..d66feb1
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/Kconfig
@@ -0,0 +1,31 @@
+#
+# Xilink device configuration
+#
+
+config NET_VENDOR_XILINX
+	bool "Xilinx devices"
+	depends on PPC || PPC32 || MICROBLAZE
+	---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 Xilinx devices. If you say Y, you will be asked
+	  for your specific card in the following questions.
+
+config XILINX_EMACLITE
+	tristate "Xilinx 10/100 Ethernet Lite support"
+	depends on NET_VENDOR_XILINX && (PPC32 || MICROBLAZE)
+	select PHYLIB
+	---help---
+	  This driver supports the 10/100 Ethernet Lite from Xilinx.
+
+config XILINX_LL_TEMAC
+	tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
+	depends on NET_VENDOR_XILINX && (PPC || MICROBLAZE)
+	select PHYLIB
+	---help---
+	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
+	  core used in Xilinx Spartan and Virtex FPGAs
diff --git a/drivers/net/ethernet/xilinx/Makefile b/drivers/net/ethernet/xilinx/Makefile
new file mode 100644
index 0000000..5feac73
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Xilink network device drivers.
+#
+
+ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
+obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
+obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
diff --git a/drivers/net/ll_temac.h b/drivers/net/ethernet/xilinx/ll_temac.h
similarity index 100%
rename from drivers/net/ll_temac.h
rename to drivers/net/ethernet/xilinx/ll_temac.h
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
similarity index 100%
rename from drivers/net/ll_temac_main.c
rename to drivers/net/ethernet/xilinx/ll_temac_main.c
diff --git a/drivers/net/ll_temac_mdio.c b/drivers/net/ethernet/xilinx/ll_temac_mdio.c
similarity index 100%
rename from drivers/net/ll_temac_mdio.c
rename to drivers/net/ethernet/xilinx/ll_temac_mdio.c
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
similarity index 100%
rename from drivers/net/xilinx_emaclite.c
rename to drivers/net/ethernet/xilinx/xilinx_emaclite.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 51/72] ipg: Move the IC Plus driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (49 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 50/72] xilinx/ll_temac: Move the Xilinx drivers Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers Jeff Kirsher
                   ` (23 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, craig_rich, sorbica, jesse

Move the IC Plus driver into drivers/net/ethernet/icplus/ and
make the necessary Kconfig and Makefile changes.

CC: <craig_rich@sundanceti.com>
CC: <sorbica@icplus.com.tw>
CC: <jesse@icplus.com.tw>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                             |    2 +-
 drivers/net/Kconfig                     |   10 ----------
 drivers/net/Makefile                    |    1 -
 drivers/net/ethernet/Kconfig            |    1 +
 drivers/net/ethernet/Makefile           |    1 +
 drivers/net/ethernet/icplus/Kconfig     |   13 +++++++++++++
 drivers/net/ethernet/icplus/Makefile    |    5 +++++
 drivers/net/{ => ethernet/icplus}/ipg.c |    0
 drivers/net/{ => ethernet/icplus}/ipg.h |    0
 9 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 drivers/net/ethernet/icplus/Kconfig
 create mode 100644 drivers/net/ethernet/icplus/Makefile
 rename drivers/net/{ => ethernet/icplus}/ipg.c (100%)
 rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index a0759c4..a59a17a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3404,7 +3404,7 @@ M:	Francois Romieu <romieu@fr.zoreil.com>
 M:	Sorbica Shieh <sorbica@icplus.com.tw>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/ipg.*
+F:	drivers/net/ethernet/icplus/ipg.*
 
 IPATH DRIVER
 M:	Ralph Campbell <infinipath@qlogic.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 05534af..366538b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -605,16 +605,6 @@ menuconfig NETDEV_1000
 
 if NETDEV_1000
 
-config IP1000
-	tristate "IP1000 Gigabit Ethernet support"
-	depends on PCI && EXPERIMENTAL
-	select MII
-	---help---
-	  This driver supports IP1000 gigabit Ethernet cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called ipg.  This is recommended.
-
 config GELIC_NET
 	tristate "PS3 Gigabit Ethernet driver"
 	depends on PPC_PS3
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index eee20c5..b5e25f1 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -5,7 +5,6 @@
 obj-$(CONFIG_MII) += mii.o
 obj-$(CONFIG_MDIO) += mdio.o
 obj-$(CONFIG_PHYLIB) += phy/
-obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_VMXNET3) += vmxnet3/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 8c57df8..4bafe48 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -50,6 +50,7 @@ source "drivers/net/ethernet/faraday/Kconfig"
 source "drivers/net/ethernet/freescale/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
+source "drivers/net/ethernet/icplus/Kconfig"
 
 config JME
 	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e802591..0b6ffde 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
 obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_IP1000) += icplus/
 obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
diff --git a/drivers/net/ethernet/icplus/Kconfig b/drivers/net/ethernet/icplus/Kconfig
new file mode 100644
index 0000000..e888222
--- /dev/null
+++ b/drivers/net/ethernet/icplus/Kconfig
@@ -0,0 +1,13 @@
+#
+# IC Plus device configuration
+#
+
+config IP1000
+	tristate "IP1000 Gigabit Ethernet support"
+	depends on PCI && EXPERIMENTAL
+	select MII
+	---help---
+	  This driver supports IP1000 gigabit Ethernet cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called ipg.  This is recommended.
diff --git a/drivers/net/ethernet/icplus/Makefile b/drivers/net/ethernet/icplus/Makefile
new file mode 100644
index 0000000..5bc87c1
--- /dev/null
+++ b/drivers/net/ethernet/icplus/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the IC Plus device drivers
+#
+
+obj-$(CONFIG_IP1000) += ipg.o
diff --git a/drivers/net/ipg.c b/drivers/net/ethernet/icplus/ipg.c
similarity index 100%
rename from drivers/net/ipg.c
rename to drivers/net/ethernet/icplus/ipg.c
diff --git a/drivers/net/ipg.h b/drivers/net/ethernet/icplus/ipg.h
similarity index 100%
rename from drivers/net/ipg.h
rename to drivers/net/ethernet/icplus/ipg.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (50 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 51/72] ipg: Move the IC Plus driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 14:54   ` Arnd Bergmann
  2011-06-25 16:25   ` Geoff Levand
  2011-06-25 13:59 ` [RFC 53/72] korina: Move the IDT driver Jeff Kirsher
                   ` (22 subsequent siblings)
  74 siblings, 2 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Geoff Levand

Move the Sony drivers into drivers/net/ethernet/sony/ and
make the necessary Kconfig and Makefile changes.

TODO: separate the wired and wireless drivers and relocate the wireless
dirver into drivers/net/wireless/

CC: Geoff Levand <geoff@infradead.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                        |    2 +-
 drivers/net/Kconfig                                |   23 ------------
 drivers/net/Makefile                               |    3 --
 drivers/net/ethernet/Kconfig                       |    1 +
 drivers/net/ethernet/Makefile                      |    1 +
 drivers/net/ethernet/sony/Kconfig                  |   38 ++++++++++++++++++++
 drivers/net/ethernet/sony/Makefile                 |    7 ++++
 drivers/net/{ => ethernet/sony}/ps3_gelic_net.c    |    0
 drivers/net/{ => ethernet/sony}/ps3_gelic_net.h    |    0
 .../net/{ => ethernet/sony}/ps3_gelic_wireless.c   |    0
 .../net/{ => ethernet/sony}/ps3_gelic_wireless.h   |    0
 11 files changed, 48 insertions(+), 27 deletions(-)
 create mode 100644 drivers/net/ethernet/sony/Kconfig
 create mode 100644 drivers/net/ethernet/sony/Makefile
 rename drivers/net/{ => ethernet/sony}/ps3_gelic_net.c (100%)
 rename drivers/net/{ => ethernet/sony}/ps3_gelic_net.h (100%)
 rename drivers/net/{ => ethernet/sony}/ps3_gelic_wireless.c (100%)
 rename drivers/net/{ => ethernet/sony}/ps3_gelic_wireless.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index a59a17a..53e2d11 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5049,7 +5049,7 @@ M:	Geoff Levand <geoff@infradead.org>
 L:	netdev@vger.kernel.org
 L:	cbe-oss-dev@lists.ozlabs.org
 S:	Maintained
-F:	drivers/net/ps3_gelic_net.*
+F:	drivers/net/ethernet/sony/ps3_gelic_net.*
 
 PS3 PLATFORM SUPPORT
 M:	Geoff Levand <geoff@infradead.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 366538b..211679e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -605,29 +605,6 @@ menuconfig NETDEV_1000
 
 if NETDEV_1000
 
-config GELIC_NET
-	tristate "PS3 Gigabit Ethernet driver"
-	depends on PPC_PS3
-	select PS3_SYS_MANAGER
-	help
-	  This driver supports the network device on the PS3 game
-	  console.  This driver has built-in support for Ethernet.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called ps3_gelic.
-
-config GELIC_WIRELESS
-	bool "PS3 Wireless support"
-	depends on WLAN
-	depends on GELIC_NET
-	select WIRELESS_EXT
-	help
-	  This option adds the support for the wireless feature of PS3.
-	  If you have the wireless-less model of PS3 or have no plan to
-	  use wireless feature, disabling this option saves memory.  As
-	  the driver automatically distinguishes the models, you can
-	  safely enable this option even if you have a wireless-less model.
-
 endif # NETDEV_1000
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b5e25f1..5413c17 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,9 +19,6 @@ obj-$(CONFIG_ROADRUNNER) += rrunner.o
 obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_FEALNX) += fealnx.o
-obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
-gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
-ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 4bafe48..fda90fc 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -106,6 +106,7 @@ source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/sgi/Kconfig"
 source "drivers/net/ethernet/smc/Kconfig"
 source "drivers/net/ethernet/smsc/Kconfig"
+source "drivers/net/ethernet/sony/Kconfig"
 source "drivers/net/ethernet/stmicro/Kconfig"
 source "drivers/net/ethernet/sun/Kconfig"
 source "drivers/net/ethernet/syskonnect/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0b6ffde..3588c50 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
+obj-$(CONFIG_NET_VENDOR_SONY) += sony/
 obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
 obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
diff --git a/drivers/net/ethernet/sony/Kconfig b/drivers/net/ethernet/sony/Kconfig
new file mode 100644
index 0000000..183ddf0
--- /dev/null
+++ b/drivers/net/ethernet/sony/Kconfig
@@ -0,0 +1,38 @@
+#
+# Sony (PS3) device configuration
+#
+
+config NET_VENDOR_SONY
+	bool "Sony (PS3) devices"
+	depends on PPC_PS3
+	---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 Sony devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+config GELIC_NET
+	tristate "PS3 Gigabit Ethernet driver"
+	depends on NET_VENDOR_SONY && PPC_PS3
+	select PS3_SYS_MANAGER
+	---help---
+	  This driver supports the network device on the PS3 game
+	  console.  This driver has built-in support for Ethernet.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called ps3_gelic.
+
+config GELIC_WIRELESS
+	bool "PS3 Wireless support"
+	depends on NET_VENDOR_SONY && GELIC_NET && WLAN
+	select WIRELESS_EXT
+	---help---
+	  This option adds the support for the wireless feature of PS3.
+	  If you have the wireless-less model of PS3 or have no plan to
+	  use wireless feature, disabling this option saves memory.  As
+	  the driver automatically distinguishes the models, you can
+	  safely enable this option even if you have a wireless-less model.
diff --git a/drivers/net/ethernet/sony/Makefile b/drivers/net/ethernet/sony/Makefile
new file mode 100644
index 0000000..2c6f934
--- /dev/null
+++ b/drivers/net/ethernet/sony/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Sony (PS3) network devices.
+#
+
+obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
+gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
+ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ethernet/sony/ps3_gelic_net.c
similarity index 100%
rename from drivers/net/ps3_gelic_net.c
rename to drivers/net/ethernet/sony/ps3_gelic_net.c
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ethernet/sony/ps3_gelic_net.h
similarity index 100%
rename from drivers/net/ps3_gelic_net.h
rename to drivers/net/ethernet/sony/ps3_gelic_net.h
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ethernet/sony/ps3_gelic_wireless.c
similarity index 100%
rename from drivers/net/ps3_gelic_wireless.c
rename to drivers/net/ethernet/sony/ps3_gelic_wireless.c
diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ethernet/sony/ps3_gelic_wireless.h
similarity index 100%
rename from drivers/net/ps3_gelic_wireless.h
rename to drivers/net/ethernet/sony/ps3_gelic_wireless.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 53/72] korina: Move the IDT driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (51 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 54/72] au1000_eth/mipsnet/tc35815: Move the MIPS drivers Jeff Kirsher
                   ` (21 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, IDT Inc., Felix Fietkau, Florian Fainelli

Move the IDT driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes

CC: "IDT Inc." <rischelp@idt.com>
CC: Felix Fietkau <nbd@openwrt.org>
CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                 |    7 -------
 drivers/net/Makefile                |    1 -
 drivers/net/ethernet/Kconfig        |    7 +++++++
 drivers/net/ethernet/Makefile       |    1 +
 drivers/net/{ => ethernet}/korina.c |    0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename drivers/net/{ => ethernet}/korina.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 211679e..2635bd1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -249,13 +249,6 @@ config SNI_82596
 	  Say Y here to support the on-board Intel 82596 ethernet controller
 	  built into SNI RM machines.
 
-config KORINA
-	tristate "Korina (IDT RC32434) Ethernet support"
-	depends on NET_ETHERNET && MIKROTIK_RB532
-	help
-	  If you have a Mikrotik RouterBoard 500 or IDT RC32434
-	  based system say Y. Otherwise say N.
-
 config MIPS_AU1X00_ENET
 	tristate "MIPS AU1000 Ethernet support"
 	depends on MIPS_ALCHEMY
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 5413c17..3dff87b 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -62,7 +62,6 @@ obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_SNI_82596) += sni_82596.o
 obj-$(CONFIG_SC92031) += sc92031.o
 obj-$(CONFIG_EQUALIZER) += eql.o
-obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_TUN) += tun.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index fda90fc..6115051 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -64,6 +64,13 @@ config JME
 	  To compile this driver as a module, choose M here. The module
 	  will be called jme.
 
+config KORINA
+	tristate "Korina (IDT RC32434) Ethernet support"
+	depends on MIKROTIK_RB532
+	---help---
+	  If you have a Mikrotik RouterBoard 500 or IDT RC32434
+	  based system say Y. Otherwise say N.
+
 source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/micrel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3588c50..22a6eaa 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_IP1000) += icplus/
 obj-$(CONFIG_JME) += jme.o
+obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
diff --git a/drivers/net/korina.c b/drivers/net/ethernet/korina.c
similarity index 100%
rename from drivers/net/korina.c
rename to drivers/net/ethernet/korina.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 54/72] au1000_eth/mipsnet/tc35815: Move the MIPS drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (52 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 53/72] korina: Move the IDT driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 16:13   ` Ralf Baechle
  2011-06-25 13:59 ` [RFC 55/72] bfin_mac: Move the Blackfin driver Jeff Kirsher
                   ` (20 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Ralf Baechle, Matt Porter,
	Herbert Valerio Riedel, MontaVista Software

Move the MIPS drivers into drivers/net/ethernet/mips/ and
make the necessary Kconfig and Makefile changes.

CC: Ralf Baechle <ralf@linux-mips.org>
CC: Matt Porter <mporter@kernel.crashing.org>
CC: Herbert Valerio Riedel <hvr@gnu.org>
CC: MontaVista Software <source@mvista.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                          |   42 ------------------
 drivers/net/Makefile                         |    6 ---
 drivers/net/ethernet/Kconfig                 |    1 +
 drivers/net/ethernet/Makefile                |    1 +
 drivers/net/ethernet/mips/Kconfig            |   61 ++++++++++++++++++++++++++
 drivers/net/ethernet/mips/Makefile           |   10 ++++
 drivers/net/{ => ethernet/mips}/au1000_eth.c |    0
 drivers/net/{ => ethernet/mips}/au1000_eth.h |    0
 drivers/net/{ => ethernet/mips}/lasi_82596.c |    0
 drivers/net/{ => ethernet/mips}/mipsnet.c    |    0
 drivers/net/{ => ethernet/mips}/sni_82596.c  |    0
 drivers/net/{ => ethernet/mips}/tc35815.c    |    0
 12 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 drivers/net/ethernet/mips/Kconfig
 create mode 100644 drivers/net/ethernet/mips/Makefile
 rename drivers/net/{ => ethernet/mips}/au1000_eth.c (100%)
 rename drivers/net/{ => ethernet/mips}/au1000_eth.h (100%)
 rename drivers/net/{ => ethernet/mips}/lasi_82596.c (100%)
 rename drivers/net/{ => ethernet/mips}/mipsnet.c (100%)
 rename drivers/net/{ => ethernet/mips}/sni_82596.c (100%)
 rename drivers/net/{ => ethernet/mips}/tc35815.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2635bd1..29eca29 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -235,37 +235,6 @@ config MACB
 	  To compile this driver as a module, choose M here: the module
 	  will be called macb.
 
-config LASI_82596
-	tristate "Lasi ethernet"
-	depends on GSC
-	help
-	  Say Y here to support the builtin Intel 82596 ethernet controller
-	  found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
-
-config SNI_82596
-	tristate "SNI RM ethernet"
-	depends on NET_ETHERNET && SNI_RM
-	help
-	  Say Y here to support the on-board Intel 82596 ethernet controller
-	  built into SNI RM machines.
-
-config MIPS_AU1X00_ENET
-	tristate "MIPS AU1000 Ethernet support"
-	depends on MIPS_ALCHEMY
-	select PHYLIB
-	select CRC32
-	help
-	  If you have an Alchemy Semi AU1X00 based system
-	  say Y.  Otherwise, say N.
-
-config MIPS_SIM_NET
-	tristate "MIPS simulator Network device"
-	depends on MIPS_SIM
-	help
-	  The MIPSNET device is a simple Ethernet network device which is
-	  emulated by the MIPS Simulator.
-	  If you are not using a MIPSsim or are unsure, say N.
-
 config SH_ETH
 	tristate "Renesas SuperH Ethernet support"
 	depends on SUPERH && \
@@ -486,11 +455,6 @@ config FORCEDETH
 	  To compile this driver as a module, choose M here. The module
 	  will be called forcedeth.
 
-config TC35815
-	tristate "TOSHIBA TC35815 Ethernet support"
-	depends on NET_PCI && PCI && MIPS
-	select PHYLIB
-
 config FEALNX
 	tristate "Myson MTD-8xx PCI Ethernet support"
 	depends on NET_PCI && PCI
@@ -569,12 +533,6 @@ config NET_POCKET
 	  the questions about this class of network devices. If you say Y, you
 	  will be asked for your specific device in the following questions.
 
-config LANTIQ_ETOP
-	tristate "Lantiq SoC ETOP driver"
-	depends on SOC_TYPE_XWAY
-	help
-	  Support for the MII0 inside the Lantiq SoC
-
 endif # NET_ETHERNET
 
 #
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3dff87b..4315328 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ROADRUNNER) += rrunner.o
 obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_FEALNX) += fealnx.o
-obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
@@ -58,12 +57,8 @@ obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_DEPCA) += depca.o
-obj-$(CONFIG_LASI_82596) += lasi_82596.o
-obj-$(CONFIG_SNI_82596) += sni_82596.o
 obj-$(CONFIG_SC92031) += sc92031.o
 obj-$(CONFIG_EQUALIZER) += eql.o
-obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
-obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
@@ -72,7 +67,6 @@ obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
-obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
 
 obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_MACB) += macb.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6115051..ef622d2 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -74,6 +74,7 @@ config KORINA
 source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
 source "drivers/net/ethernet/micrel/Kconfig"
+source "drivers/net/ethernet/mips/Kconfig"
 source "drivers/net/ethernet/motorola/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/natsemi/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 22a6eaa..1ab5f1f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_KORINA) += korina.o
 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
+obj-$(CONFIG_NET_MIPS) += mips/
 obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
diff --git a/drivers/net/ethernet/mips/Kconfig b/drivers/net/ethernet/mips/Kconfig
new file mode 100644
index 0000000..bc5d61e
--- /dev/null
+++ b/drivers/net/ethernet/mips/Kconfig
@@ -0,0 +1,61 @@
+#
+# MIPS device configuration
+#
+
+config NET_MIPS
+	bool "MIPS/PS-RISC devices"
+	depends on MIPS_ALCHEMY || MIPS_SIM || (PCI && MIPS) || GSC || \
+		SNI_RM || SOC_TYPE_XWAY
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y.
+	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  If unsure, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the remaining MIPS network card questions. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config LANTIQ_ETOP
+	tristate "Lantiq SoC ETOP driver"
+	depends on NET_MIPS && SOC_TYPE_XWAY
+	---help---
+	  Support for the MII0 inside the Lantiq SoC
+
+config LASI_82596
+	tristate "Lasi ethernet"
+	depends on NET_MIPS && GSC
+	---help---
+	  Say Y here to support the builtin Intel 82596 ethernet controller
+	  found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
+
+config MIPS_AU1X00_ENET
+	tristate "MIPS AU1000 Ethernet support"
+	depends on NET_MIPS && MIPS_ALCHEMY
+	select PHYLIB
+	select CRC32
+	---help---
+	  If you have an Alchemy Semi AU1X00 based system
+	  say Y.  Otherwise, say N.
+
+config MIPS_SIM_NET
+	tristate "MIPS simulator Network device"
+	depends on NET_MIPS && MIPS_SIM
+	---help---
+	  The MIPSNET device is a simple Ethernet network device which is
+	  emulated by the MIPS Simulator.
+	  If you are not using a MIPSsim or are unsure, say N.
+
+config SNI_82596
+	tristate "SNI RM ethernet"
+	depends on NET_MIPS && SNI_RM
+	---help---
+	  Say Y here to support the on-board Intel 82596 ethernet controller
+	  built into SNI RM machines.
+
+config TC35815
+	tristate "TOSHIBA TC35815 Ethernet support"
+	depends on NET_MIPS && PCI && MIPS
+	select PHYLIB
diff --git a/drivers/net/ethernet/mips/Makefile b/drivers/net/ethernet/mips/Makefile
new file mode 100644
index 0000000..1fc1ac1
--- /dev/null
+++ b/drivers/net/ethernet/mips/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the MIPS device drivers.
+#
+
+obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
+obj-$(CONFIG_LASI_82596) += lasi_82596.o
+obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
+obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
+obj-$(CONFIG_SNI_82596) += sni_82596.o
+obj-$(CONFIG_TC35815) += tc35815.o
diff --git a/drivers/net/au1000_eth.c b/drivers/net/ethernet/mips/au1000_eth.c
similarity index 100%
rename from drivers/net/au1000_eth.c
rename to drivers/net/ethernet/mips/au1000_eth.c
diff --git a/drivers/net/au1000_eth.h b/drivers/net/ethernet/mips/au1000_eth.h
similarity index 100%
rename from drivers/net/au1000_eth.h
rename to drivers/net/ethernet/mips/au1000_eth.h
diff --git a/drivers/net/lasi_82596.c b/drivers/net/ethernet/mips/lasi_82596.c
similarity index 100%
rename from drivers/net/lasi_82596.c
rename to drivers/net/ethernet/mips/lasi_82596.c
diff --git a/drivers/net/mipsnet.c b/drivers/net/ethernet/mips/mipsnet.c
similarity index 100%
rename from drivers/net/mipsnet.c
rename to drivers/net/ethernet/mips/mipsnet.c
diff --git a/drivers/net/sni_82596.c b/drivers/net/ethernet/mips/sni_82596.c
similarity index 100%
rename from drivers/net/sni_82596.c
rename to drivers/net/ethernet/mips/sni_82596.c
diff --git a/drivers/net/tc35815.c b/drivers/net/ethernet/mips/tc35815.c
similarity index 100%
rename from drivers/net/tc35815.c
rename to drivers/net/ethernet/mips/tc35815.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 55/72] bfin_mac: Move the Blackfin driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (53 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 54/72] au1000_eth/mipsnet/tc35815: Move the MIPS drivers Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 14:57   ` Arnd Bergmann
  2011-06-27 18:41   ` Hennerich, Michael
  2011-06-25 13:59 ` [RFC 56/72] macb: Move the Atmel driver Jeff Kirsher
                   ` (19 subsequent siblings)
  74 siblings, 2 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Michael Hennerich

Move the Blackfin driver into drivers/net/ethernet/blackfin/ and
make the necessary Kconfig and Makefile changes.

CC: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                    |    2 +-
 drivers/net/Kconfig                            |   46 -----------------
 drivers/net/Makefile                           |    1 -
 drivers/net/ethernet/Kconfig                   |    1 +
 drivers/net/ethernet/Makefile                  |    1 +
 drivers/net/ethernet/blackfin/Kconfig          |   65 ++++++++++++++++++++++++
 drivers/net/ethernet/blackfin/Makefile         |    5 ++
 drivers/net/{ => ethernet/blackfin}/bfin_mac.c |    0
 drivers/net/{ => ethernet/blackfin}/bfin_mac.h |    0
 9 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 drivers/net/ethernet/blackfin/Kconfig
 create mode 100644 drivers/net/ethernet/blackfin/Makefile
 rename drivers/net/{ => ethernet/blackfin}/bfin_mac.c (100%)
 rename drivers/net/{ => ethernet/blackfin}/bfin_mac.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 53e2d11..506d4d0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1426,7 +1426,7 @@ M:	Michael Hennerich <michael.hennerich@analog.com>
 L:	uclinux-dist-devel@blackfin.uclinux.org
 W:	http://blackfin.uclinux.org
 S:	Supported
-F:	drivers/net/bfin_mac.*
+F:	drivers/net/ethernet/blackfin/
 
 BLACKFIN RTC DRIVER
 M:	Mike Frysinger <vapier.adi@gmail.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 29eca29..9709106 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -250,52 +250,6 @@ config SH_ETH
 	  This driver supporting CPUs are:
 		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
 
-config BFIN_MAC
-	tristate "Blackfin on-chip MAC support"
-	depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
-	select CRC32
-	select MII
-	select PHYLIB
-	select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
-	help
-	  This is the driver for Blackfin on-chip mac device. Say Y if you want it
-	  compiled into the kernel. This driver is also available as a module
-	  ( = code which can be inserted in and removed from the running kernel
-	  whenever you want). The module will be called bfin_mac.
-
-config BFIN_MAC_USE_L1
-	bool "Use L1 memory for rx/tx packets"
-	depends on BFIN_MAC && (BF527 || BF537)
-	default y
-	help
-	  To get maximum network performance, you should use L1 memory as rx/tx buffers.
-	  Say N here if you want to reserve L1 memory for other uses.
-
-config BFIN_TX_DESC_NUM
-	int "Number of transmit buffer packets"
-	depends on BFIN_MAC
-	range 6 10 if BFIN_MAC_USE_L1
-	range 10 100
-	default "10"
-	help
-	  Set the number of buffer packets used in driver.
-
-config BFIN_RX_DESC_NUM
-	int "Number of receive buffer packets"
-	depends on BFIN_MAC
-	range 20 100 if BFIN_MAC_USE_L1
-	range 20 800
-	default "20"
-	help
-	  Set the number of buffer packets used in driver.
-
-config BFIN_MAC_USE_HWSTAMP
-	bool "Use IEEE 1588 hwstamp"
-	depends on BFIN_MAC && BF518
-	default y
-	help
-	  To support the IEEE 1588 Precision Time Protocol (PTP), select y here
-
 config NET_NETX
 	tristate "NetX Ethernet support"
 	select MII
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4315328..5c189ab 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -62,7 +62,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
-obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_ETHOC) += ethoc.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ef622d2..fede911 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -39,6 +39,7 @@ config ARIADNE
 
 source "drivers/net/ethernet/arm/Kconfig"
 source "drivers/net/ethernet/atheros/Kconfig"
+source "drivers/net/ethernet/blackfin/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 1ab5f1f..b8cc6ef 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_NET_ARM) += arm/
 obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
+obj-$(CONFIG_NET_BFIN) += blackfin/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/blackfin/Kconfig b/drivers/net/ethernet/blackfin/Kconfig
new file mode 100644
index 0000000..a2c8a3b
--- /dev/null
+++ b/drivers/net/ethernet/blackfin/Kconfig
@@ -0,0 +1,65 @@
+#
+# Blackfin device configuration
+#
+
+config NET_BFIN
+	bool "Blackfin devices"
+	depends on BF516 || BF518 || BF526 || BF527 || BF536 || BF537
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y.
+	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  If unsure, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the remaining Blackfin card questions. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config BFIN_MAC
+	tristate "Blackfin on-chip MAC support"
+	depends on NET_BFIN && (BF516 || BF518 || BF526 || BF527 || \
+		 BF536 || BF537)
+	select CRC32
+	select MII
+	select PHYLIB
+	select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
+	---help---
+	  This is the driver for Blackfin on-chip mac device. Say Y if you want
+	  it compiled into the kernel. This driver is also available as a
+	  module ( = code which can be inserted in and removed from the running
+	  kernel whenever you want). The module will be called bfin_mac.
+
+config BFIN_MAC_USE_L1
+	bool "Use L1 memory for rx/tx packets"
+	depends on BFIN_MAC && (BF527 || BF537)
+	default y
+	---help---
+	  To get maximum network performance, you should use L1 memory as rx/tx
+	  buffers. Say N here if you want to reserve L1 memory for other uses.
+
+config BFIN_TX_DESC_NUM
+	int "Number of transmit buffer packets"
+	depends on BFIN_MAC
+	range 6 10 if BFIN_MAC_USE_L1
+	range 10 100
+	default "10"
+	---help---
+	  Set the number of buffer packets used in driver.
+
+config BFIN_RX_DESC_NUM
+	int "Number of receive buffer packets"
+	depends on BFIN_MAC
+	range 20 100 if BFIN_MAC_USE_L1
+	range 20 800
+	default "20"
+	---help---
+	  Set the number of buffer packets used in driver.
+
+config BFIN_MAC_USE_HWSTAMP
+	bool "Use IEEE 1588 hwstamp"
+	depends on BFIN_MAC && BF518
+	default y
+	---help---
+	  To support the IEEE 1588 Precision Time Protocol (PTP), select y here
diff --git a/drivers/net/ethernet/blackfin/Makefile b/drivers/net/ethernet/blackfin/Makefile
new file mode 100644
index 0000000..b1fbe19
--- /dev/null
+++ b/drivers/net/ethernet/blackfin/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Blackfin device drivers.
+#
+
+obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
diff --git a/drivers/net/bfin_mac.c b/drivers/net/ethernet/blackfin/bfin_mac.c
similarity index 100%
rename from drivers/net/bfin_mac.c
rename to drivers/net/ethernet/blackfin/bfin_mac.c
diff --git a/drivers/net/bfin_mac.h b/drivers/net/ethernet/blackfin/bfin_mac.h
similarity index 100%
rename from drivers/net/bfin_mac.h
rename to drivers/net/ethernet/blackfin/bfin_mac.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 56/72] macb: Move the Atmel driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (54 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 55/72] bfin_mac: Move the Blackfin driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-27  7:46   ` Nicolas Ferre
  2011-06-25 13:59 ` [RFC 57/72] sc92031: Move the Silan driver Jeff Kirsher
                   ` (18 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Nicolas Ferre

Move the Atmel driver into drivers/net/ethernet/atmel/ and
make the necessary Kconfig and Makefile changes.

CC: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                             |    2 +-
 drivers/net/Kconfig                     |   14 -------------
 drivers/net/Makefile                    |    1 -
 drivers/net/ethernet/Kconfig            |    1 +
 drivers/net/ethernet/Makefile           |    1 +
 drivers/net/ethernet/atmel/Kconfig      |   32 +++++++++++++++++++++++++++++++
 drivers/net/ethernet/atmel/Makefile     |    5 ++++
 drivers/net/{ => ethernet/atmel}/macb.c |    0
 drivers/net/{ => ethernet/atmel}/macb.h |    0
 9 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/ethernet/atmel/Kconfig
 create mode 100644 drivers/net/ethernet/atmel/Makefile
 rename drivers/net/{ => ethernet/atmel}/macb.c (100%)
 rename drivers/net/{ => ethernet/atmel}/macb.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 506d4d0..9ddb715 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1303,7 +1303,7 @@ F:	include/video/atmel_lcdc.h
 ATMEL MACB ETHERNET DRIVER
 M:	Nicolas Ferre <nicolas.ferre@atmel.com>
 S:	Supported
-F:	drivers/net/macb.*
+F:	drivers/net/ethernet/atmel/
 
 ATMEL SPI DRIVER
 M:	Nicolas Ferre <nicolas.ferre@atmel.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9709106..7063b9c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2,9 +2,6 @@
 # Network device configuration
 #
 
-config HAVE_NET_MACB
-	bool
-
 menuconfig NETDEVICES
 	default y if UML
 	depends on NET
@@ -224,17 +221,6 @@ menuconfig NET_ETHERNET
 
 if NET_ETHERNET
 
-config MACB
-	tristate "Atmel MACB support"
-	depends on HAVE_NET_MACB
-	select PHYLIB
-	help
-	  The Atmel MACB ethernet interface is found on many AT32 and AT91
-	  parts. Say Y to include support for the MACB chip.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called macb.
-
 config SH_ETH
 	tristate "Renesas SuperH Ethernet support"
 	depends on SUPERH && \
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 5c189ab..a2a1e0a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -68,7 +68,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
 
 obj-$(CONFIG_DNET) += dnet.o
-obj-$(CONFIG_MACB) += macb.o
 
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index fede911..e7c5f0b 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -39,6 +39,7 @@ config ARIADNE
 
 source "drivers/net/ethernet/arm/Kconfig"
 source "drivers/net/ethernet/atheros/Kconfig"
+source "drivers/net/ethernet/atmel/Kconfig"
 source "drivers/net/ethernet/blackfin/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index b8cc6ef..6c69e98 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_ARIADNE) += ariadne.o
 obj-$(CONFIG_NET_ARM) += arm/
 obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
+obj-$(CONFIG_NET_ATMEL) += atmel/
 obj-$(CONFIG_NET_BFIN) += blackfin/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
diff --git a/drivers/net/ethernet/atmel/Kconfig b/drivers/net/ethernet/atmel/Kconfig
new file mode 100644
index 0000000..a8c11ea
--- /dev/null
+++ b/drivers/net/ethernet/atmel/Kconfig
@@ -0,0 +1,32 @@
+#
+# Atmel device configuration
+#
+
+config HAVE_NET_MACB
+	bool
+
+config NET_ATMEL
+	bool "Atmel devices"
+	depends on HAVE_NET_MACB
+	---help---
+	  If you have a network (Ethernet) card belonging to this class, say Y.
+	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>.
+
+	  If unsure, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the remaining Atmel network card questions. If you say Y, you will be
+	  asked for your specific card in the following questions.
+
+config MACB
+	tristate "Atmel MACB support"
+	depends on NET_ATMEL && HAVE_NET_MACB
+	select PHYLIB
+	---help---
+	  The Atmel MACB ethernet interface is found on many AT32 and AT91
+	  parts. Say Y to include support for the MACB chip.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called macb.
diff --git a/drivers/net/ethernet/atmel/Makefile b/drivers/net/ethernet/atmel/Makefile
new file mode 100644
index 0000000..91f79b1
--- /dev/null
+++ b/drivers/net/ethernet/atmel/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Atmel network device drivers.
+#
+
+obj-$(CONFIG_MACB) += macb.o
diff --git a/drivers/net/macb.c b/drivers/net/ethernet/atmel/macb.c
similarity index 100%
rename from drivers/net/macb.c
rename to drivers/net/ethernet/atmel/macb.c
diff --git a/drivers/net/macb.h b/drivers/net/ethernet/atmel/macb.h
similarity index 100%
rename from drivers/net/macb.h
rename to drivers/net/ethernet/atmel/macb.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 57/72] sc92031: Move the Silan driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (55 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 56/72] macb: Move the Atmel driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 58/72] sundance: Move the sundance driver Jeff Kirsher
                   ` (17 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev

Move the Silan driver into drivers/net/ethernet/ and made the
necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                  |   12 ------------
 drivers/net/Makefile                 |    1 -
 drivers/net/ethernet/Kconfig         |   13 +++++++++++++
 drivers/net/ethernet/Makefile        |    1 +
 drivers/net/{ => ethernet}/sc92031.c |    0
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename drivers/net/{ => ethernet}/sc92031.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7063b9c..20d1939 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -437,18 +437,6 @@ config SUNDANCE_MMIO
 
 	  If unsure, say N.
 
-config SC92031
-	tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
-	depends on NET_PCI && PCI && EXPERIMENTAL
-	select CRC32
-	---help---
-	  This is a driver for the Fast Ethernet PCI network cards based on
-	  the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
-	  have one of these, say Y here.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called sc92031.  This is recommended.
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a2a1e0a..d75080d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -57,7 +57,6 @@ obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_DEPCA) += depca.o
-obj-$(CONFIG_SC92031) += sc92031.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index e7c5f0b..aa5ded1 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -114,6 +114,19 @@ config S6GMAC
 source "drivers/net/ethernet/sis/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/sgi/Kconfig"
+
+config SC92031
+	tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
+	depends on PCI && EXPERIMENTAL
+	select CRC32
+	---help---
+	  This is a driver for the Fast Ethernet PCI network cards based on
+	  the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
+	  have one of these, say Y here.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sc92031.  This is recommended.
+
 source "drivers/net/ethernet/smc/Kconfig"
 source "drivers/net/ethernet/smsc/Kconfig"
 source "drivers/net/ethernet/sony/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 6c69e98..0fe59f4 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
+obj-$(CONFIG_SC92031) += sc92031.o
 obj-$(CONFIG_NET_VENDOR_SMC) += smc/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
 obj-$(CONFIG_NET_VENDOR_SONY) += sony/
diff --git a/drivers/net/sc92031.c b/drivers/net/ethernet/sc92031.c
similarity index 100%
rename from drivers/net/sc92031.c
rename to drivers/net/ethernet/sc92031.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 58/72] sundance: Move the sundance driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (56 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 57/72] sc92031: Move the Silan driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 59/72] r6040: Move the RDC driver Jeff Kirsher
                   ` (16 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Donald Becker

Move the sundance driver into drivers/net/ethernet/ and make
the necessary Kconfig and Makefile changes.

CC: Donald Becker <becker@scyld.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                   |   20 --------------------
 drivers/net/Makefile                  |    1 -
 drivers/net/ethernet/Kconfig          |   21 +++++++++++++++++++++
 drivers/net/ethernet/Makefile         |    1 +
 drivers/net/{ => ethernet}/sundance.c |    0
 5 files changed, 22 insertions(+), 21 deletions(-)
 rename drivers/net/{ => ethernet}/sundance.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 20d1939..82da415 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -417,26 +417,6 @@ config R6040
 	  To compile this driver as a module, choose M here: the module
 	  will be called r6040. This is recommended.
 
-config SUNDANCE
-	tristate "Sundance Alta support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  This driver is for the Sundance "Alta" chip.
-	  More specific information and updates are available from
-	  <http://www.scyld.com/network/sundance.html>.
-
-config SUNDANCE_MMIO
-	bool "Use MMIO instead of PIO"
-	depends on SUNDANCE
-	help
-	  Enable memory-mapped I/O for interaction with Sundance NIC registers.
-	  Do NOT enable this by default, PIO (enabled when MMIO is disabled)
-	  is known to solve bugs on certain chips.
-
-	  If unsure, say N.
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d75080d..b7e875a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -28,7 +28,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
 # end link order section
 #
 
-obj-$(CONFIG_SUNDANCE) += sundance.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index aa5ded1..f5eb70e 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -132,6 +132,27 @@ source "drivers/net/ethernet/smsc/Kconfig"
 source "drivers/net/ethernet/sony/Kconfig"
 source "drivers/net/ethernet/stmicro/Kconfig"
 source "drivers/net/ethernet/sun/Kconfig"
+
+config SUNDANCE
+	tristate "Sundance Alta support"
+	depends on PCI
+	select CRC32
+	select MII
+	---help---
+	  This driver is for the Sundance "Alta" chip.
+	  More specific information and updates are available from
+	  <http://www.scyld.com/network/sundance.html>.
+
+config SUNDANCE_MMIO
+	bool "Use MMIO instead of PIO"
+	depends on SUNDANCE
+	---help---
+	  Enable memory-mapped I/O for interaction with Sundance NIC registers.
+	  Do NOT enable this by default, PIO (enabled when MMIO is disabled)
+	  is known to solve bugs on certain chips.
+
+	  If unsure, say N.
+
 source "drivers/net/ethernet/syskonnect/Kconfig"
 
 config TEHUTI
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0fe59f4..2ccb194 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
 obj-$(CONFIG_NET_VENDOR_SONY) += sony/
 obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
+obj-$(CONFIG_SUNDANCE) += sundance.o
 obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
 obj-$(CONFIG_TEHUTI) += tehuti.o
 obj-$(CONFIG_NET_TI) += ti/
diff --git a/drivers/net/sundance.c b/drivers/net/ethernet/sundance.c
similarity index 100%
rename from drivers/net/sundance.c
rename to drivers/net/ethernet/sundance.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 59/72] r6040: Move the RDC driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (57 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 58/72] sundance: Move the sundance driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 18:59   ` Florian Fainelli
  2011-06-25 13:59 ` [RFC 60/72] fealnx: Move the Myson driver Jeff Kirsher
                   ` (15 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem
  Cc: Jeff Kirsher, netdev, Sten Wang, Daniel Gimpelevich, Florian Fainelli

Move the RDC driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Sten Wang <sten.wang@rdc.com.tw>
CC: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                        |    2 +-
 drivers/net/Kconfig                |   13 -------------
 drivers/net/Makefile               |    1 -
 drivers/net/ethernet/Kconfig       |   14 ++++++++++++++
 drivers/net/ethernet/Makefile      |    1 +
 drivers/net/{ => ethernet}/r6040.c |    0
 6 files changed, 16 insertions(+), 15 deletions(-)
 rename drivers/net/{ => ethernet}/r6040.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9ddb715..f1f555d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5258,7 +5258,7 @@ RDC R6040 FAST ETHERNET DRIVER
 M:	Florian Fainelli <florian@openwrt.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/r6040.c
+F:	drivers/net/ethernet/r6040.c
 
 RDS - RELIABLE DATAGRAM SOCKETS
 M:	Andy Grover <andy.grover@oracle.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 82da415..463e4cf 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -404,19 +404,6 @@ config FEALNX
 	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
 	  cards. <http://www.myson.com.tw/>
 
-config R6040
-	tristate "RDC R6040 Fast Ethernet Adapter support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	select PHYLIB
-	help
-	  This is a driver for the R6040 Fast Ethernet MACs found in the
-	  the RDC R-321x System-on-chips.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called r6040. This is recommended.
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b7e875a..f57a0be 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_PLIP) += plip.o
 
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
-obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_SKFP) += skfp/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index f5eb70e..3c10879 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -98,6 +98,20 @@ config PASEMI_MAC
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/radisys/Kconfig"
+
+config R6040
+	tristate "RDC R6040 Fast Ethernet Adapter support"
+	depends on PCI
+	select CRC32
+	select MII
+	select PHYLIB
+	---help---
+	  This is a driver for the R6040 Fast Ethernet MACs found in the
+	  the RDC R-321x System-on-chips.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called r6040. This is recommended.
+
 source "drivers/net/ethernet/realtek/Kconfig"
 
 config S6GMAC
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 2ccb194..537631b 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_RADISYS) += radisys/
+obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
diff --git a/drivers/net/r6040.c b/drivers/net/ethernet/r6040.c
similarity index 100%
rename from drivers/net/r6040.c
rename to drivers/net/ethernet/r6040.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 60/72] fealnx: Move the Myson driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (58 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 59/72] r6040: Move the RDC driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 61/72] forcedeth: Move the NVIDIA nForce driver Jeff Kirsher
                   ` (14 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Donald Becker

Move the Myson driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Donald Becker <becker@scyld.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                 |    9 ---------
 drivers/net/Makefile                |    1 -
 drivers/net/ethernet/Kconfig        |   10 ++++++++++
 drivers/net/ethernet/Makefile       |    1 +
 drivers/net/{ => ethernet}/fealnx.c |    0
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename drivers/net/{ => ethernet}/fealnx.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 463e4cf..4ec5d5e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -395,15 +395,6 @@ config FORCEDETH
 	  To compile this driver as a module, choose M here. The module
 	  will be called forcedeth.
 
-config FEALNX
-	tristate "Myson MTD-8xx PCI Ethernet support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
-	  cards. <http://www.myson.com.tw/>
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f57a0be..8b0a478 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -17,7 +17,6 @@ obj-$(CONFIG_PLIP) += plip.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
-obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 3c10879..45becd2 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -79,6 +79,16 @@ source "drivers/net/ethernet/micrel/Kconfig"
 source "drivers/net/ethernet/mips/Kconfig"
 source "drivers/net/ethernet/motorola/Kconfig"
 source "drivers/net/ethernet/myricom/Kconfig"
+
+config FEALNX
+	tristate "Myson MTD-8xx PCI Ethernet support"
+	depends on PCI
+	select CRC32
+	select MII
+	---help---
+	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet
+	  cards. <http://www.myson.com.tw/>
+
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/octeon/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 537631b..c4284aa 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_NET_MIPS) += mips/
 obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
+obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_NET_ISA) += isa/
diff --git a/drivers/net/fealnx.c b/drivers/net/ethernet/fealnx.c
similarity index 100%
rename from drivers/net/fealnx.c
rename to drivers/net/ethernet/fealnx.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 61/72] forcedeth: Move the NVIDIA nForce driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (59 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 60/72] fealnx: Move the Myson driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 62/72] starfire: Move the starfire driver Jeff Kirsher
                   ` (13 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev

Move the nForce driver into drivers/net/ethernet/ and make
the necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                    |   11 -----------
 drivers/net/Makefile                   |    1 -
 drivers/net/ethernet/Kconfig           |   12 ++++++++++++
 drivers/net/ethernet/Makefile          |    1 +
 drivers/net/{ => ethernet}/forcedeth.c |    0
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename drivers/net/{ => ethernet}/forcedeth.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4ec5d5e..04968e8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -384,17 +384,6 @@ config ADAPTEC_STARFIRE
 	  To compile this driver as a module, choose M here: the module
 	  will be called starfire.  This is recommended.
 
-config FORCEDETH
-	tristate "nForce Ethernet support"
-	depends on NET_PCI && PCI
-	help
-	  If you have a network (Ethernet) controller of this type, say Y and
-	  read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called forcedeth.
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8b0a478..97edc95 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
-obj-$(CONFIG_FORCEDETH) += forcedeth.o
 
 obj-$(CONFIG_PPP) += ppp_generic.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 45becd2..94e8630 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -91,6 +91,18 @@ config FEALNX
 
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
+
+config FORCEDETH
+	tristate "nForce Ethernet support"
+	depends on PCI
+	---help---
+	  If you have a network (Ethernet) controller of this type, say Y and
+	  read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called forcedeth.
+
 source "drivers/net/ethernet/octeon/Kconfig"
 source "drivers/net/ethernet/isa/Kconfig"
 source "drivers/net/ethernet/oki/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index c4284aa..b6ff610 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
+obj-$(CONFIG_FORCEDETH) += forcedeth.o
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_NET_ISA) += isa/
 obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
diff --git a/drivers/net/forcedeth.c b/drivers/net/ethernet/forcedeth.c
similarity index 100%
rename from drivers/net/forcedeth.c
rename to drivers/net/ethernet/forcedeth.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 62/72] starfire: Move the starfire driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (60 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 61/72] forcedeth: Move the NVIDIA nForce driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 63/72] hp100/depca: Move the HP and Digital drivers Jeff Kirsher
                   ` (12 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Ion Badulescu

Move the starfire driver into drivers/net/ethernet/ and make
the necessary Kconfig and Makefile changes.

CC: Ion Badulescu <ionut@badula.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                           |    2 +-
 drivers/net/Kconfig                   |   14 --------------
 drivers/net/Makefile                  |    1 -
 drivers/net/ethernet/Kconfig          |   14 ++++++++++++++
 drivers/net/ethernet/Makefile         |    1 +
 drivers/net/{ => ethernet}/starfire.c |    0
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename drivers/net/{ => ethernet}/starfire.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index f1f555d..432dbfc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6031,7 +6031,7 @@ F:	drivers/staging/
 STARFIRE/DURALAN NETWORK DRIVER
 M:	Ion Badulescu <ionut@badula.org>
 S:	Odd Fixes
-F:	drivers/net/starfire*
+F:	drivers/net/ethernet/starfire*
 
 SUN3/3X
 M:	Sam Creasey <sammy@sammy.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 04968e8..dcdf6e6 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -370,20 +370,6 @@ config NET_PCI
 	  will be asked for your specific card in the following questions. If
 	  you are unsure, say Y.
 
-config ADAPTEC_STARFIRE
-	tristate "Adaptec Starfire/DuraLAN support"
-	depends on NET_PCI && PCI
-	select CRC32
-	select MII
-	help
-	  Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
-	  adapter. The DuraLAN chip is used on the 64 bit PCI boards from
-	  Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip
-	  driver.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called starfire.  This is recommended.
-
 config NET_POCKET
 	bool "Pocket and portable adapters"
 	depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 97edc95..ae1b74d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_ROADRUNNER) += rrunner.o
 
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_SKFP) += skfp/
-obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_RIONET) += rionet.o
 obj-$(CONFIG_SH_ETH) += sh_eth.o
 
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 94e8630..6ade848 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -24,6 +24,20 @@ config A2065
 	  To compile this driver as a module, choose M here: the module
 	  will be called a2065.
 
+config ADAPTEC_STARFIRE
+	tristate "Adaptec Starfire/DuraLAN support"
+	depends on PCI
+	select CRC32
+	select MII
+	---help---
+	  Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
+	  adapter. The DuraLAN chip is used on the 64 bit PCI boards from
+	  Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip
+	  driver.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called starfire.  This is recommended.
+
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
 
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index b6ff610..eef91e6 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -5,6 +5,7 @@
 obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_A2065) += a2065.o
+obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_ARIADNE) += ariadne.o
diff --git a/drivers/net/starfire.c b/drivers/net/ethernet/starfire.c
similarity index 100%
rename from drivers/net/starfire.c
rename to drivers/net/ethernet/starfire.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 63/72] hp100/depca: Move the HP and Digital drivers
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (61 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 62/72] starfire: Move the starfire driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 64/72] at1700: Move the Allied Telesis driver Jeff Kirsher
                   ` (11 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Jaroslav Kysela, David Davies

Move the HP and Digital drivers into drivers/net/ethernet/ and
made the necessary Kconfig and Makefile changes.

CC: Jaroslav Kysela <perex@perex.cz>
CC: David Davies <davies@maniac.ultranet.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                        |    2 +-
 drivers/net/Kconfig                |   24 ------------------------
 drivers/net/Makefile               |    2 --
 drivers/net/ethernet/Kconfig       |   26 ++++++++++++++++++++++++++
 drivers/net/ethernet/Makefile      |    2 ++
 drivers/net/{ => ethernet}/depca.c |    0
 drivers/net/{ => ethernet}/depca.h |    0
 drivers/net/{ => ethernet}/hp100.c |    0
 drivers/net/{ => ethernet}/hp100.h |    0
 9 files changed, 29 insertions(+), 27 deletions(-)
 rename drivers/net/{ => ethernet}/depca.c (100%)
 rename drivers/net/{ => ethernet}/depca.h (100%)
 rename drivers/net/{ => ethernet}/hp100.c (100%)
 rename drivers/net/{ => ethernet}/hp100.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 432dbfc..f4a46ef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3033,7 +3033,7 @@ F:	drivers/platform/x86/tc1100-wmi.c
 HP100:	Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
 M:	Jaroslav Kysela <perex@perex.cz>
 S:	Maintained
-F:	drivers/net/hp100.*
+F:	drivers/net/ethernet/hp100.*
 
 HPET:	High Precision Event Timers driver
 M:	Clemens Ladisch <clemens@ladisch.de>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index dcdf6e6..2af125b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -332,30 +332,6 @@ config AT1700
 	  To compile this driver as a module, choose M here. The module
 	  will be called at1700.
 
-config DEPCA
-	tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
-	depends on ISA || EISA || MCA
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto> as well as
-	  <file:drivers/net/depca.c>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called depca.
-
-config HP100
-	tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
-	depends on ISA || EISA || PCI
-	help
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called hp100.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index ae1b74d..13e2499 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -27,7 +27,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
 
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_HP100) += hp100.o
 
 obj-$(CONFIG_PPP) += ppp_generic.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
@@ -51,7 +50,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6ade848..bb4b87f 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -59,11 +59,37 @@ source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/cisco/Kconfig"
+
+config DEPCA
+	tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
+	depends on ISA || EISA || MCA
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto> as well as
+	  <file:drivers/net/depca.c>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called depca.
+
 source "drivers/net/ethernet/dlink/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/faraday/Kconfig"
 source "drivers/net/ethernet/freescale/Kconfig"
+
+config HP100
+	tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
+	depends on ISA || EISA || PCI
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called hp100.
+
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/icplus/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index eef91e6..37a5d1c 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -17,11 +17,13 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
+obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
 obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
+obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_IP1000) += icplus/
diff --git a/drivers/net/depca.c b/drivers/net/ethernet/depca.c
similarity index 100%
rename from drivers/net/depca.c
rename to drivers/net/ethernet/depca.c
diff --git a/drivers/net/depca.h b/drivers/net/ethernet/depca.h
similarity index 100%
rename from drivers/net/depca.h
rename to drivers/net/ethernet/depca.h
diff --git a/drivers/net/hp100.c b/drivers/net/ethernet/hp100.c
similarity index 100%
rename from drivers/net/hp100.c
rename to drivers/net/ethernet/hp100.c
diff --git a/drivers/net/hp100.h b/drivers/net/ethernet/hp100.h
similarity index 100%
rename from drivers/net/hp100.h
rename to drivers/net/ethernet/hp100.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 64/72] at1700: Move the Allied Telesis driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (62 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 63/72] hp100/depca: Move the HP and Digital drivers Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 65/72] dnet: Move the Dave Ethernet driver Jeff Kirsher
                   ` (10 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Donald Becker, Yutaka Tamiya, Rene Schmit

Move the Allied Telesis driver into drivers/net/ethernet/ and
made the necessary Kconfig and Makefile changes.

CC: Donald Becker <becker@scyld.com>
CC: Yutaka Tamiya <tamy@flab.fujitsu.co.jp>
CC: Rene Schmit <rene@bss.lu>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                 |   12 ------------
 drivers/net/Makefile                |    1 -
 drivers/net/ethernet/Kconfig        |   13 +++++++++++++
 drivers/net/ethernet/Makefile       |    1 +
 drivers/net/{ => ethernet}/at1700.c |    0
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename drivers/net/{ => ethernet}/at1700.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2af125b..5c3505b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -320,18 +320,6 @@ config DNET
 	  To compile this driver as a module, choose M here: the module
 	  will be called dnet.
 
-config AT1700
-	tristate "AT1700/1720 support (EXPERIMENTAL)"
-	depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
-	select CRC32
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called at1700.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 13e2499..8504458 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
-obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index bb4b87f..c6d61a01 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -52,6 +52,19 @@ config ARIADNE
 	  will be called ariadne.
 
 source "drivers/net/ethernet/arm/Kconfig"
+
+config AT1700
+	tristate "AT1700/1720 support (EXPERIMENTAL)"
+	depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
+	select CRC32
+	---help---
+	  If you have a network (Ethernet) card of this type, say Y and read
+	  the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called at1700.
+
 source "drivers/net/ethernet/atheros/Kconfig"
 source "drivers/net/ethernet/atmel/Kconfig"
 source "drivers/net/ethernet/blackfin/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 37a5d1c..0ad9873 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
+obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_ARIADNE) += ariadne.o
diff --git a/drivers/net/at1700.c b/drivers/net/ethernet/at1700.c
similarity index 100%
rename from drivers/net/at1700.c
rename to drivers/net/ethernet/at1700.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 65/72] dnet: Move the Dave Ethernet driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (63 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 64/72] at1700: Move the Allied Telesis driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 66/72] ethoc: Move the Avionic driver Jeff Kirsher
                   ` (9 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Ilya Yanok

Move the Dave Ethernet driver into drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.

CC: "Dave S.r.l." <www.dave.eu>
CC: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig               |   11 -----------
 drivers/net/Makefile              |    2 --
 drivers/net/ethernet/Kconfig      |   11 +++++++++++
 drivers/net/ethernet/Makefile     |    1 +
 drivers/net/{ => ethernet}/dnet.c |    0
 drivers/net/{ => ethernet}/dnet.h |    0
 6 files changed, 12 insertions(+), 13 deletions(-)
 rename drivers/net/{ => ethernet}/dnet.c (100%)
 rename drivers/net/{ => ethernet}/dnet.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5c3505b..59b935c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -309,17 +309,6 @@ config GRETH
 	help
 	  Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
 
-config DNET
-	tristate "Dave ethernet support (DNET)"
-	depends on NET_ETHERNET && HAS_IOMEM
-	select PHYLIB
-	help
-	  The Dave ethernet interface (DNET) is found on Qong Board FPGA.
-	  Say Y to include support for the DNET chip.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called dnet.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8504458..4e84419 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -58,8 +58,6 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
 
-obj-$(CONFIG_DNET) += dnet.o
-
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
 obj-$(CONFIG_TR) += tokenring/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c6d61a01..55976aa 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -73,6 +73,17 @@ source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/cisco/Kconfig"
 
+config DNET
+	tristate "Dave ethernet support (DNET)"
+	depends on HAS_IOMEM
+	select PHYLIB
+	---help---
+	  The Dave ethernet interface (DNET) is found on Qong Board FPGA.
+	  Say Y to include support for the DNET chip.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called dnet.
+
 config DEPCA
 	tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
 	depends on ISA || EISA || MCA
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0ad9873..8800662 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
+obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
diff --git a/drivers/net/dnet.c b/drivers/net/ethernet/dnet.c
similarity index 100%
rename from drivers/net/dnet.c
rename to drivers/net/ethernet/dnet.c
diff --git a/drivers/net/dnet.h b/drivers/net/ethernet/dnet.h
similarity index 100%
rename from drivers/net/dnet.h
rename to drivers/net/ethernet/dnet.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 66/72] ethoc: Move the Avionic driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (64 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 65/72] dnet: Move the Dave Ethernet driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 67/72] greth: Move the Aeroflex Gaisler driver Jeff Kirsher
                   ` (8 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Thierry Reding

Move the Avionic driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makfile changes.

CC: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                |   10 ----------
 drivers/net/Makefile               |    1 -
 drivers/net/ethernet/Kconfig       |   11 +++++++++++
 drivers/net/ethernet/Makefile      |    1 +
 drivers/net/{ => ethernet}/ethoc.c |    0
 5 files changed, 12 insertions(+), 11 deletions(-)
 rename drivers/net/{ => ethernet}/ethoc.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 59b935c..043bbf5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -291,16 +291,6 @@ config ENC28J60_WRITEVERIFY
 	  Enable the verify after the buffer write useful for debugging purpose.
 	  If unsure, say N.
 
-config ETHOC
-	tristate "OpenCores 10/100 Mbps Ethernet MAC support"
-	depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
-	select MII
-	select PHYLIB
-	select CRC32
-	select BITREVERSE
-	help
-	  Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
-
 config GRETH
 	tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
 	depends on SPARC
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4e84419..67e25a4 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_ENC28J60) += enc28j60.o
-obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
 
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 55976aa..5645609 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -168,6 +168,17 @@ config FORCEDETH
 	  will be called forcedeth.
 
 source "drivers/net/ethernet/octeon/Kconfig"
+
+config ETHOC
+	tristate "OpenCores 10/100 Mbps Ethernet MAC support"
+	depends on HAS_IOMEM && HAS_DMA
+	select MII
+	select PHYLIB
+	select CRC32
+	select BITREVERSE
+	---help---
+	  Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
+
 source "drivers/net/ethernet/isa/Kconfig"
 source "drivers/net/ethernet/oki/Kconfig"
 source "drivers/net/ethernet/packetengines/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 8800662..47d19fc 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
+obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_NET_ISA) += isa/
 obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
 obj-$(CONFIG_NET_VENDOR_OKI) += oki/
diff --git a/drivers/net/ethoc.c b/drivers/net/ethernet/ethoc.c
similarity index 100%
rename from drivers/net/ethoc.c
rename to drivers/net/ethernet/ethoc.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 67/72] greth: Move the Aeroflex Gaisler driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (65 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 66/72] ethoc: Move the Avionic driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 68/72] enc28j60: Move the enc28j60 driver Jeff Kirsher
                   ` (7 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Kristoffer Glembo

Mover the Aeroflex Gaisler driver into drivers/net/ethernet/aeroflex/
and make the necessary Kconfig and Makefile changes.

CC: Kristoffer Glembo <kristoffer@gaisler.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                 |    2 +-
 drivers/net/Kconfig                         |    8 --------
 drivers/net/Makefile                        |    1 -
 drivers/net/ethernet/Kconfig                |    1 +
 drivers/net/ethernet/Makefile               |    1 +
 drivers/net/ethernet/aeroflex/Kconfig       |   11 +++++++++++
 drivers/net/ethernet/aeroflex/Makefile      |    5 +++++
 drivers/net/{ => ethernet/aeroflex}/greth.c |    0
 drivers/net/{ => ethernet/aeroflex}/greth.h |    0
 9 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
 create mode 100644 drivers/net/ethernet/aeroflex/Makefile
 rename drivers/net/{ => ethernet/aeroflex}/greth.c (100%)
 rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index f4a46ef..b86d518 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2828,7 +2828,7 @@ GRETH 10/100/1G Ethernet MAC device driver
 M:	Kristoffer Glembo <kristoffer@gaisler.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/greth*
+F:	drivers/net/ethernet/aeroflex/greth*
 
 GSPCA FINEPIX SUBDRIVER
 M:	Frank Zago <frank@zago.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 043bbf5..70ff9cc 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -291,14 +291,6 @@ config ENC28J60_WRITEVERIFY
 	  Enable the verify after the buffer write useful for debugging purpose.
 	  If unsure, say N.
 
-config GRETH
-	tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
-	depends on SPARC
-	select PHYLIB
-	select CRC32
-	help
-	  Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 67e25a4..9c9b2ea 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_ENC28J60) += enc28j60.o
-obj-$(CONFIG_GRETH) += greth.o
 
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 5645609..4c18328 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -38,6 +38,7 @@ config ADAPTEC_STARFIRE
 	  To compile this driver as a module, choose M here: the module
 	  will be called starfire.  This is recommended.
 
+source "drivers/net/ethernet/aeroflex/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
 
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 47d19fc..f2e36ba 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_A2065) += a2065.o
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
+obj-$(CONFIG_GRETH) += aeroflex/
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
diff --git a/drivers/net/ethernet/aeroflex/Kconfig b/drivers/net/ethernet/aeroflex/Kconfig
new file mode 100644
index 0000000..f109c8c
--- /dev/null
+++ b/drivers/net/ethernet/aeroflex/Kconfig
@@ -0,0 +1,11 @@
+#
+# Aeroflex Gaisler device configuration
+#
+
+config GRETH
+	tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
+	depends on SPARC
+	select PHYLIB
+	select CRC32
+	---help---
+	  Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
diff --git a/drivers/net/ethernet/aeroflex/Makefile b/drivers/net/ethernet/aeroflex/Makefile
new file mode 100644
index 0000000..701fcd0
--- /dev/null
+++ b/drivers/net/ethernet/aeroflex/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Aeroflex Gaisler device drivers.
+#
+
+obj-$(CONFIG_GRETH) += greth.o
diff --git a/drivers/net/greth.c b/drivers/net/ethernet/aeroflex/greth.c
similarity index 100%
rename from drivers/net/greth.c
rename to drivers/net/ethernet/aeroflex/greth.c
diff --git a/drivers/net/greth.h b/drivers/net/ethernet/aeroflex/greth.h
similarity index 100%
rename from drivers/net/greth.h
rename to drivers/net/ethernet/aeroflex/greth.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 68/72] enc28j60: Move the enc28j60 driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (66 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 67/72] greth: Move the Aeroflex Gaisler driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 69/72] dm9000: Move the Davicom driver Jeff Kirsher
                   ` (6 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Claudio Lanconelli

Move the enc28j60 driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Claudio Lanconelli <lanconelli.claudio@eptar.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                      |   17 -----------------
 drivers/net/Makefile                     |    1 -
 drivers/net/ethernet/Kconfig             |   18 ++++++++++++++++++
 drivers/net/ethernet/Makefile            |    1 +
 drivers/net/{ => ethernet}/enc28j60.c    |    0
 drivers/net/{ => ethernet}/enc28j60_hw.h |    0
 6 files changed, 19 insertions(+), 18 deletions(-)
 rename drivers/net/{ => ethernet}/enc28j60.c (100%)
 rename drivers/net/{ => ethernet}/enc28j60_hw.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 70ff9cc..d1bcd23 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -274,23 +274,6 @@ config DM9000_FORCE_SIMPLE_PHY_POLL
 	  costly MII PHY reads. Note, this will not work if the chip is
 	  operating with an external PHY.
 
-config ENC28J60
-	tristate "ENC28J60 support"
-	depends on EXPERIMENTAL && SPI && NET_ETHERNET
-	select CRC32
-	---help---
-	  Support for the Microchip EN28J60 ethernet chip.
-
-	  To compile this driver as a module, choose M here. The module will be
-	  called enc28j60.
-
-config ENC28J60_WRITEVERIFY
-	bool "Enable write verify"
-	depends on ENC28J60
-	---help---
-	  Enable the verify after the buffer write useful for debugging purpose.
-	  If unsure, say N.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9c9b2ea..b647529 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DM9000) += dm9000.o
-obj-$(CONFIG_ENC28J60) += enc28j60.o
 
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 4c18328..ac88e7c 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -100,6 +100,24 @@ config DEPCA
 
 source "drivers/net/ethernet/dlink/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
+
+config ENC28J60
+	tristate "ENC28J60 support"
+	depends on EXPERIMENTAL && SPI && NET_ETHERNET
+	select CRC32
+	---help---
+	  Support for the Microchip EN28J60 ethernet chip.
+
+	  To compile this driver as a module, choose M here. The module will be
+	  called enc28j60.
+
+config ENC28J60_WRITEVERIFY
+	bool "Enable write verify"
+	depends on ENC28J60
+	---help---
+	  Enable the verify after the buffer write useful for debugging purpose.
+	  If unsure, say N.
+
 source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/faraday/Kconfig"
 source "drivers/net/ethernet/freescale/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index f2e36ba..afbb0ff 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
+obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
 obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
diff --git a/drivers/net/enc28j60.c b/drivers/net/ethernet/enc28j60.c
similarity index 100%
rename from drivers/net/enc28j60.c
rename to drivers/net/ethernet/enc28j60.c
diff --git a/drivers/net/enc28j60_hw.h b/drivers/net/ethernet/enc28j60_hw.h
similarity index 100%
rename from drivers/net/enc28j60_hw.h
rename to drivers/net/ethernet/enc28j60_hw.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 69/72] dm9000: Move the Davicom driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (67 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 68/72] enc28j60: Move the enc28j60 driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-27  9:45   ` Sascha Hauer
  2011-06-25 13:59 ` [RFC 70/72] netx: Move the netx driver Jeff Kirsher
                   ` (5 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Ben Dooks, Sascha Hauer

Move the Davicom driver into drivers/net/ethernet/davicom/ and
make the necessary Kconfig and Makefile changes.

CC: Ben Dooks <ben@simtec.co.uk>
CC: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                         |   28 ------------------------
 drivers/net/Makefile                        |    1 -
 drivers/net/ethernet/Kconfig                |    1 +
 drivers/net/ethernet/Makefile               |    1 +
 drivers/net/ethernet/davicom/Kconfig        |   31 +++++++++++++++++++++++++++
 drivers/net/ethernet/davicom/Makefile       |    5 ++++
 drivers/net/{ => ethernet/davicom}/dm9000.c |    0
 drivers/net/{ => ethernet/davicom}/dm9000.h |    0
 8 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 drivers/net/ethernet/davicom/Kconfig
 create mode 100644 drivers/net/ethernet/davicom/Makefile
 rename drivers/net/{ => ethernet/davicom}/dm9000.c (100%)
 rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d1bcd23..4ddc389 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -246,34 +246,6 @@ config NET_NETX
 	  To compile this driver as a module, choose M here. The module
 	  will be called netx-eth.
 
-config DM9000
-	tristate "DM9000 support"
-	depends on ARM || BLACKFIN || MIPS
-	select CRC32
-	select MII
-	---help---
-	  Support for DM9000 chipset.
-
-	  To compile this driver as a module, choose M here.  The module
-	  will be called dm9000.
-
-config DM9000_DEBUGLEVEL
-	int "DM9000 maximum debug level"
-	depends on DM9000
-	default 4
-	help
-	  The maximum level of debugging code compiled into the DM9000
-	  driver.
-
-config DM9000_FORCE_SIMPLE_PHY_POLL
-	bool "Force simple NSR based PHY polling"
-	depends on DM9000
-	---help---
-	  This configuration forces the DM9000 to use the NSR's LinkStatus
-	  bit to determine if the link is up or down instead of the more
-	  costly MII PHY reads. Note, this will not work if the chip is
-	  operating with an external PHY.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b647529..83075d4 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -53,7 +53,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NET_NETX) += netx-eth.o
-obj-$(CONFIG_DM9000) += dm9000.o
 
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ac88e7c..3ec1903 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -73,6 +73,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/cisco/Kconfig"
+source "drivers/net/ethernet/davicom/Kconfig"
 
 config DNET
 	tristate "Dave ethernet support (DNET)"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index afbb0ff..3b2a35a 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
+obj-$(CONFIG_DM9000) += davicom/
 obj-$(CONFIG_DNET) += dnet.o
 obj-$(CONFIG_DEPCA) += depca.o
 obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig
new file mode 100644
index 0000000..0a03b0b
--- /dev/null
+++ b/drivers/net/ethernet/davicom/Kconfig
@@ -0,0 +1,31 @@
+#
+# Davicom device configuration
+#
+
+config DM9000
+	tristate "DM9000 support"
+	depends on ARM || BLACKFIN || MIPS
+	select CRC32
+	select MII
+	---help---
+	  Support for DM9000 chipset.
+
+	  To compile this driver as a module, choose M here.  The module
+	  will be called dm9000.
+
+config DM9000_DEBUGLEVEL
+	int "DM9000 maximum debug level"
+	depends on DM9000
+	default 4
+	help
+	  The maximum level of debugging code compiled into the DM9000
+	  driver.
+
+config DM9000_FORCE_SIMPLE_PHY_POLL
+	bool "Force simple NSR based PHY polling"
+	depends on DM9000
+	---help---
+	  This configuration forces the DM9000 to use the NSR's LinkStatus
+	  bit to determine if the link is up or down instead of the more
+	  costly MII PHY reads. Note, this will not work if the chip is
+	  operating with an external PHY.
diff --git a/drivers/net/ethernet/davicom/Makefile b/drivers/net/ethernet/davicom/Makefile
new file mode 100644
index 0000000..74b31f0
--- /dev/null
+++ b/drivers/net/ethernet/davicom/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Davicom device drivers.
+#
+
+obj-$(CONFIG_DM9000) += dm9000.o
diff --git a/drivers/net/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
similarity index 100%
rename from drivers/net/dm9000.c
rename to drivers/net/ethernet/davicom/dm9000.c
diff --git a/drivers/net/dm9000.h b/drivers/net/ethernet/davicom/dm9000.h
similarity index 100%
rename from drivers/net/dm9000.h
rename to drivers/net/ethernet/davicom/dm9000.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 70/72] netx: Move the netx driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (68 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 69/72] dm9000: Move the Davicom driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-27  9:45   ` Sascha Hauer
  2011-06-25 13:59 ` [RFC 71/72] sh_eth: Move the Renesas SuperH driver Jeff Kirsher
                   ` (4 subsequent siblings)
  74 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Sascha Hauer

Move the netx driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.

CC: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                   |   10 ----------
 drivers/net/Makefile                  |    1 -
 drivers/net/ethernet/Kconfig          |   10 ++++++++++
 drivers/net/ethernet/Makefile         |    1 +
 drivers/net/{ => ethernet}/netx-eth.c |    0
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename drivers/net/{ => ethernet}/netx-eth.c (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4ddc389..dfae2ec 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -236,16 +236,6 @@ config SH_ETH
 	  This driver supporting CPUs are:
 		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
 
-config NET_NETX
-	tristate "NetX Ethernet support"
-	select MII
-	depends on ARCH_NETX
-	help
-	  This is support for the Hilscher netX builtin Ethernet ports
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called netx-eth.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 83075d4..c24b5ef 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
-obj-$(CONFIG_NET_NETX) += netx-eth.o
 
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 3ec1903..b7d8d9b 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -176,6 +176,16 @@ config FEALNX
 source "drivers/net/ethernet/natsemi/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 
+config NET_NETX
+	tristate "NetX Ethernet support"
+	depends on ARCH_NETX
+	select MII
+	---help---
+	  This is support for the Hilscher netX builtin Ethernet ports
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called netx-eth.
+
 config FORCEDETH
 	tristate "nForce Ethernet support"
 	depends on PCI
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3b2a35a..c1a1c61 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
+obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
 obj-$(CONFIG_ETHOC) += ethoc.o
diff --git a/drivers/net/netx-eth.c b/drivers/net/ethernet/netx-eth.c
similarity index 100%
rename from drivers/net/netx-eth.c
rename to drivers/net/ethernet/netx-eth.c
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 71/72] sh_eth: Move the Renesas SuperH driver
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (69 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 70/72] netx: Move the netx driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-25 13:59 ` [RFC 72/72] drivers/net: Kconfig and Makefile cleanup Jeff Kirsher
                   ` (3 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev, Yoshihiro Shimoda

Move the Renesas driver into drivers/net/ethernet/renesas/ and make
the necessary Kconfig and Makefile changes.

CC: Yoshihiro Shimoda <yoshihiro.shirmoda.uh@renesas.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig                         |   15 ---------------
 drivers/net/Makefile                        |    1 -
 drivers/net/ethernet/Kconfig                |    1 +
 drivers/net/ethernet/Makefile               |    1 +
 drivers/net/ethernet/renesas/Kconfig        |   18 ++++++++++++++++++
 drivers/net/ethernet/renesas/Makefile       |    5 +++++
 drivers/net/{ => ethernet/renesas}/sh_eth.c |    0
 drivers/net/{ => ethernet/renesas}/sh_eth.h |    0
 8 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 drivers/net/ethernet/renesas/Kconfig
 create mode 100644 drivers/net/ethernet/renesas/Makefile
 rename drivers/net/{ => ethernet/renesas}/sh_eth.c (100%)
 rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index dfae2ec..07e798e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -221,21 +221,6 @@ menuconfig NET_ETHERNET
 
 if NET_ETHERNET
 
-config SH_ETH
-	tristate "Renesas SuperH Ethernet support"
-	depends on SUPERH && \
-		(CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
-		 CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
-		 CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757)
-	select CRC32
-	select MII
-	select MDIO_BITBANG
-	select PHYLIB
-	help
-	  Renesas SuperH Ethernet device driver.
-	  This driver supporting CPUs are:
-		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c24b5ef..b9fc5a0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ROADRUNNER) += rrunner.o
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_RIONET) += rionet.o
-obj-$(CONFIG_SH_ETH) += sh_eth.o
 
 #
 # end link order section
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index b7d8d9b..ab12ecd 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -240,6 +240,7 @@ config R6040
 	  will be called r6040. This is recommended.
 
 source "drivers/net/ethernet/realtek/Kconfig"
+source "drivers/net/ethernet/renesas/Kconfig"
 
 config S6GMAC
 	tristate "S6105 GMAC ethernet support"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index c1a1c61..c3fa3be 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_RADISYS) += radisys/
 obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_SH_ETH) += renesas/
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
 obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig
new file mode 100644
index 0000000..f57ae23
--- /dev/null
+++ b/drivers/net/ethernet/renesas/Kconfig
@@ -0,0 +1,18 @@
+#
+# Renesas device configuration
+#
+
+config SH_ETH
+	tristate "Renesas SuperH Ethernet support"
+	depends on SUPERH && \
+		(CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
+		 CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
+		 CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757)
+	select CRC32
+	select MII
+	select MDIO_BITBANG
+	select PHYLIB
+	---help---
+	  Renesas SuperH Ethernet device driver.
+	  This driver supporting CPUs are:
+		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
diff --git a/drivers/net/ethernet/renesas/Makefile b/drivers/net/ethernet/renesas/Makefile
new file mode 100644
index 0000000..1c278a8
--- /dev/null
+++ b/drivers/net/ethernet/renesas/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Renesas device drivers.
+#
+
+obj-$(CONFIG_SH_ETH) += sh_eth.o
diff --git a/drivers/net/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
similarity index 100%
rename from drivers/net/sh_eth.c
rename to drivers/net/ethernet/renesas/sh_eth.c
diff --git a/drivers/net/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
similarity index 100%
rename from drivers/net/sh_eth.h
rename to drivers/net/ethernet/renesas/sh_eth.h
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* [RFC 72/72] drivers/net: Kconfig and Makefile cleanup
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (70 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 71/72] sh_eth: Move the Renesas SuperH driver Jeff Kirsher
@ 2011-06-25 13:59 ` Jeff Kirsher
  2011-06-26  7:54 ` [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Bill Fink
                   ` (2 subsequent siblings)
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
  To: davem; +Cc: Jeff Kirsher, netdev

After the move of the Ethernet drivers into drivers/net/ethernet/
there was some leftover cleanup to do in the Kconfig and Makefile.

Removed the 10/100, 1000, and 10GbE Kconfig menus.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/Kconfig          |  113 ------------------------------------------
 drivers/net/Makefile         |    4 --
 drivers/net/ethernet/Kconfig |    4 ++
 3 files changed, 4 insertions(+), 117 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 07e798e..71a0140 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -192,119 +192,6 @@ source "drivers/net/phy/Kconfig"
 
 source "drivers/net/ethernet/Kconfig"
 
-menuconfig NET_ETHERNET
-	bool "Ethernet (10 or 100Mbit)"
-	depends on !UML
-	---help---
-	  Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
-	  type of Local Area Network (LAN) in universities and companies.
-
-	  Common varieties of Ethernet are: 10BASE-2 or Thinnet (10 Mbps over
-	  coaxial cable, linking computers in a chain), 10BASE-T or twisted
-	  pair (10 Mbps over twisted pair cable, linking computers to central
-	  hubs), 10BASE-F (10 Mbps over optical fiber links, using hubs),
-	  100BASE-TX (100 Mbps over two twisted pair cables, using hubs),
-	  100BASE-T4 (100 Mbps over 4 standard voice-grade twisted pair
-	  cables, using hubs), 100BASE-FX (100 Mbps over optical fiber links)
-	  [the 100BASE varieties are also known as Fast Ethernet], and Gigabit
-	  Ethernet (1 Gbps over optical fiber or short copper links).
-
-	  If your Linux machine will be connected to an Ethernet and you have
-	  an Ethernet network interface card (NIC) installed in your computer,
-	  say Y here and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>. You will then also have
-	  to say Y to the driver for your particular NIC.
-
-	  Note that the answer to this question won't directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the questions about Ethernet network cards. If unsure, say N.
-
-if NET_ETHERNET
-
-config NET_PCI
-	bool "EISA, VLB, PCI and on board controllers"
-	depends on ISA || EISA || PCI
-	help
-	  This is another class of network cards which attach directly to the
-	  bus. If you have one of those, 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 this class of network cards. If you say Y, you
-	  will be asked for your specific card in the following questions. If
-	  you are unsure, say Y.
-
-config NET_POCKET
-	bool "Pocket and portable adapters"
-	depends on PARPORT
-	---help---
-	  Cute little network (Ethernet) devices which attach to the parallel
-	  port ("pocket adapters"), commonly used with laptops. If you have
-	  one of those, say Y and read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  If you want to plug a network (or some other) card into the PCMCIA
-	  (or PC-card) slot of your laptop instead (PCMCIA is the standard for
-	  credit card size extension cards used by all modern laptops), you
-	  need the pcmcia-cs package (location contained in the file
-	  <file:Documentation/Changes>) and you can say N here.
-
-	  Laptop users should read the Linux Laptop home page at
-	  <http://www.linux-on-laptops.com/> or
-	  Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/>.
-
-	  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 this class of network devices. If you say Y, you
-	  will be asked for your specific device in the following questions.
-
-endif # NET_ETHERNET
-
-#
-#	Gigabit Ethernet
-#
-
-menuconfig NETDEV_1000
-	bool "Ethernet (1000 Mbit)"
-	depends on !UML
-	default y
-	---help---
-	  Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
-	  type of Local Area Network (LAN) in universities and companies.
-
-	  Say Y here to get to see options for Gigabit Ethernet drivers.
-	  This option alone does not add any kernel code.
-	  Note that drivers supporting both 100 and 1000 MBit may be listed
-	  under "Ethernet (10 or 100MBit)" instead.
-
-	  If you say N, all options in this submenu will be skipped and disabled.
-
-if NETDEV_1000
-
-endif # NETDEV_1000
-
-#
-#	10 Gigabit Ethernet
-#
-
-menuconfig NETDEV_10000
-	bool "Ethernet (10000 Mbit)"
-	depends on !UML
-	default y
-	---help---
-	  Say Y here to get to see options for 10 Gigabit Ethernet drivers.
-	  This option alone does not add any kernel code.
-
-	  If you say N, all options in this submenu will be skipped and disabled.
-
-if NETDEV_10000
-
-config MDIO
-	tristate
-
-endif # NETDEV_10000
-
 source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b9fc5a0..88831ed 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -13,9 +13,7 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/
 # link order important here
 #
 obj-$(CONFIG_PLIP) += plip.o
-
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
-
 obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_RIONET) += rionet.o
@@ -26,7 +24,6 @@ obj-$(CONFIG_RIONET) += rionet.o
 
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
-
 obj-$(CONFIG_PPP) += ppp_generic.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
 obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
@@ -36,7 +33,6 @@ obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
 obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
 obj-$(CONFIG_PPPOL2TP) += pppox.o
 obj-$(CONFIG_PPTP) += pppox.o pptp.o
-
 obj-$(CONFIG_SLIP) += slip.o
 obj-$(CONFIG_SLHC) += slhc.o
 
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ab12ecd..2d311dc 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -159,6 +159,10 @@ config KORINA
 
 source "drivers/net/ethernet/marvell/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
+
+config MDIO
+	tristate
+
 source "drivers/net/ethernet/micrel/Kconfig"
 source "drivers/net/ethernet/mips/Kconfig"
 source "drivers/net/ethernet/motorola/Kconfig"
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 135+ messages in thread
* Re: [RFC 09/72] smc: Move the SMC drivers
  2011-06-25 13:58 ` [RFC 09/72] smc: Move the SMC drivers Jeff Kirsher
@ 2011-06-25 14:30   ` Arnd Bergmann
  0 siblings, 0 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 14:30 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Nicolas Pitre, Donald Becker, Erik Stahlman

On Saturday 25 June 2011, Jeff Kirsher wrote:
> Moves the SMC drivers into drivers/net/ethernet/smc/ and the
> necessary Kconfig and Makefile changes.  Also did some cleanup
> of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.
> 
> CC: Nicolas Pitre <nico@fluxnic.net>
> CC: Donald Becker <becker@scyld.com>
> CC: Erik Stahlman <erik@vt.edu>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ...
> drivers/net/{ => ethernet/smc}/epic100.c |    0
> drivers/net/{ => ethernet/smc}/smc9194.c |    0
> drivers/net/{ => ethernet/smc}/smc9194.h |    0
> drivers/net/{ => ethernet/smc}/smc91x.c  |    0
> drivers/net/{ => ethernet/smc}/smc91x.h  |    0

Isn't SMC (standard microsystems corporation) the company now known
as SMSC?

The comments in smc91x.c at least hint that this should be in the
same directory as the other smsc drivers.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 40/72] spider_net: Move the spider_net (IBM) driver
  2011-06-25 13:58 ` [RFC 40/72] spider_net: Move the spider_net (IBM) driver Jeff Kirsher
@ 2011-06-25 14:34   ` Arnd Bergmann
  0 siblings, 0 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 14:34 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Utz Bacher, Jens Osterkamp, Ishizaki Kou

On Saturday 25 June 2011, Jeff Kirsher wrote:
> Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/ and
> make the necessary Kconfig and Makefile changes
> 
> CC: Utz Bacher <utz.bacher@de.ibm.com>
> CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
> CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

spider_net is not an IBM product, we just wrote the driver. The
chip was made by Toshiba, and they are also maintaining the driver
now.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 18/72] ehea/ibm*: Move the IBM drivers
  2011-06-25 13:58 ` [RFC 18/72] ehea/ibm*: Move the IBM drivers Jeff Kirsher
@ 2011-06-25 14:39   ` Oliver Hartkopp
  2011-06-25 15:04     ` Arnd Bergmann
  0 siblings, 1 reply; 135+ messages in thread
From: Oliver Hartkopp @ 2011-06-25 14:39 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: davem, netdev, Christoph Raisch, Alfred Arnold, Santiago Leon,
	Benjamin Herrenschmidt

On 25.06.2011 15:58, Jeff Kirsher wrote:
> Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
> necessary Kconfig and Makefile changes.

(..)

>  drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig |    2 +-
>  .../net/{ => ethernet/ibm}/ibm_newemac/Makefile    |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c  |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h  |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h  |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c  |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h  |    0

s/ibm_newemac/newemac/

as it is already inside a directory called ibm?

>  drivers/net/{ => ethernet/ibm}/ibmlana.c           |    0
>  drivers/net/{ => ethernet/ibm}/ibmlana.h           |    0
>  drivers/net/{ => ethernet/ibm}/ibmveth.c           |    0
>  drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0

Maybe in these c/h files the 'ibm' could be removed too?

Regards,
Oliver

btw: Thanks for the cleanup. Great work!

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 11/72] cassini/niu/sun*: Move the Sun drivers
  2011-06-25 13:58 ` [RFC 11/72] cassini/niu/sun*: Move the Sun drivers Jeff Kirsher
@ 2011-06-25 14:46   ` Oliver Hartkopp
  2011-06-25 23:56     ` David Miller
  0 siblings, 1 reply; 135+ messages in thread
From: Oliver Hartkopp @ 2011-06-25 14:46 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: davem, netdev, Sam Creasey, Adrian Sun, Benjamin Herrenscmidt

On 25.06.2011 15:58, Jeff Kirsher wrote:
> Moves the Sun drivers into drivers/net/ethernet/sun/ and make
> the necessary Kconfig and Makefile changes.
> 

(..)

> ---
>  MAINTAINERS                                 |    1 +
>  drivers/net/Kconfig                         |   75 ----------------------
>  drivers/net/Makefile                        |   11 +---
>  drivers/net/ethernet/Kconfig                |    1 +
>  drivers/net/ethernet/Makefile               |    1 +
>  drivers/net/ethernet/sun/Kconfig            |   91 +++++++++++++++++++++++++++
>  drivers/net/ethernet/sun/Makefile           |   12 ++++
>  drivers/net/{ => ethernet/sun}/cassini.c    |    0
>  drivers/net/{ => ethernet/sun}/cassini.h    |    0
>  drivers/net/{ => ethernet/sun}/niu.c        |    0
>  drivers/net/{ => ethernet/sun}/niu.h        |    0
>  drivers/net/{ => ethernet/sun}/sun3_82586.c |    0
>  drivers/net/{ => ethernet/sun}/sun3_82586.h |    0

s/sun3_// in filenames?

>  drivers/net/{ => ethernet/sun}/sunbmac.c    |    0
>  drivers/net/{ => ethernet/sun}/sunbmac.h    |    0
>  drivers/net/{ => ethernet/sun}/sungem.c     |    0
>  drivers/net/{ => ethernet/sun}/sungem.h     |    0
>  drivers/net/{ => ethernet/sun}/sungem_phy.c |    0
>  drivers/net/{ => ethernet/sun}/sungem_phy.h |    0
>  drivers/net/{ => ethernet/sun}/sunhme.c     |    0
>  drivers/net/{ => ethernet/sun}/sunhme.h     |    0
>  drivers/net/{ => ethernet/sun}/sunqe.c      |    0
>  drivers/net/{ => ethernet/sun}/sunqe.h      |    0
>  drivers/net/{ => ethernet/sun}/sunvnet.c    |    0
>  drivers/net/{ => ethernet/sun}/sunvnet.h    |    0

s/sun// in filenames?

Regards,
Oliver

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 13:58 ` [RFC 26/72] arm: Move the ARM/ACORN drivers Jeff Kirsher
@ 2011-06-25 14:48   ` Arnd Bergmann
  2011-06-25 14:50     ` Arnd Bergmann
                       ` (2 more replies)
  0 siblings, 3 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 14:48 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: davem, netdev, Sriram, Vinay Hegde, Cyril Chemparathy,
	Russell King, Wan ZongShun, Lennert Buytenhek, Krzysztof Halasa,
	Anant Gole, Chaithrika U S

On Saturday 25 June 2011, Jeff Kirsher wrote:
> Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> necessary Kconfig and Makefile changes.
> There were 4 drivers (TI Davinci & ftmac100) not in the
> drivers/net/arm/ which should have been since they are only supported
> under ARM, so they were added to the new directory structure.
> 
> NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> CC'ing the last 3 major contributors from TI.

It doesn't seem logical to group drivers that are used on ARM under
the architecture when the hardware is not actually made by ARM Ltd.

The MODULE_AUTHOR fields for the davinci driver list

DaVinci EMAC Maintainer: Anant Gole <anantgole@ti.com>
DaVinci EMAC Maintainer: Chaithrika U S <chaithrika@ti.com>


>  MAINTAINERS                                    |   10 +-
>  drivers/net/Kconfig                            |   33 -------
>  drivers/net/Makefile                           |    5 -
>  drivers/net/arm/Kconfig                        |   74 ---------------
>  drivers/net/ethernet/Kconfig                   |    1 +
>  drivers/net/ethernet/Makefile                  |    1 +
>  drivers/net/ethernet/arm/Kconfig               |  120 ++++++++++++++++++++++++
>  drivers/net/{ => ethernet}/arm/Makefile        |    4 +-
>  drivers/net/{ => ethernet}/arm/am79c961a.c     |    0
>  drivers/net/{ => ethernet}/arm/am79c961a.h     |    0

I guess this should be under ethernet/amd/ since they made the chip.

>  drivers/net/{ => ethernet}/arm/at91_ether.c    |    0
>  drivers/net/{ => ethernet}/arm/at91_ether.h    |    0

I wouldn't be surprised to see this show up in an AVR32 SoC, since
Atmel produces chips with both architectures.

>  drivers/net/{ => ethernet/arm}/davinci_cpdma.c |    0
>  drivers/net/{ => ethernet/arm}/davinci_cpdma.h |    0
>  drivers/net/{ => ethernet/arm}/davinci_emac.c  |    0
>  drivers/net/{ => ethernet/arm}/davinci_mdio.c  |    0

TI also produces chips with the C6x architecture, which will be supported
in Linux in the future. It could well be that there is a version that
uses the davinci ethernet mac. You also have a TI directory.

>  drivers/net/{ => ethernet}/arm/ep93xx_eth.c    |    0

maybe group that together with cs89x0 under driver/net/ethernet/cirrus/ ?

>  drivers/net/{ => ethernet}/arm/ether1.c        |    0
>  drivers/net/{ => ethernet}/arm/ether1.h        |    0
>  drivers/net/{ => ethernet}/arm/ether3.c        |    0
>  drivers/net/{ => ethernet}/arm/ether3.h        |    0
>  drivers/net/{ => ethernet}/arm/etherh.c        |    0

probably makes sense to keep those as ARM specific.

>  drivers/net/{ => ethernet}/arm/ixp4xx_eth.c    |    0

drivers/net/ethernet/intel/ ?
maybe driver/net/ethernet/marvell

>  drivers/net/{ => ethernet}/arm/ks8695net.c     |    0
>  drivers/net/{ => ethernet}/arm/ks8695net.h     |    0
>  drivers/net/{ => ethernet}/arm/w90p910_ether.c |    0

not sure about these.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers
  2011-06-25 13:58 ` [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers Jeff Kirsher
@ 2011-06-25 14:49   ` Arnd Bergmann
  2011-06-25 16:26     ` Stephen Hemminger
  0 siblings, 1 reply; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 14:49 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Stephen Hemminger

On Saturday 25 June 2011, Jeff Kirsher wrote:
> Move the SysKonnect Ethernet drivers into drivers/net/ethernet/syskonnect/
> and make the necessary Kconfig and Makefile changes.
> 
> CC: Stephen Hemminger <shemminger@linux-foundation.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                                  |    3 +-
>  drivers/net/Kconfig                          |   58 --------------------
>  drivers/net/Makefile                         |    2 -
>  drivers/net/ethernet/Kconfig                 |    1 +
>  drivers/net/ethernet/Makefile                |    1 +
>  drivers/net/ethernet/syskonnect/Kconfig      |   74 ++++++++++++++++++++++++++
>  drivers/net/ethernet/syskonnect/Makefile     |    6 ++
>  drivers/net/{ => ethernet/syskonnect}/skge.c |    0
>  drivers/net/{ => ethernet/syskonnect}/skge.h |    0
>  drivers/net/{ => ethernet/syskonnect}/sky2.c |    0
>  drivers/net/{ => ethernet/syskonnect}/sky2.h |    0

Shouldn't these live together with the other Marvell drivers?

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 14:48   ` Arnd Bergmann
@ 2011-06-25 14:50     ` Arnd Bergmann
  2011-06-25 15:53     ` Russell King - ARM Linux
  2011-06-27  3:10     ` Gole, Anant
  2 siblings, 0 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 14:50 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: davem, netdev, Sriram, Vinay Hegde, Cyril Chemparathy,
	Russell King, Wan ZongShun, Lennert Buytenhek, Krzysztof Halasa,
	Anant Gole, Chaithrika U S

On Saturday 25 June 2011, Arnd Bergmann wrote:
> >  drivers/net/{ => ethernet}/arm/ks8695net.c     |    0
> >  drivers/net/{ => ethernet}/arm/ks8695net.h     |    0
> >  drivers/net/{ => ethernet}/arm/w90p910_ether.c |    0
> 
> not sure about these.

Actually, you do have a directory for Micrel, so you you put
ks8695net.c together with ks88*.c.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers
  2011-06-25 13:59 ` [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers Jeff Kirsher
@ 2011-06-25 14:54   ` Arnd Bergmann
  2011-06-25 16:25   ` Geoff Levand
  1 sibling, 0 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 14:54 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Geoff Levand

On Saturday 25 June 2011, Jeff Kirsher wrote:
> 
> Move the Sony drivers into drivers/net/ethernet/sony/ and
> make the necessary Kconfig and Makefile changes.
> 
> TODO: separate the wired and wireless drivers and relocate the wireless
> dirver into drivers/net/wireless/
> 
> CC: Geoff Levand <geoff@infradead.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

This one is the same hardware as spider_net, just with the PS3 hypervisor
layer inbetween. I'd suggest moving that to a Toshiba directory as well.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 55/72] bfin_mac: Move the Blackfin driver
  2011-06-25 13:59 ` [RFC 55/72] bfin_mac: Move the Blackfin driver Jeff Kirsher
@ 2011-06-25 14:57   ` Arnd Bergmann
  2011-06-27 18:41   ` Hennerich, Michael
  1 sibling, 0 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 14:57 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Michael Hennerich

On Saturday 25 June 2011, Jeff Kirsher wrote:
> 
> Move the Blackfin driver into drivers/net/ethernet/blackfin/ and
> make the necessary Kconfig and Makefile changes.
> 
> CC: Michael Hennerich <michael.hennerich@analog.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                                    |    2 +-
>  drivers/net/Kconfig                            |   46 -----------------
>  drivers/net/Makefile                           |    1 -
>  drivers/net/ethernet/Kconfig                   |    1 +
>  drivers/net/ethernet/Makefile                  |    1 +
>  drivers/net/ethernet/blackfin/Kconfig          |   65 ++++++++++++++++++++++++
>  drivers/net/ethernet/blackfin/Makefile         |    5 ++
>  drivers/net/{ => ethernet/blackfin}/bfin_mac.c |    0
>  drivers/net/{ => ethernet/blackfin}/bfin_mac.h |    0

Since you are sorting by company, I'd suggest making the directory
analog, not blackfin, which is just the CPU architecture.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 18/72] ehea/ibm*: Move the IBM drivers
  2011-06-25 14:39   ` Oliver Hartkopp
@ 2011-06-25 15:04     ` Arnd Bergmann
  2011-06-26  0:37       ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 15:04 UTC (permalink / raw)
  To: Oliver Hartkopp
  Cc: Jeff Kirsher, davem, netdev, Christoph Raisch, Alfred Arnold,
	Santiago Leon, Benjamin Herrenschmidt

On Saturday 25 June 2011, Oliver Hartkopp wrote:
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig |    2 +-
> >  .../net/{ => ethernet/ibm}/ibm_newemac/Makefile    |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c  |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h  |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h  |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c   |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h   |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c   |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h   |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c   |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h   |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c  |    0
> >  drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h  |    0
> 
> s/ibm_newemac/newemac/
> 
> as it is already inside a directory called ibm?
> 

You can probably rename to just emac now, since the "old" emac driver
has been gone for some time.

The "new" part of the name does not refer to the hardware, just to
the driver.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 14:48   ` Arnd Bergmann
  2011-06-25 14:50     ` Arnd Bergmann
@ 2011-06-25 15:53     ` Russell King - ARM Linux
  2011-06-25 16:03       ` Arnd Bergmann
  2011-06-27  3:10     ` Gole, Anant
  2 siblings, 1 reply; 135+ messages in thread
From: Russell King - ARM Linux @ 2011-06-25 15:53 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Jeff Kirsher, davem, netdev, Sriram, Vinay Hegde,
	Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Anant Gole, Chaithrika U S

On Sat, Jun 25, 2011 at 04:48:03PM +0200, Arnd Bergmann wrote:
> On Saturday 25 June 2011, Jeff Kirsher wrote:
> > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> > necessary Kconfig and Makefile changes.
> > There were 4 drivers (TI Davinci & ftmac100) not in the
> > drivers/net/arm/ which should have been since they are only supported
> > under ARM, so they were added to the new directory structure.
> > 
> > NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> > CC'ing the last 3 major contributors from TI.
> 
> It doesn't seem logical to group drivers that are used on ARM under
> the architecture when the hardware is not actually made by ARM Ltd.

ARM doesn't make any silicon hardware itself, so by that argument it
shouldn't be in a directory called 'arm' at all.

However, what the 'arm' in drivers/net/arm is referring to is that
the drivers are solely used with stuff associated with arch/arm, not
that there's any connection with ARM Ltd.

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 15:53     ` Russell King - ARM Linux
@ 2011-06-25 16:03       ` Arnd Bergmann
  2011-06-25 16:12         ` Russell King - ARM Linux
  0 siblings, 1 reply; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 16:03 UTC (permalink / raw)
  To: Russell King - ARM Linux
  Cc: Jeff Kirsher, davem, netdev, Sriram, Vinay Hegde,
	Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Anant Gole, Chaithrika U S

On Saturday 25 June 2011, Russell King - ARM Linux wrote:
> On Sat, Jun 25, 2011 at 04:48:03PM +0200, Arnd Bergmann wrote:
> > On Saturday 25 June 2011, Jeff Kirsher wrote:
> > > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> > > necessary Kconfig and Makefile changes.
> > > There were 4 drivers (TI Davinci & ftmac100) not in the
> > > drivers/net/arm/ which should have been since they are only supported
> > > under ARM, so they were added to the new directory structure.
> > > 
> > > NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> > > CC'ing the last 3 major contributors from TI.
> > 
> > It doesn't seem logical to group drivers that are used on ARM under
> > the architecture when the hardware is not actually made by ARM Ltd.
> 
> ARM doesn't make any silicon hardware itself, so by that argument it
> shouldn't be in a directory called 'arm' at all.
> 
> However, what the 'arm' in drivers/net/arm is referring to is that
> the drivers are solely used with stuff associated with arch/arm, not
> that there's any connection with ARM Ltd.

Yes, I understand that about the current state, but Jeff's series
of patches moves all network drivers around to directories based on
manufacturer, so it's going to be less logical after all the other
drivers are moved, especially when he already creates drivers
for AMD, TI, atmel, cirrus and micrel.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers
  2011-06-25 13:58 ` [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers Jeff Kirsher
@ 2011-06-25 16:11   ` David Dillow
  2011-06-28  8:22   ` Alan Cox
  1 sibling, 0 replies; 135+ messages in thread
From: David Dillow @ 2011-06-25 16:11 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

On Sat, 2011-06-25 at 06:58 -0700, Jeff Kirsher wrote:
> Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
> Kconfig and Makefile changes.

> CC: David Dillow <dave@thedillows.org>

>  drivers/net/{ => ethernet/3com}/typhoon.c        |    0
>  drivers/net/{ => ethernet/3com}/typhoon.h        |    0

For what it's worth:

Acked-by: David Dillow <dave@thedillows.org>


^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 16:03       ` Arnd Bergmann
@ 2011-06-25 16:12         ` Russell King - ARM Linux
  2011-06-25 16:59           ` Arnd Bergmann
  0 siblings, 1 reply; 135+ messages in thread
From: Russell King - ARM Linux @ 2011-06-25 16:12 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Jeff Kirsher, davem, netdev, Sriram, Vinay Hegde,
	Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Anant Gole, Chaithrika U S

On Sat, Jun 25, 2011 at 06:03:53PM +0200, Arnd Bergmann wrote:
> On Saturday 25 June 2011, Russell King - ARM Linux wrote:
> > On Sat, Jun 25, 2011 at 04:48:03PM +0200, Arnd Bergmann wrote:
> > > On Saturday 25 June 2011, Jeff Kirsher wrote:
> > > > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> > > > necessary Kconfig and Makefile changes.
> > > > There were 4 drivers (TI Davinci & ftmac100) not in the
> > > > drivers/net/arm/ which should have been since they are only supported
> > > > under ARM, so they were added to the new directory structure.
> > > > 
> > > > NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> > > > CC'ing the last 3 major contributors from TI.
> > > 
> > > It doesn't seem logical to group drivers that are used on ARM under
> > > the architecture when the hardware is not actually made by ARM Ltd.
> > 
> > ARM doesn't make any silicon hardware itself, so by that argument it
> > shouldn't be in a directory called 'arm' at all.
> > 
> > However, what the 'arm' in drivers/net/arm is referring to is that
> > the drivers are solely used with stuff associated with arch/arm, not
> > that there's any connection with ARM Ltd.
> 
> Yes, I understand that about the current state, but Jeff's series
> of patches moves all network drivers around to directories based on
> manufacturer, so it's going to be less logical after all the other
> drivers are moved, especially when he already creates drivers
> for AMD, TI, atmel, cirrus and micrel.

How do you deal with NE2K or 8390 stuff, where you have a design which
has been cloned by many different manufacturers?  Who's do you decide
to put it in?

More interestingly, if you have one of the 8390 clones, which directory
do you look in?  And shouldn't etherh.c live along side 8390's files
as etherh is 8390-derived?

ether1 is 82586, so presumably that should be Intel subdirectory.

ether3 is SEEQ8005, so that should be in the SEEQ subdirectory.

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 54/72] au1000_eth/mipsnet/tc35815: Move the MIPS drivers
  2011-06-25 13:59 ` [RFC 54/72] au1000_eth/mipsnet/tc35815: Move the MIPS drivers Jeff Kirsher
@ 2011-06-25 16:13   ` Ralf Baechle
  2011-06-25 18:11     ` Jeff Kirsher
  0 siblings, 1 reply; 135+ messages in thread
From: Ralf Baechle @ 2011-06-25 16:13 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: davem, netdev, Matt Porter, Herbert Valerio Riedel,
	MontaVista Software, Kyle McMartin, Helge Deller,
	James E.J. Bottomley, linux-parisc, Sam Creasey,
	Geert Uytterhoeven, linux-m68k

On Sat, Jun 25, 2011 at 06:59:05AM -0700, Jeff Kirsher wrote:

> Move the MIPS drivers into drivers/net/ethernet/mips/ and
> make the necessary Kconfig and Makefile changes.

NAck.

sni_82596.c is a driver for the same chip but used in particular Siemens-
Nixdorf systems.  Lasi_82596 is an Intel NIC being used in PARISC systems.
Not a good reason th throw PA-RISC drivers into the same directory after
all PA-RISC has no relation to MIPS at all.  So maybe they should go into
drivers/net/ethernet/i82596 or drivers/net/ethernet/intel.  And wherever
they go, both drivers #include lib82596.c which your patch did not move
around.

It seems that lp486e should probably go into the same directory and I
suspect ni52 and sun3_82586 are close enough that they should also in
the faint hope that somebody will factor out the common code.

MIPSnet is a driver for the emulated network card of MIPSsim, a software
simulator by MIPS Technologies and the only net thingy in your patch that
truely is "MIPS".

The remaining happen to be used by particular systems that happen to be
based on a MIPS processor but there is no technial communality.  MIPS is
a processor architecture - not a system architecture and grouping things
by processor architecture hasn't worked so well imho for other things in
the past, see for example sound.

If we're already moving things around maybe au1000_net.[ch] can be renamed
to alchemy.[ch].

Your patch moves the Makefile and Kconfig bits of lantiq_etop but doesn't
move the actual lantiq_etop.c driver.

> +++ b/drivers/net/ethernet/mips/Kconfig
> @@ -0,0 +1,61 @@
> +#
> +# MIPS device configuration
> +#
> +
> +config NET_MIPS
> +	bool "MIPS/PS-RISC devices"

It's speeled PA-RISC.

  Ralf

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers
  2011-06-25 13:59 ` [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers Jeff Kirsher
  2011-06-25 14:54   ` Arnd Bergmann
@ 2011-06-25 16:25   ` Geoff Levand
  1 sibling, 0 replies; 135+ messages in thread
From: Geoff Levand @ 2011-06-25 16:25 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

Hi Jeff,

On 06/25/2011 06:59 AM, Jeff Kirsher wrote:
> Move the Sony drivers into drivers/net/ethernet/sony/ and
> make the necessary Kconfig and Makefile changes.

This looks OK, but as Arnd mentioned, it makes sense to put these
with the toshiba spider_net drivers.

> TODO: separate the wired and wireless drivers and relocate the wireless
> dirver into drivers/net/wireless/

I'm not sure if it makes sense to split this into separate drivers.

The PS3 doesn't have separate wireless and Ethernet devices.  The wireless
hardware is hooked up to the gelic Ethernet controller, and VLAN tags are
used to route the packets.  The wireless support is more or less
an extension of the base gelic device. 

A little more info on it is here:

  http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3-linux-docs/ps3-linux-docs-latest/LinuxKernelOverview.html

Let me know what you think.

-Geoff

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers
  2011-06-25 14:49   ` Arnd Bergmann
@ 2011-06-25 16:26     ` Stephen Hemminger
  0 siblings, 0 replies; 135+ messages in thread
From: Stephen Hemminger @ 2011-06-25 16:26 UTC (permalink / raw)
  To: Arnd Bergmann; +Cc: Jeff Kirsher, davem, netdev

On Sat, 25 Jun 2011 16:49:13 +0200
Arnd Bergmann <arnd@arndb.de> wrote:

> On Saturday 25 June 2011, Jeff Kirsher wrote:
> > Move the SysKonnect Ethernet drivers into drivers/net/ethernet/syskonnect/
> > and make the necessary Kconfig and Makefile changes.
> > 
> > CC: Stephen Hemminger <shemminger@linux-foundation.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > ---
> >  MAINTAINERS                                  |    3 +-
> >  drivers/net/Kconfig                          |   58 --------------------
> >  drivers/net/Makefile                         |    2 -
> >  drivers/net/ethernet/Kconfig                 |    1 +
> >  drivers/net/ethernet/Makefile                |    1 +
> >  drivers/net/ethernet/syskonnect/Kconfig      |   74 ++++++++++++++++++++++++++
> >  drivers/net/ethernet/syskonnect/Makefile     |    6 ++
> >  drivers/net/{ => ethernet/syskonnect}/skge.c |    0
> >  drivers/net/{ => ethernet/syskonnect}/skge.h |    0
> >  drivers/net/{ => ethernet/syskonnect}/sky2.c |    0
> >  drivers/net/{ => ethernet/syskonnect}/sky2.h |    0
> 
> Shouldn't these live together with the other Marvell drivers?

yes put them under Marvell.

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 42/72] 82586.c/fec*: Move the Motorola drivers
  2011-06-25 13:58 ` [RFC 42/72] 82586.c/fec*: Move the Motorola drivers Jeff Kirsher
@ 2011-06-25 16:53   ` Arnd Bergmann
  0 siblings, 0 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 16:53 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Dan Malek, Sylvain Munaut, Richard Hirst

On Saturday 25 June 2011, Jeff Kirsher wrote:
> Move the Motorola drivers into drivers/net/ethernet/motorola/ and
> make the necessary Kconfig and Makefile changes
> 
> CC: Dan Malek <dmalek@jlc.net>
> CC: Sylvain Munaut <tnt@246tNt.com>
> CC: Richard Hirst <richard@sleepie.demon.co.uk>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  drivers/net/Kconfig                                |   69 ---------------
>  drivers/net/Makefile                               |    9 --
>  drivers/net/ethernet/Kconfig                       |    1 +
>  drivers/net/ethernet/Makefile                      |    1 +
>  drivers/net/{ => ethernet/motorola}/82596.c        |    0
>  drivers/net/ethernet/motorola/Kconfig              |   88 ++++++++++++++++++++
>  drivers/net/ethernet/motorola/Makefile             |   13 +++
>  drivers/net/{ => ethernet/motorola}/fec.c          |    0
>  drivers/net/{ => ethernet/motorola}/fec.h          |    0
>  drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c  |    0
>  drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h  |    0
>  .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c  |    0
>  12 files changed, 103 insertions(+), 78 deletions(-)

The part of Motorola that made these originally is now known as
Freescale, so put these together with the other freescale parts.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 16:12         ` Russell King - ARM Linux
@ 2011-06-25 16:59           ` Arnd Bergmann
  2011-06-25 18:02             ` Jeff Kirsher
  2011-06-25 18:06             ` Jeff Kirsher
  0 siblings, 2 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 16:59 UTC (permalink / raw)
  To: Russell King - ARM Linux
  Cc: Jeff Kirsher, davem, netdev, Sriram, Vinay Hegde,
	Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Anant Gole, Chaithrika U S

On Saturday 25 June 2011, Russell King - ARM Linux wrote:
> 
> How do you deal with NE2K or 8390 stuff, where you have a design which
> has been cloned by many different manufacturers?  Who's do you decide
> to put it in?
> 
> More interestingly, if you have one of the 8390 clones, which directory
> do you look in?  And shouldn't etherh.c live along side 8390's files
> as etherh is 8390-derived?

Jeff created a drivers/net/ethernet/8390/ directory for all of those,
which sounds sensible to me, but apparently he missed some of the
nonobvious ones.

> ether1 is 82586, so presumably that should be Intel subdirectory.

Yes, according to the new layout, it should at least live together
with the other 82586-based drivers (eexpress.c, ni52.c, sun3_82586.c),
which could be either a directory for all of these, or the
generic intel directory.

> ether3 is SEEQ8005, so that should be in the SEEQ subdirectory.

Same here, it can be grouped together with sqiseeq.c (SEEQ8003)
and seeq8005.c.

I don't really care about these old ones too much though. Nobody
will spend the effort to clean up and merge these ancient drivers
any more, and it's also very unlikely that we want to add support
for new boards with these. For the soc vendor specific ones,
I think we should decide on the new location based on how easy it
is to spot duplicates, e.g. to avoid adding an AVR32 copy of the
at91 ethernet driver.

For reference (since you probably didn't see the full 72 patch
series on netdev), some of the related driver moves suggested
by Jeff are:

drivers/net/{ => ethernet/8390}/*8390*.c           |    0
drivers/net/{ => ethernet/amd}/*lance.c            |    0
drivers/net/{ => ethernet/atmel}/macb.c            |    0
drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
drivers/net/{ => ethernet/ti}/cpmac.c              |    0
drivers/net/{ => ethernet/ti}/tlan.c               |    0
drivers/net/{ => ethernet/isa}/eexpress.c          |    0
drivers/net/{ => ethernet/sun}/sun3_82586.c        |    0
drivers/net/{ => ethernet/isa}/seeq8005.c          |    0
drivers/net/{ => ethernet/sgi}/sgiseeq.c           |    0

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* RE: [RFC 24/72] *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
  2011-06-25 13:58 ` [RFC 24/72] *sonic/natsemi/ns83829: Move the National Semi-conductor drivers Jeff Kirsher
@ 2011-06-25 17:21   ` Marc Gauthier
  0 siblings, 0 replies; 135+ messages in thread
From: Marc Gauthier @ 2011-06-25 17:21 UTC (permalink / raw)
  To: Jeff Kirsher, davem
  Cc: netdev, Thomas Bogendoerfer, Harald Welte, Tim Hockin,
	linux-ns83820, Kevin Chea, Marc Gauthier, Chris Zankel

Jeff Kirsher wrote:
> Move the National Semi-conductor drivers into
> drivers/net/ethernet/natsemi/
> and make the necessary Kconfig and Makefile changes.  Also
> moved the 8390
> (National Semi-conductor) devices as a sub-menu of National
> Semi-conductor devices.
>
> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> CC: Harald Welte <laforge@gnumonks.org>
> CC: Tim Hockin <thockin@hockin.org>
> CC: <linux-ns83820@kvack.org>
> CC: Kevin Chea <kchea@yahoo.com>
> CC: Marc Gauthier <marc@linux-xtensa.org>
> CC: Chris Zankel <chris@zankel.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> ---

Acked-by: Marc Gauthier <marc@tensilica.com>

-Marc



>  MAINTAINERS                                    |    4 +-
>  drivers/net/Kconfig                            |   47
>  ------------------ drivers/net/Makefile                           |
>  6 -- drivers/net/ethernet/8390/Kconfig              |    7 ++-
>  drivers/net/ethernet/Kconfig                   |    3 +-
>  drivers/net/ethernet/Makefile                  |    1 +
>  drivers/net/ethernet/natsemi/Kconfig           |   63
>  ++++++++++++++++++++++++ drivers/net/ethernet/natsemi/Makefile
>  |    9 +++ drivers/net/{ => ethernet/natsemi}/jazzsonic.c |    0
>  drivers/net/{ => ethernet/natsemi}/macsonic.c  |    0
>  drivers/net/{ => ethernet/natsemi}/natsemi.c   |    0
>  drivers/net/{ => ethernet/natsemi}/ns83820.c   |    0
>  drivers/net/{ => ethernet/natsemi}/sonic.c     |    0
>  drivers/net/{ => ethernet/natsemi}/sonic.h     |    0
>  drivers/net/{ => ethernet/natsemi}/xtsonic.c   |    0
>  15 files changed, 81 insertions(+), 59 deletions(-)
>  create mode 100644 drivers/net/ethernet/natsemi/Kconfig
>  create mode 100644 drivers/net/ethernet/natsemi/Makefile
>  rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/macsonic.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/natsemi.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/ns83820.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
>  rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 6f822c6..76e60e4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4281,7 +4281,7 @@ F:      drivers/net/ethernet/myricom/myri10ge/
>  NATSEMI ETHERNET DRIVER (DP8381x)
>  M:   Tim Hockin <thockin@hockin.org>
>  S:   Maintained
> -F:   drivers/net/natsemi.c
> +F:   drivers/net/ethernet/natsemi/natsemi.c
>
>  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
>  M:   Daniel Mack <zonque@gmail.com>
> @@ -5852,7 +5852,7 @@ SONIC NETWORK DRIVER
>  M:   Thomas Bogendoerfer <tsbogend@alpha.franken.de>
>  L:   netdev@vger.kernel.org S:       Maintained
> -F:   drivers/net/sonic.*
> +F:   drivers/net/ethernet/natsemi/sonic.*
>
>  SONICS SILICON BACKPLANE DRIVER (SSB)
>  M:   Michael Buesch <mb@bu3sch.de>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 56c963a..305b8b9 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -258,19 +258,6 @@ config A2065
>         To compile this driver as a module, choose M here: the module
> will be called a2065.
>
> -config MACSONIC
> -     tristate "Macintosh SONIC based ethernet (onboard,
> NuBus, LC, CS)"
> -     depends on MAC
> -     ---help---
> -       Support for NatSemi SONIC based Ethernet devices.
> This includes
> -       the onboard Ethernet in many Quadras as well as some LC-PDS,
> -       a few Nubus and all known Comm Slot Ethernet cards.
> If you have
> -       one of these say Y and read the Ethernet-HOWTO, available from
> -       <http://www.tldp.org/docs.html#howto>.
> -
> -       To compile this driver as a module, choose M here.
> This module will
> -       be called macsonic.
> -
>  config MVME16x_NET
>       tristate "MVME16x Ethernet support"
>       depends on MVME16x
> @@ -310,19 +297,6 @@ config KORINA
>         If you have a Mikrotik RouterBoard 500 or IDT RC32434
>         based system say Y. Otherwise say N.
>
> -config MIPS_JAZZ_SONIC
> -     tristate "MIPS JAZZ onboard SONIC Ethernet support"
> -     depends on MACH_JAZZ
> -     help
> -       This is the driver for the onboard card of MIPS Magnum 4000,
> -       Acer PICA, Olivetti M700-10 and a few other identical
> OEM systems.
> -
> -config XTENSA_XT2000_SONIC
> -     tristate "Xtensa XT2000 onboard SONIC Ethernet support"
> -     depends on XTENSA_PLATFORM_XT2000
> -     help
> -       This is the driver for the onboard card of the Xtensa
> XT2000 board.
> -
>  config MIPS_AU1X00_ENET
>       tristate "MIPS AU1000 Ethernet support"
>       depends on MIPS_ALCHEMY
> @@ -789,17 +763,6 @@ config FEALNX
>         Say Y here to support the Myson MTD-800 family of
> PCI-based Ethernet
>         cards. <http://www.myson.com.tw/>
>
> -config NATSEMI
> -     tristate "National Semiconductor DP8381x series PCI
> Ethernet support"
> -     depends on NET_PCI && PCI
> -     select CRC32
> -     help
> -       This driver is for the National Semiconductor DP83810 series,
> -       which is used in cards from PureData, NetGear, Linksys
> -       and others, including the 83815 chip.
> -       More specific information and updates are available from
> -       <http://www.scyld.com/network/natsemi.html>.
> -
>  config 8139CP
>       tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter
> support (EXPERIMENTAL)"
>       depends on NET_PCI && PCI && EXPERIMENTAL
> @@ -1220,16 +1183,6 @@ config IP1000
>
>  source "drivers/net/ixp2000/Kconfig"
>
> -config NS83820
> -     tristate "National Semiconductor DP83820 support"
> -     depends on PCI
> -     help
> -       This is a driver for the National Semiconductor DP83820 series
> -       of gigabit ethernet MACs.  Cards using this chipset include
> -       the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,
> -       SOHO-GA2000T, SOHO-GA2500T.  The driver supports the use of
> -       zero copy.
> -
>  config HAMACHI
>       tristate "Packet Engines Hamachi GNIC-II support"       depends on PCI
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 9ac99cd..04d7613 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -45,8 +45,6 @@ obj-$(CONFIG_SIS900) += sis900.o
>  obj-$(CONFIG_R6040) += r6040.o
>  obj-$(CONFIG_YELLOWFIN) += yellowfin.o
>  obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
> -obj-$(CONFIG_NATSEMI) += natsemi.o
> -obj-$(CONFIG_NS83820) += ns83820.o
>  obj-$(CONFIG_FEALNX) += fealnx.o
>  spidernet-y += spider_net.o spider_net_ethtool.o
>  obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
> @@ -141,13 +139,11 @@ obj-$(CONFIG_LP486E) += lp486e.o
>  obj-$(CONFIG_ETH16I) += eth16i.o
>  obj-$(CONFIG_EQUALIZER) += eql.o
>  obj-$(CONFIG_KORINA) += korina.o
> -obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
>  obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
>  obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
>  obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
>  obj-$(CONFIG_A2065) += a2065.o
>  obj-$(CONFIG_ARIADNE) += ariadne.o
> -obj-$(CONFIG_MACSONIC) += macsonic.o
>  obj-$(CONFIG_TUN) += tun.o
>  obj-$(CONFIG_VETH) += veth.o
>  obj-$(CONFIG_NET_NETX) += netx-eth.o
> @@ -163,8 +159,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
>  obj-$(CONFIG_GRETH) += greth.o
>  obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
>
> -obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
> -
>  obj-$(CONFIG_DNET) += dnet.o
>  obj-$(CONFIG_MACB) += macb.o
>  obj-$(CONFIG_S6GMAC) += s6gmac.o
> diff --git a/drivers/net/ethernet/8390/Kconfig
> b/drivers/net/ethernet/8390/Kconfig
> index db03f52..0d82137 100644
> --- a/drivers/net/ethernet/8390/Kconfig
> +++ b/drivers/net/ethernet/8390/Kconfig
> @@ -4,9 +4,10 @@
>
>  config NET_VENDOR_8390
>       bool "National Semi-conductor 8390 devices"
> -     depends on AMIGA_PCMCIA || PCI || SUPERH || ISA || MCA
>>> EISA ||  \
> -                MAC || M32R || MACH_TX49XX || MCA_LEGACY ||
> H8300 ||  \
> -                ARM || MIPS || ZORRO || PCMCIA || EXPERIMENTAL
> +     depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI
>>> SUPERH || \
> +                ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
> +                MCA_LEGACY || H8300 || ARM || MIPS || ZORRO
>>> PCMCIA || \
> +                EXPERIMENTAL)
>       ---help---
>         If you have a network (Ethernet) card belonging to
> this class, say Y
>         and read the Ethernet-HOWTO, available from
> diff --git a/drivers/net/ethernet/Kconfig
> b/drivers/net/ethernet/Kconfig
> index 28b473b..704e664 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -12,7 +12,6 @@ menuconfig ETHERNET
>  if ETHERNET
>
>  source "drivers/net/ethernet/3com/Kconfig"
> -source "drivers/net/ethernet/8390/Kconfig"
>  source "drivers/net/ethernet/amd/Kconfig"
>  source "drivers/net/ethernet/apple/Kconfig"
>  source "drivers/net/ethernet/broadcom/Kconfig"
> @@ -25,6 +24,8 @@ source "drivers/net/ethernet/ibm/Kconfig"
>  source "drivers/net/ethernet/intel/Kconfig"
>  source "drivers/net/ethernet/mellanox/Kconfig"
>  source "drivers/net/ethernet/myricom/Kconfig"
> +source "drivers/net/ethernet/natsemi/Kconfig"
> +source "drivers/net/ethernet/8390/Kconfig"
>
>  config PASEMI_MAC
>       tristate "PA Semi 1/10Gbit MAC"
> diff --git a/drivers/net/ethernet/Makefile
> b/drivers/net/ethernet/Makefile
> index 40dded7..e5c02d9 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
>  obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
>  obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
>  obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
> +obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
>  obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
>  obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
>  obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
> diff --git a/drivers/net/ethernet/natsemi/Kconfig
> b/drivers/net/ethernet/natsemi/Kconfig
> new file mode 100644
> index 0000000..dc1852b
> --- /dev/null
> +++ b/drivers/net/ethernet/natsemi/Kconfig
> @@ -0,0 +1,63 @@
> +#
> +# National Semi-conductor device configuration
> +#
> +
> +config NET_VENDOR_NATSEMI
> +     bool "National Semi-conductor devices"
> +     depends on MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000
> +     ---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 National Semi-conductor devices.
> If you say Y,
> +       you will be asked for your specific card in the
> following questions.
> +
> +config MACSONIC
> +     tristate "Macintosh SONIC based ethernet (onboard,
> NuBus, LC, CS)"
> +     depends on NET_VENDOR_NATSEMI && MAC
> +     ---help---
> +       Support for NatSemi SONIC based Ethernet devices.
> This includes
> +       the onboard Ethernet in many Quadras as well as some LC-PDS,
> +       a few Nubus and all known Comm Slot Ethernet cards.
> If you have
> +       one of these say Y and read the Ethernet-HOWTO, available from
> +       <http://www.tldp.org/docs.html#howto>.
> +
> +       To compile this driver as a module, choose M here.
> This module will
> +       be called macsonic.
> +
> +config MIPS_JAZZ_SONIC
> +     tristate "MIPS JAZZ onboard SONIC Ethernet support"
> +     depends on NET_VENDOR_NATSEMI && MACH_JAZZ
> +     ---help---
> +       This is the driver for the onboard card of MIPS Magnum 4000,
> +       Acer PICA, Olivetti M700-10 and a few other identical
> OEM systems.
> +
> +config NATSEMI
> +     tristate "National Semiconductor DP8381x series PCI
> Ethernet support"
> +     depends on NET_VENDOR_NATSEMI && PCI
> +     select CRC32
> +     ---help---
> +       This driver is for the National Semiconductor DP83810 series,
> +       which is used in cards from PureData, NetGear, Linksys
> +       and others, including the 83815 chip.
> +       More specific information and updates are available from
> +       <http://www.scyld.com/network/natsemi.html>.
> +
> +config NS83820
> +     tristate "National Semiconductor DP83820 support"
> +     depends on NET_VENDOR_NATSEMI && PCI
> +     ---help---
> +       This is a driver for the National Semiconductor DP83820 series
> +       of gigabit ethernet MACs.  Cards using this chipset include
> +       the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,
> +       SOHO-GA2000T, SOHO-GA2500T.  The driver supports the use of +
> zero copy. +
> +config XTENSA_XT2000_SONIC
> +     tristate "Xtensa XT2000 onboard SONIC Ethernet support"
> +     depends on NET_VENDOR_NATSEMI && XTENSA_PLATFORM_XT2000 +       ---help---
> +       This is the driver for the onboard card of the Xtensa
> XT2000 board.
> diff --git a/drivers/net/ethernet/natsemi/Makefile
> b/drivers/net/ethernet/natsemi/Makefile
> new file mode 100644
> index 0000000..764c532
> --- /dev/null
> +++ b/drivers/net/ethernet/natsemi/Makefile
> @@ -0,0 +1,9 @@
> +#
> +# Makefile for the National Semi-conductor Sonic devices. +#
> +
> +obj-$(CONFIG_MACSONIC) += macsonic.o
> +obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
> +obj-$(CONFIG_NATSEMI) += natsemi.o
> +obj-$(CONFIG_NS83820) += ns83820.o
> +obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
> diff --git a/drivers/net/jazzsonic.c
> b/drivers/net/ethernet/natsemi/jazzsonic.c
> similarity index 100%
> rename from drivers/net/jazzsonic.c
> rename to drivers/net/ethernet/natsemi/jazzsonic.c
> diff --git a/drivers/net/macsonic.c
> b/drivers/net/ethernet/natsemi/macsonic.c
> similarity index 100%
> rename from drivers/net/macsonic.c
> rename to drivers/net/ethernet/natsemi/macsonic.c
> diff --git a/drivers/net/natsemi.c
> b/drivers/net/ethernet/natsemi/natsemi.c
> similarity index 100%
> rename from drivers/net/natsemi.c
> rename to drivers/net/ethernet/natsemi/natsemi.c
> diff --git a/drivers/net/ns83820.c
> b/drivers/net/ethernet/natsemi/ns83820.c
> similarity index 100%
> rename from drivers/net/ns83820.c
> rename to drivers/net/ethernet/natsemi/ns83820.c
> diff --git a/drivers/net/sonic.c
> b/drivers/net/ethernet/natsemi/sonic.c
> similarity index 100%
> rename from drivers/net/sonic.c
> rename to drivers/net/ethernet/natsemi/sonic.c
> diff --git a/drivers/net/sonic.h
> b/drivers/net/ethernet/natsemi/sonic.h
> similarity index 100%
> rename from drivers/net/sonic.h
> rename to drivers/net/ethernet/natsemi/sonic.h
> diff --git a/drivers/net/xtsonic.c
> b/drivers/net/ethernet/natsemi/xtsonic.c
> similarity index 100%
> rename from drivers/net/xtsonic.c
> rename to drivers/net/ethernet/natsemi/xtsonic.c

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 16:59           ` Arnd Bergmann
@ 2011-06-25 18:02             ` Jeff Kirsher
  2011-06-25 18:06             ` Jeff Kirsher
  1 sibling, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 18:02 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Russell King - ARM Linux, davem, netdev, Sriram, Vinay Hegde,
	Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Anant Gole, Chaithrika U S

[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]

On Sat, 2011-06-25 at 09:59 -0700, Arnd Bergmann wrote:
> 
> > ether1 is 82586, so presumably that should be Intel subdirectory.
> 
> Yes, according to the new layout, it should at least live together
> with the other 82586-based drivers (eexpress.c, ni52.c, sun3_82586.c),
> which could be either a directory for all of these, or the
> generic intel directory. 

My personal preference is that these drivers that were not created by
Intel or maintained by Intel, not be in the Intel sub-directory.

While many of the drivers were organized in a layout that matches
drivers/net/ethernet/<company>, I tried to organize the drivers in the
most logical way possible (i.e. 8390/ all the drivers that used the 8390
shared files).

I do like all the suggestions made, except for the suggestion to move
eexpress.c, eepro.c, sun3_82596.c, etc. in to the intel sub-directory.
I am open to suggestions on a way to better to organize these drivers
that use an Intel part but were created and maintained by someone else.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 16:59           ` Arnd Bergmann
  2011-06-25 18:02             ` Jeff Kirsher
@ 2011-06-25 18:06             ` Jeff Kirsher
  2011-06-25 18:22               ` Arnd Bergmann
  2011-06-26  6:38               ` Joe Perches
  1 sibling, 2 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 18:06 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Russell King - ARM Linux, davem, netdev, Sriram, Vinay Hegde,
	Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Anant Gole, Chaithrika U S

[-- Attachment #1: Type: text/plain, Size: 831 bytes --]

On Sat, 2011-06-25 at 09:59 -0700, Arnd Bergmann wrote:
> > More interestingly, if you have one of the 8390 clones, which
> directory
> > do you look in?  And shouldn't etherh.c live along side 8390's files
> > as etherh is 8390-derived?
> 
> Jeff created a drivers/net/ethernet/8390/ directory for all of those,
> which sounds sensible to me, but apparently he missed some of the
> nonobvious ones. 

I was trying to keep the drivers that use the 8390 common files grouped
together.

I know that there are other instances like this (for instance drivers
derived from the lance.c driver) yet these derived drivers do not use
the common files that other lance drivers use.  Because they are
derived, yet do not use the common code, should they still be grouped
together?  Just a question, I am fine with the idea.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 54/72] au1000_eth/mipsnet/tc35815: Move the MIPS drivers
  2011-06-25 16:13   ` Ralf Baechle
@ 2011-06-25 18:11     ` Jeff Kirsher
  0 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-25 18:11 UTC (permalink / raw)
  To: Ralf Baechle
  Cc: davem, netdev, Matt Porter, Herbert Valerio Riedel,
	MontaVista Software, Kyle McMartin, Helge Deller,
	James E.J. Bottomley, linux-parisc, Sam Creasey,
	Geert Uytterhoeven, linux-m68k

[-- Attachment #1: Type: text/plain, Size: 869 bytes --]

On Sat, 2011-06-25 at 09:13 -0700, Ralf Baechle wrote:
> On Sat, Jun 25, 2011 at 06:59:05AM -0700, Jeff Kirsher wrote:
> 
> > Move the MIPS drivers into drivers/net/ethernet/mips/ and
> > make the necessary Kconfig and Makefile changes.
> 
> NAck.
> 
> sni_82596.c is a driver for the same chip but used in particular
> Siemens-
> Nixdorf systems.  Lasi_82596 is an Intel NIC being used in PARISC
> systems.
> Not a good reason th throw PA-RISC drivers into the same directory
> after
> all PA-RISC has no relation to MIPS at all.  So maybe they should go
> into
> drivers/net/ethernet/i82596 or drivers/net/ethernet/intel.  And
> wherever
> they go, both drivers #include lib82596.c which your patch did not
> move
> around. 

My bad, I had grouped these drivers because they both used lib82596.c
and had thought I had moved that file as well.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 30/72] atl*: Move the Atheros drivers
  2011-06-25 13:58 ` [RFC 30/72] atl*: Move the Atheros drivers Jeff Kirsher
@ 2011-06-25 18:16   ` Chris Snook
  0 siblings, 0 replies; 135+ messages in thread
From: Chris Snook @ 2011-06-25 18:16 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Jay Cliburn

On Sat, Jun 25, 2011 at 9:58 AM, Jeff Kirsher
<jeffrey.t.kirsher@intel.com> wrote:
> Move the Atheros drivers into drivers/net/ethernet/atheros/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Jay Cliburn <jcliburn@gmail.com>
> CC: Chris Snook <chris.snook@gmail.com>
> CC: Jie Yang <jie.yang@atheros.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

I'm fine with this as long as the other ethernet maintainers are fine
with the whole series. I don't want to be making changes like this
unless it's to a new standard that's applied consistently.

-- Chris

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 18:06             ` Jeff Kirsher
@ 2011-06-25 18:22               ` Arnd Bergmann
  2011-06-26  6:38               ` Joe Perches
  1 sibling, 0 replies; 135+ messages in thread
From: Arnd Bergmann @ 2011-06-25 18:22 UTC (permalink / raw)
  To: jeffrey.t.kirsher
  Cc: Russell King - ARM Linux, davem, netdev, Sriram, Vinay Hegde,
	Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Anant Gole, Chaithrika U S

On Saturday 25 June 2011, Jeff Kirsher wrote:
>   On Sat, 2011-06-25 at 09:59 -0700, Arnd Bergmann wrote:
> > > More interestingly, if you have one of the 8390 clones, which
> > directory
> > > do you look in?  And shouldn't etherh.c live along side 8390's files
> > > as etherh is 8390-derived?
> > 
> > Jeff created a drivers/net/ethernet/8390/ directory for all of those,
> > which sounds sensible to me, but apparently he missed some of the
> > nonobvious ones. 
> 
> I was trying to keep the drivers that use the 8390 common files grouped
> together.
> 
> I know that there are other instances like this (for instance drivers
> derived from the lance.c driver) yet these derived drivers do not use
> the common files that other lance drivers use.  Because they are
> derived, yet do not use the common code, should they still be grouped
> together?  Just a question, I am fine with the idea.

Generally, I'd say yes, but it's not a strong preference.

In other subsystems, we group similar stuff together like that as well,
as a reminder that it should better use the common infrastructure, so
that someone copying the odd implementation has a better chance of
noticing the mistake early.

	Arnd

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 59/72] r6040: Move the RDC driver
  2011-06-25 13:59 ` [RFC 59/72] r6040: Move the RDC driver Jeff Kirsher
@ 2011-06-25 18:59   ` Florian Fainelli
  0 siblings, 0 replies; 135+ messages in thread
From: Florian Fainelli @ 2011-06-25 18:59 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Sten Wang, Daniel Gimpelevich

Hello Jeff,

On Saturday 25 June 2011 15:59:10 Jeff Kirsher wrote:
> Move the RDC driver into drivers/net/ethernet/ and make the
> necessary Kconfig and Makefile changes.
> 
> CC: Sten Wang <sten.wang@rdc.com.tw>
> CC: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
> CC: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                        |    2 +-
>  drivers/net/Kconfig                |   13 -------------
>  drivers/net/Makefile               |    1 -
>  drivers/net/ethernet/Kconfig       |   14 ++++++++++++++
>  drivers/net/ethernet/Makefile      |    1 +
>  drivers/net/{ => ethernet}/r6040.c |    0
>  6 files changed, 16 insertions(+), 15 deletions(-)
>  rename drivers/net/{ => ethernet}/r6040.c (100%)

Why not move this to drivers/net/ethernet/rdc/r6040.c?

> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 9ddb715..f1f555d 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5258,7 +5258,7 @@ RDC R6040 FAST ETHERNET DRIVER
>  M:	Florian Fainelli <florian@openwrt.org>
>  L:	netdev@vger.kernel.org
>  S:	Maintained
> -F:	drivers/net/r6040.c
> +F:	drivers/net/ethernet/r6040.c
> 
>  RDS - RELIABLE DATAGRAM SOCKETS
>  M:	Andy Grover <andy.grover@oracle.com>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 82da415..463e4cf 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -404,19 +404,6 @@ config FEALNX
>  	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet
>  	  cards. <http://www.myson.com.tw/>
> 
> -config R6040
> -	tristate "RDC R6040 Fast Ethernet Adapter support"
> -	depends on NET_PCI && PCI
> -	select CRC32
> -	select MII
> -	select PHYLIB
> -	help
> -	  This is a driver for the R6040 Fast Ethernet MACs found in the
> -	  the RDC R-321x System-on-chips.
> -
> -	  To compile this driver as a module, choose M here: the module
> -	  will be called r6040. This is recommended.
> -
>  config NET_POCKET
>  	bool "Pocket and portable adapters"
>  	depends on PARPORT
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index b7e875a..f57a0be 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -16,7 +16,6 @@ obj-$(CONFIG_PLIP) += plip.o
> 
>  obj-$(CONFIG_ROADRUNNER) += rrunner.o
> 
> -obj-$(CONFIG_R6040) += r6040.o
>  obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
>  obj-$(CONFIG_FEALNX) += fealnx.o
>  obj-$(CONFIG_SKFP) += skfp/
> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> index f5eb70e..3c10879 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -98,6 +98,20 @@ config PASEMI_MAC
>  source "drivers/net/ethernet/qlogic/Kconfig"
>  source "drivers/net/ethernet/racal/Kconfig"
>  source "drivers/net/ethernet/radisys/Kconfig"
> +
> +config R6040
> +	tristate "RDC R6040 Fast Ethernet Adapter support"
> +	depends on PCI
> +	select CRC32
> +	select MII
> +	select PHYLIB
> +	---help---
> +	  This is a driver for the R6040 Fast Ethernet MACs found in the
> +	  the RDC R-321x System-on-chips.
> +
> +	  To compile this driver as a module, choose M here: the module
> +	  will be called r6040. This is recommended.
> +
>  source "drivers/net/ethernet/realtek/Kconfig"
> 
>  config S6GMAC
> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> index 2ccb194..537631b 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -41,6 +41,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
> pasemi_mac_ethtool.o obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
>  obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
>  obj-$(CONFIG_NET_VENDOR_RADISYS) += radisys/
> +obj-$(CONFIG_R6040) += r6040.o
>  obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
>  obj-$(CONFIG_S6GMAC) += s6gmac.o
>  obj-$(CONFIG_NET_VENDOR_SIS) += sis/
> diff --git a/drivers/net/r6040.c b/drivers/net/ethernet/r6040.c
> similarity index 100%
> rename from drivers/net/r6040.c
> rename to drivers/net/ethernet/r6040.c

-- 
Florian

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 11/72] cassini/niu/sun*: Move the Sun drivers
  2011-06-25 14:46   ` Oliver Hartkopp
@ 2011-06-25 23:56     ` David Miller
  0 siblings, 0 replies; 135+ messages in thread
From: David Miller @ 2011-06-25 23:56 UTC (permalink / raw)
  To: socketcan; +Cc: jeffrey.t.kirsher, netdev, sammy, asun, benh

From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Sat, 25 Jun 2011 16:46:43 +0200

> On 25.06.2011 15:58, Jeff Kirsher wrote:
>> Moves the Sun drivers into drivers/net/ethernet/sun/ and make
>> the necessary Kconfig and Makefile changes.
>> 
> 
> (..)
> 
>> ---
>>  MAINTAINERS                                 |    1 +
>>  drivers/net/Kconfig                         |   75 ----------------------
>>  drivers/net/Makefile                        |   11 +---
>>  drivers/net/ethernet/Kconfig                |    1 +
>>  drivers/net/ethernet/Makefile               |    1 +
>>  drivers/net/ethernet/sun/Kconfig            |   91 +++++++++++++++++++++++++++
>>  drivers/net/ethernet/sun/Makefile           |   12 ++++
>>  drivers/net/{ => ethernet/sun}/cassini.c    |    0
>>  drivers/net/{ => ethernet/sun}/cassini.h    |    0
>>  drivers/net/{ => ethernet/sun}/niu.c        |    0
>>  drivers/net/{ => ethernet/sun}/niu.h        |    0
>>  drivers/net/{ => ethernet/sun}/sun3_82586.c |    0
>>  drivers/net/{ => ethernet/sun}/sun3_82586.h |    0
> 
> s/sun3_// in filenames?

It's a special instance of the chip which only ever
appears on the motherboard of m68k based sun3 systems.

The sun3 prefix is absolutely appropriate.

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 18/72] ehea/ibm*: Move the IBM drivers
  2011-06-25 15:04     ` Arnd Bergmann
@ 2011-06-26  0:37       ` Benjamin Herrenschmidt
  0 siblings, 0 replies; 135+ messages in thread
From: Benjamin Herrenschmidt @ 2011-06-26  0:37 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Oliver Hartkopp, Jeff Kirsher, davem, netdev, Christoph Raisch,
	Alfred Arnold, Santiago Leon

On Sat, 2011-06-25 at 17:04 +0200, Arnd Bergmann wrote:
> You can probably rename to just emac now, since the "old" emac driver
> has been gone for some time.
> 
> The "new" part of the name does not refer to the hardware, just to
> the driver.

Right. Agreed.

Cheers,
Ben.



^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 20/72] pasemic_mac*: Move the PA Semi driver
  2011-06-25 13:58 ` [RFC 20/72] pasemic_mac*: Move the PA Semi driver Jeff Kirsher
@ 2011-06-26  1:34   ` Olof Johansson
  0 siblings, 0 replies; 135+ messages in thread
From: Olof Johansson @ 2011-06-26  1:34 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

On Sat, Jun 25, 2011 at 6:58 AM, Jeff Kirsher
<jeffrey.t.kirsher@intel.com> wrote:
> Move the PA Semi driver into drivers/net/ethernet/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Olof Johansson <olof@lixom.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Acked-by: Olof Johansson <olof@lixom.net>

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 18:06             ` Jeff Kirsher
  2011-06-25 18:22               ` Arnd Bergmann
@ 2011-06-26  6:38               ` Joe Perches
  1 sibling, 0 replies; 135+ messages in thread
From: Joe Perches @ 2011-06-26  6:38 UTC (permalink / raw)
  To: jeffrey.t.kirsher
  Cc: Arnd Bergmann, Russell King - ARM Linux, davem, netdev, Sriram,
	Vinay Hegde, Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Anant Gole, Chaithrika U S

On Sat, 2011-06-25 at 11:06 -0700, Jeff Kirsher wrote:
> On Sat, 2011-06-25 at 09:59 -0700, Arnd Bergmann wrote:
> > Jeff created a drivers/net/ethernet/8390/ directory for all of those,
> > which sounds sensible to me, but apparently he missed some of the
> > nonobvious ones.
> I was trying to keep the drivers that use the 8390 common files grouped
> together.

Please move a2065, ariadne and zorro8390 too.

> I know that there are other instances like this (for instance drivers
> derived from the lance.c driver) yet these derived drivers do not use
> the common files that other lance drivers use.  Because they are
> derived, yet do not use the common code, should they still be grouped
> together?

IMO, yes.


^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (71 preceding siblings ...)
  2011-06-25 13:59 ` [RFC 72/72] drivers/net: Kconfig and Makefile cleanup Jeff Kirsher
@ 2011-06-26  7:54 ` Bill Fink
  2011-06-26  8:35 ` Francois Romieu
  2011-06-27  5:35 ` Jeff Kirsher
  74 siblings, 0 replies; 135+ messages in thread
From: Bill Fink @ 2011-06-26  7:54 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

On Sat, 25 Jun 2011, Jeff Kirsher wrote:

> The following series is the first attempt to organize the drivers/net
> directory.  This process was started a year ago, and the emphasis was
> on making the drivers/net/ easier to maintain and to group similar
> drivers into the appropriate sub-directory.
> 
> The next steps are to move all the FIDDI drivers into drivers/net/fiddi,
> and like so.  In addition, look at splitting the PS3 driver so that the
> wireless portion can be moved into /drivers/net/wireless.

That should be FDDI, not FIDDI.

		-Bill

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (72 preceding siblings ...)
  2011-06-26  7:54 ` [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Bill Fink
@ 2011-06-26  8:35 ` Francois Romieu
  2011-06-27  5:35 ` Jeff Kirsher
  74 siblings, 0 replies; 135+ messages in thread
From: Francois Romieu @ 2011-06-26  8:35 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

Jeff Kirsher <jeffrey.t.kirsher@intel.com> :
> The following series is the first attempt to organize the drivers/net
> directory.  This process was started a year ago, and the emphasis was
> on making the drivers/net/ easier to maintain and to group similar
> drivers into the appropriate sub-directory.

No opinion on the topic here. The changes look sane.

-- 
Ueimor

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 46/72] ixp2000: Move the Radisys driver
  2011-06-25 13:58 ` [RFC 46/72] ixp2000: Move the Radisys driver Jeff Kirsher
@ 2011-06-26 11:47   ` Lennert Buytenhek
  2011-07-09 15:58     ` Jeff Kirsher
  0 siblings, 1 reply; 135+ messages in thread
From: Lennert Buytenhek @ 2011-06-26 11:47 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Lennert Buytenhek

On Sat, Jun 25, 2011 at 06:58:57AM -0700, Jeff Kirsher wrote:

> Move the Radisys driver into drivers/net/ethernet/radisys/ and
> make the necessary Kconfig and Makefile changes
> 
> CC: Lennert Buytenhek <kernel@wantstofly.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                                        |    2 +-
>  drivers/net/Kconfig                                |    2 --
>  drivers/net/Makefile                               |    1 -
>  drivers/net/ethernet/Kconfig                       |    1 +
>  drivers/net/ethernet/Makefile                      |    1 +
>  drivers/net/ethernet/radisys/Kconfig               |   16 ++++++++++++++++
>  drivers/net/ethernet/radisys/Makefile              |    5 +++++
>  drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig |    2 +-
>  .../net/{ => ethernet/radisys}/ixp2000/Makefile    |    0

The ixp2000 is a series of Intel ARM SoCs, and the ENP2611 is a Radisys
PCI board based on the ixp2000 series (ixp2400), so it doesn't make
sense to put everything in the radisys/ directory.

If you insist on moving all drivers into vendor directories (I don't
like that idea at all -- are we going to rename directories and shuffle
stuff around every time vendor A buys vendor B or takes over one of
vendor B's products?), at least the core ixp2000 code should be under
intel/.

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 08/72] qlogic: Move the QLogic drivers
  2011-06-25 13:58 ` [RFC 08/72] qlogic: Move the QLogic drivers Jeff Kirsher
@ 2011-06-27  1:30   ` Anirban Chakraborty
  0 siblings, 0 replies; 135+ messages in thread
From: Anirban Chakraborty @ 2011-06-27  1:30 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: David Miller, netdev, Ron Mercer, Amit Salecha


On Jun 25, 2011, at 7:28 PM, Jeff Kirsher wrote:

> Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
> the necessary Kconfig and Makefile changes.
> 
Acked.

-Anirban




^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 27/72] ftgmac100/ftmac100: Move the Faraday drivers
  2011-06-25 13:58 ` [RFC 27/72] ftgmac100/ftmac100: Move the Faraday drivers Jeff Kirsher
@ 2011-06-27  1:51   ` Po-Yu Chuang
  0 siblings, 0 replies; 135+ messages in thread
From: Po-Yu Chuang @ 2011-06-27  1:51 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Po-Yu Chuang

Dear Jeff,

On Sat, Jun 25, 2011 at 9:58 PM, Jeff Kirsher
<jeffrey.t.kirsher@intel.com> wrote:
> Move the Faraday driver into drivers/net/ethernet/faraday/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: "Po-Yu Chuang" <ratbert@faraday-tech.com>
> CC: "Po-Yu Chuang" <ratbert.chuang@gmail.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Acked-by: Po-Yu Chuang <ratbert@faraday-tech.com>

Thank you,
Po-Yu Chuang

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 33/72] pch_gbe: Move the OKI driver
  2011-06-25 13:58 ` [RFC 33/72] pch_gbe: Move the OKI driver Jeff Kirsher
@ 2011-06-27  1:53   ` Toshiharu Okada
  0 siblings, 0 replies; 135+ messages in thread
From: Toshiharu Okada @ 2011-06-27  1:53 UTC (permalink / raw)
  To: davem, Jeff Kirsher; +Cc: Tomoya, netdev, Jeff Kirsher

On Sat, 25 Jun 2011 06:58:44 -0700
>Move the OKI driver into driver/net/ethernet/oki/ and make the
>necessary Kconfig and Makefile changes.
>
>Note: there is no documented maintainer for this driver, so I CC'd
>the last 2 major contributors.
>
>CC: Tomoya <tomoya-linux@dsn.okisemi.com>
>CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
>Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>---
> drivers/net/Kconfig                                | 
>   19 -------------------
> drivers/net/Makefile                               |    1 -
> drivers/net/ethernet/Kconfig                       |    1 +
> drivers/net/ethernet/Makefile                      |    1 +
> drivers/net/ethernet/oki/Kconfig                   |   18 
> ++++++++++++++++++
> drivers/net/ethernet/oki/Makefile                  |    5 +++++
> drivers/net/ethernet/oki/pch_gbe/Kconfig           |   20 
> ++++++++++++++++++++
> drivers/net/{ => ethernet/oki}/pch_gbe/Makefile    |    0
> drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe.h   |    0
> .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.c   |    0
> .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.h   |    0
> .../{ => ethernet/oki}/pch_gbe/pch_gbe_ethtool.c   |    0
> .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_main.c  |    0
> .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_param.c |    0
> .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.c   |    0
> .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.h   |    0

OKi semiconductor is a different company from OKI Groups.
Therefor please use not "/oki" but "/oki-semi"

Best Regards
Toshiharu Okada 


^ permalink raw reply	[flat|nested] 135+ messages in thread
* RE: [RFC 26/72] arm: Move the ARM/ACORN drivers
  2011-06-25 14:48   ` Arnd Bergmann
  2011-06-25 14:50     ` Arnd Bergmann
  2011-06-25 15:53     ` Russell King - ARM Linux
@ 2011-06-27  3:10     ` Gole, Anant
  2 siblings, 0 replies; 135+ messages in thread
From: Gole, Anant @ 2011-06-27  3:10 UTC (permalink / raw)
  To: Arnd Bergmann, Jeff Kirsher, Russell King
  Cc: davem, netdev, Govindarajan, Sriramakrishnan, Hegde, Vinay,
	Chemparathy, Cyril, Wan ZongShun, Lennert Buytenhek,
	Krzysztof Halasa, Chaithrika U S

>It doesn't seem logical to group drivers that are used on ARM under
>the architecture when the hardware is not actually made by ARM Ltd.
>
>TI also produces chips with the C6x architecture, which will be
>supported
>in Linux in the future. It could well be that there is a version that
>uses the davinci ethernet mac. You also have a TI directory.
>

IMO davinci_emac driver should go under /ethernet/ti/


^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/
  2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
                   ` (73 preceding siblings ...)
  2011-06-26  8:35 ` Francois Romieu
@ 2011-06-27  5:35 ` Jeff Kirsher
  74 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-06-27  5:35 UTC (permalink / raw)
  To: davem, Arnd Bergmann, Russell King - ARM Linux, Joe Perches,
	Toshiharu Okada
  Cc: netdev

[-- Attachment #1: Type: text/plain, Size: 114241 bytes --]

On Sat, 2011-06-25 at 06:58 -0700, Kirsher, Jeffrey T wrote:
> The following series is the first attempt to organize the drivers/net
> directory.  This process was started a year ago, and the emphasis was
> on making the drivers/net/ easier to maintain and to group similar
> drivers into the appropriate sub-directory.
> 
> The next steps are to move all the FIDDI drivers into drivers/net/fiddi,
> and like so.  In addition, look at splitting the PS3 driver so that the
> wireless portion can be moved into /drivers/net/wireless.
> 
> The following are changes since commit c6af9c406ceb3434281cf230938453931dcbab75:
>   net: wimax: Remove of unused 'rfkill_input' pointer
> and are available in the git repository at:
>   master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize master
> 
> Jeff Kirsher (72):
>   drivers/net/ethernet: Add ethernet dir and config option
>   3c*/acenic/typhoon: Move 3Com Ethernet drivers
>   amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers
>   8390: Move the 8390 related drivers
>   broadcom: Move the Broadcom drivers
>   chelsio: Move the Chelsio drivers
>   intel: Move the Intel wired LAN drivers
>   qlogic: Move the QLogic drivers
>   smc: Move the SMC drivers
>   ni5*/ni65: Move the Racal-Interlan (Micom) drivers
>   cassini/niu/sun*: Move the Sun drivers
>   sfc: Move the Solarflare drivers
>   be2net: Move the Emulex driver
>   bna: Move the Brocade driver
>   mlx4: Move the Mellanox driver
>   myri*: Move the Myricom drivers
>   s2io/vxge: Move the Exar drivers
>   ehea/ibm*: Move the IBM drivers
>   enic: Move the Cisco driver
>   pasemic_mac*: Move the PA Semi driver
>   tehuti: Move the Tehuti driver
>   stmmac: Move the STMicroelectronics driver
>   bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
>   *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
>   smsc*/smc911x: Move the SMSC drivers
>   arm: Move the ARM/ACORN drivers
>   ftgmac100/ftmac100: Move the Faraday drivers
>   8139*/atp/r8169: Move the Realtek drivers
>   de6*/dl2k: Move the D-Link drivers
>   atl*: Move the Atheros drivers
>   tulip: Move the tulip drivers
>   ioc3-eth/meth/sgiseeq: Move the SGI drivers
>   pch_gbe: Move the OKI driver
>   skge/sky2: Move the SysKonnect Ethernet drivers
>   via-*: Move the VIA drivers
>   eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA
>     drivers
>   fsl_*/gianfar*/ucc_*: Move the Freescale drivers
>   ks8*/ksz8*: Move the Micrel drivers
>   mv643xx/pxa168: Move the Marvell drivers
>   spider_net: Move the spider_net (IBM) driver
>   sis*: Move the Silicon Integrated Systems (SiS) drivers
>   82586.c/fec*: Move the Motorola drivers
>   a2065/ariadne: Move the a2065/ariadne drivers
>   s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
>   tlan/cpmac: Move the TI drivers
>   ixp2000: Move the Radisys driver
>   hamachi/yellowfin: Move the packet engine drivers
>   octeon: Move the Cavium driver
>   jme: Move the JME driver
>   xilinx/ll_temac: Move the Xilinx drivers
>   ipg: Move the IC Plus driver
>   ps3_gelic*: Move the Sony (PS3) drivers
>   korina: Move the IDT driver
>   au1000_eth/mipsnet/tc35815: Move the MIPS drivers
>   bfin_mac: Move the Blackfin driver
>   macb: Move the Atmel driver
>   sc92031: Move the Silan driver
>   sundance: Move the sundance driver
>   r6040: Move the RDC driver
>   fealnx: Move the Myson driver
>   forcedeth: Move the NVIDIA nForce driver
>   starfire: Move the starfire driver
>   hp100/depca: Move the HP and Digital drivers
>   at1700: Move the Allied Telesis driver
>   dnet: Move the Dave Ethernet driver
>   ethoc: Move the Avionic driver
>   greth: Move the Aeroflex Gaisler driver
>   enc28j60: Move the enc28j60 driver
>   dm9000: Move the Davicom driver
>   netx: Move the netx driver
>   sh_eth: Move the Renesas SuperH driver
>   drivers/net: Kconfig and Makefile cleanup
> 
>  MAINTAINERS                                        |  153 +-
>  drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
>  drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
>  drivers/net/Kconfig                                | 2738 +-------------------
>  drivers/net/Makefile                               |  233 +--
>  drivers/net/arm/Kconfig                            |   74 -
>  drivers/net/benet/Kconfig                          |    6 -
>  drivers/net/{ => ethernet/3com}/3c501.c            |    0
>  drivers/net/{ => ethernet/3com}/3c501.h            |    0
>  drivers/net/{ => ethernet/3com}/3c503.c            |    0
>  drivers/net/{ => ethernet/3com}/3c503.h            |    0
>  drivers/net/{ => ethernet/3com}/3c505.c            |    0
>  drivers/net/{ => ethernet/3com}/3c505.h            |    0
>  drivers/net/{ => ethernet/3com}/3c507.c            |    0
>  drivers/net/{ => ethernet/3com}/3c509.c            |    0
>  drivers/net/{ => ethernet/3com}/3c515.c            |    0
>  drivers/net/{ => ethernet/3com}/3c523.c            |    0
>  drivers/net/{ => ethernet/3com}/3c523.h            |    0
>  drivers/net/{ => ethernet/3com}/3c527.c            |    0
>  drivers/net/{ => ethernet/3com}/3c527.h            |    0
>  drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    0
>  drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    0
>  drivers/net/{ => ethernet/3com}/3c59x.c            |    0
>  drivers/net/ethernet/3com/Kconfig                  |  200 ++
>  drivers/net/ethernet/3com/Makefile                 |   17 +
>  drivers/net/{ => ethernet/3com}/acenic.c           |    0
>  drivers/net/{ => ethernet/3com}/acenic.h           |    0
>  drivers/net/{ => ethernet/3com}/typhoon.c          |    0
>  drivers/net/{ => ethernet/3com}/typhoon.h          |    0
>  drivers/net/{ => ethernet/8390}/8390.c             |    0
>  drivers/net/{ => ethernet/8390}/8390.h             |    0
>  drivers/net/{ => ethernet/8390}/8390p.c            |    0
>  drivers/net/ethernet/8390/Kconfig                  |  312 +++
>  drivers/net/ethernet/8390/Makefile                 |   27 +
>  drivers/net/{ => ethernet/8390}/ac3200.c           |    0
>  drivers/net/{ => ethernet/8390}/apne.c             |    0
>  drivers/net/{ => ethernet/8390}/ax88796.c          |    0
>  drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    2 +-
>  drivers/net/{ => ethernet/8390}/e2100.c            |    0
>  drivers/net/{ => ethernet/8390}/es3210.c           |    0
>  drivers/net/{ => ethernet/8390}/hp-plus.c          |    0
>  drivers/net/{ => ethernet/8390}/hp.c               |    0
>  drivers/net/{ => ethernet/8390}/hydra.c            |    0
>  drivers/net/{ => ethernet/8390}/lib8390.c          |    0
>  drivers/net/{ => ethernet/8390}/lne390.c           |    0
>  drivers/net/{ => ethernet/8390}/mac8390.c          |    0
>  drivers/net/{ => ethernet/8390}/ne-h8300.c         |    0
>  drivers/net/{ => ethernet/8390}/ne.c               |    0
>  drivers/net/{ => ethernet/8390}/ne2.c              |    0
>  drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    0
>  drivers/net/{ => ethernet/8390}/ne3210.c           |    0
>  drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    2 +-
>  drivers/net/{ => ethernet/8390}/smc-mca.c          |    0
>  drivers/net/{ => ethernet/8390}/smc-ultra.c        |    0
>  drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    0
>  drivers/net/{ => ethernet/8390}/stnic.c            |    0
>  drivers/net/{ => ethernet/8390}/wd.c               |    0
>  drivers/net/{ => ethernet/8390}/zorro8390.c        |    0
>  drivers/net/ethernet/Kconfig                       |  324 +++
>  drivers/net/ethernet/Makefile                      |   76 +
>  drivers/net/{ => ethernet}/a2065.c                 |    0
>  drivers/net/{ => ethernet}/a2065.h                 |    0
>  drivers/net/ethernet/aeroflex/Kconfig              |   11 +
>  drivers/net/ethernet/aeroflex/Makefile             |    5 +
>  drivers/net/{ => ethernet/aeroflex}/greth.c        |    0
>  drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
>  drivers/net/{ => ethernet/amd}/7990.c              |    0
>  drivers/net/{ => ethernet/amd}/7990.h              |    0
>  drivers/net/ethernet/amd/Kconfig                   |  115 +
>  drivers/net/ethernet/amd/Makefile                  |   13 +
>  drivers/net/{ => ethernet/amd}/amd8111e.c          |    0
>  drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
>  drivers/net/{ => ethernet/amd}/atarilance.c        |    0
>  drivers/net/{ => ethernet/amd}/declance.c          |    0
>  drivers/net/{ => ethernet/amd}/hplance.c           |    0
>  drivers/net/{ => ethernet/amd}/hplance.h           |    0
>  drivers/net/{ => ethernet/amd}/lance.c             |    0
>  drivers/net/{ => ethernet/amd}/mvme147.c           |    0
>  drivers/net/{ => ethernet/amd}/pcnet32.c           |    0
>  drivers/net/{ => ethernet/amd}/sun3lance.c         |    0
>  drivers/net/{ => ethernet/amd}/sunlance.c          |    0
>  drivers/net/ethernet/apple/Kconfig                 |   92 +
>  drivers/net/ethernet/apple/Makefile                |    9 +
>  drivers/net/{ => ethernet/apple}/bmac.c            |    0
>  drivers/net/{ => ethernet/apple}/bmac.h            |    0
>  drivers/net/{ => ethernet/apple}/cs89x0.c          |    0
>  drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
>  drivers/net/{ => ethernet/apple}/mac89x0.c         |    0
>  drivers/net/{ => ethernet/apple}/mace.c            |    0
>  drivers/net/{ => ethernet/apple}/mace.h            |    0
>  drivers/net/{ => ethernet/apple}/macmace.c         |    0
>  drivers/net/{ => ethernet}/ariadne.c               |    0
>  drivers/net/{ => ethernet}/ariadne.h               |    0
>  drivers/net/ethernet/arm/Kconfig                   |  120 +
>  drivers/net/{ => ethernet}/arm/Makefile            |    4 +-
>  drivers/net/{ => ethernet}/arm/am79c961a.c         |    0
>  drivers/net/{ => ethernet}/arm/am79c961a.h         |    0
>  drivers/net/{ => ethernet}/arm/at91_ether.c        |    0
>  drivers/net/{ => ethernet}/arm/at91_ether.h        |    0
>  drivers/net/{ => ethernet/arm}/davinci_cpdma.c     |    0
>  drivers/net/{ => ethernet/arm}/davinci_cpdma.h     |    0
>  drivers/net/{ => ethernet/arm}/davinci_emac.c      |    0
>  drivers/net/{ => ethernet/arm}/davinci_mdio.c      |    0
>  drivers/net/{ => ethernet}/arm/ep93xx_eth.c        |    0
>  drivers/net/{ => ethernet}/arm/ether1.c            |    0
>  drivers/net/{ => ethernet}/arm/ether1.h            |    0
>  drivers/net/{ => ethernet}/arm/ether3.c            |    0
>  drivers/net/{ => ethernet}/arm/ether3.h            |    0
>  drivers/net/{ => ethernet}/arm/etherh.c            |    0
>  drivers/net/{ => ethernet}/arm/ixp4xx_eth.c        |    0
>  drivers/net/{ => ethernet}/arm/ks8695net.c         |    0
>  drivers/net/{ => ethernet}/arm/ks8695net.h         |    0
>  drivers/net/{ => ethernet}/arm/w90p910_ether.c     |    0
>  drivers/net/{ => ethernet}/at1700.c                |    0
>  drivers/net/ethernet/atheros/Kconfig               |   61 +
>  drivers/net/ethernet/atheros/Makefile              |    8 +
>  drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
>  drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
>  .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
>  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
>  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
>  .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |    0
>  drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
>  drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
>  .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
>  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
>  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
>  .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |    0
>  .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
>  drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
>  drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    0
>  drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
>  drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    0
>  drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
>  drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
>  drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
>  drivers/net/ethernet/atmel/Kconfig                 |   32 +
>  drivers/net/ethernet/atmel/Makefile                |    5 +
>  drivers/net/{ => ethernet/atmel}/macb.c            |    0
>  drivers/net/{ => ethernet/atmel}/macb.h            |    0
>  drivers/net/ethernet/blackfin/Kconfig              |   65 +
>  drivers/net/ethernet/blackfin/Makefile             |    5 +
>  drivers/net/{ => ethernet/blackfin}/bfin_mac.c     |    0
>  drivers/net/{ => ethernet/blackfin}/bfin_mac.h     |    0
>  drivers/net/ethernet/broadcom/Kconfig              |  114 +
>  drivers/net/ethernet/broadcom/Makefile             |   11 +
>  drivers/net/{ => ethernet/broadcom}/b44.c          |    0
>  drivers/net/{ => ethernet/broadcom}/b44.h          |    0
>  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    0
>  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
>  drivers/net/{ => ethernet/broadcom}/bnx2.c         |    0
>  drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
>  drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
>  drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
>  drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
>  .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |    0
>  .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
>  .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
>  .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |    0
>  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
>  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |    0
>  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
>  drivers/net/{ => ethernet/broadcom}/cnic.c         |    4 +-
>  drivers/net/{ => ethernet/broadcom}/cnic.h         |    0
>  drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    0
>  drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
>  drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    0
>  drivers/net/{ => ethernet/broadcom}/tg3.c          |    0
>  drivers/net/{ => ethernet/broadcom}/tg3.h          |    0
>  drivers/net/ethernet/brocade/Kconfig               |   18 +
>  drivers/net/ethernet/brocade/Makefile              |    5 +
>  drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
>  drivers/net/{ => ethernet/brocade}/bna/Makefile    |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |    0
>  .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
>  .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |    0
>  .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |    0
>  .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfa_sm.h    |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfa_wc.h    |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfi.h       |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h |    0
>  drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h    |    0
>  drivers/net/{ => ethernet/brocade}/bna/bna.h       |    0
>  drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c  |    0
>  drivers/net/{ => ethernet/brocade}/bna/bna_hw.h    |    0
>  drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c  |    0
>  drivers/net/{ => ethernet/brocade}/bna/bna_types.h |    0
>  drivers/net/{ => ethernet/brocade}/bna/bnad.c      |    0
>  drivers/net/{ => ethernet/brocade}/bna/bnad.h      |    0
>  .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |    0
>  drivers/net/{ => ethernet/brocade}/bna/cna.h       |    0
>  drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
>  drivers/net/ethernet/chelsio/Kconfig               |  102 +
>  drivers/net/ethernet/chelsio/Makefile              |    8 +
>  .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
>  .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
>  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
>  .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
>  .../chelsio/cxgb}/vsc7326_reg.h                    |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
>  .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
>  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
>  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
>  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    0
>  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
>  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
>  .../chelsio}/cxgb3/firmware_exports.h              |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
>  .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
>  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    0
>  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
>  .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
>  .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
>  .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
>  .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    0
>  drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
>  .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
>  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
>  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
>  drivers/net/ethernet/cisco/Kconfig                 |   18 +
>  drivers/net/ethernet/cisco/Makefile                |    5 +
>  drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
>  drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
>  drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
>  .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
>  drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
>  drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
>  drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
>  drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |    0
>  drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
>  drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
>  drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
>  drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
>  .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
>  .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
>  .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
>  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
>  .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
>  drivers/net/ethernet/davicom/Kconfig               |   31 +
>  drivers/net/ethernet/davicom/Makefile              |    5 +
>  drivers/net/{ => ethernet/davicom}/dm9000.c        |    0
>  drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
>  drivers/net/{ => ethernet}/depca.c                 |    0
>  drivers/net/{ => ethernet}/depca.h                 |    0
>  drivers/net/ethernet/dlink/Kconfig                 |   60 +
>  drivers/net/ethernet/dlink/Makefile                |    7 +
>  drivers/net/{ => ethernet/dlink}/de600.c           |    0
>  drivers/net/{ => ethernet/dlink}/de600.h           |    0
>  drivers/net/{ => ethernet/dlink}/de620.c           |    0
>  drivers/net/{ => ethernet/dlink}/de620.h           |    0
>  drivers/net/{ => ethernet/dlink}/dl2k.c            |    0
>  drivers/net/{ => ethernet/dlink}/dl2k.h            |    0
>  drivers/net/{ => ethernet}/dnet.c                  |    0
>  drivers/net/{ => ethernet}/dnet.h                  |    0
>  drivers/net/ethernet/emulex/Kconfig                |   18 +
>  drivers/net/ethernet/emulex/Makefile               |    5 +
>  drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
>  drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
>  drivers/net/{ => ethernet/emulex}/benet/be.h       |    0
>  drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |    0
>  drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |    0
>  .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |    0
>  drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |    0
>  drivers/net/{ => ethernet/emulex}/benet/be_main.c  |    0
>  drivers/net/{ => ethernet}/enc28j60.c              |    0
>  drivers/net/{ => ethernet}/enc28j60_hw.h           |    0
>  drivers/net/{ => ethernet}/ethoc.c                 |    0
>  drivers/net/ethernet/faraday/Kconfig               |   34 +
>  drivers/net/ethernet/faraday/Makefile              |    6 +
>  drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
>  drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
>  drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
>  drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
>  drivers/net/{ => ethernet}/fealnx.c                |    0
>  drivers/net/{ => ethernet}/forcedeth.c             |    0
>  drivers/net/ethernet/freescale/Kconfig             |   48 +
>  drivers/net/ethernet/freescale/Makefile            |   13 +
>  .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
>  .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
>  drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
>  .../freescale}/fs_enet/fs_enet-main.c              |    0
>  .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
>  .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
>  .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
>  .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
>  .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
>  .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
>  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
>  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
>  drivers/net/{ => ethernet/freescale}/gianfar.c     |    0
>  drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
>  .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
>  drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
>  .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
>  drivers/net/{ => ethernet/freescale}/ucc_geth.c    |    0
>  drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
>  .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
>  drivers/net/{ => ethernet}/hp100.c                 |    0
>  drivers/net/{ => ethernet}/hp100.h                 |    0
>  drivers/net/ethernet/ibm/Kconfig                   |   62 +
>  drivers/net/ethernet/ibm/Makefile                  |   10 +
>  drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
>  drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
>  drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
>  drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
>  drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    0
>  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
>  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
>  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
>  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig |    2 +-
>  .../net/{ => ethernet/ibm}/ibm_newemac/Makefile    |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c  |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h  |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h  |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h   |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c  |    0
>  drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h  |    0
>  drivers/net/{ => ethernet/ibm}/ibmlana.c           |    0
>  drivers/net/{ => ethernet/ibm}/ibmlana.h           |    0
>  drivers/net/{ => ethernet/ibm}/ibmveth.c           |    0
>  drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
>  drivers/net/{ => ethernet/ibm}/spider_net.c        |    0
>  drivers/net/{ => ethernet/ibm}/spider_net.h        |    2 +-
>  .../net/{ => ethernet/ibm}/spider_net_ethtool.c    |    0
>  drivers/net/ethernet/icplus/Kconfig                |   13 +
>  drivers/net/ethernet/icplus/Makefile               |    5 +
>  drivers/net/{ => ethernet/icplus}/ipg.c            |    0
>  drivers/net/{ => ethernet/icplus}/ipg.h            |    0
>  drivers/net/ethernet/intel/Kconfig                 |  216 ++
>  drivers/net/ethernet/intel/Makefile                |   12 +
>  drivers/net/{ => ethernet/intel}/e100.c            |    0
>  drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
>  drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    0
>  .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
>  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
>  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
>  .../net/{ => ethernet/intel}/e1000/e1000_main.c    |    0
>  .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
>  .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
>  .../intel/e1000e/80003es2lan.c}                    |    2 +-
>  drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    2 +-
>  drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    4 +-
>  drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
>  .../e1000.h => ethernet/intel/e1000e/e1000e.h}     |    0
>  .../intel/e1000e/e1000e_main.c}                    |    2 +-
>  drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |    2 +-
>  drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
>  drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    2 +-
>  drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    2 +-
>  drivers/net/{ => ethernet/intel}/e1000e/param.c    |    2 +-
>  drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    2 +-
>  drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
>  .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
>  drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
>  drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
>  drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
>  drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    0
>  drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
>  drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
>  drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
>  drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
>  drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
>  drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
>  drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    0
>  drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
>  drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
>  drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
>  drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
>  .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
>  drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
>  drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
>  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
>  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
>  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
>  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
>  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
>  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    0
>  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |    0
>  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
>  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
>  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
>  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    0
>  .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    0
>  .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
>  drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
>  drivers/net/ethernet/isa/Kconfig                   |  101 +
>  drivers/net/ethernet/isa/Makefile                  |   11 +
>  drivers/net/{ => ethernet/isa}/eepro.c             |    0
>  drivers/net/{ => ethernet/isa}/eexpress.c          |    0
>  drivers/net/{ => ethernet/isa}/eexpress.h          |    0
>  drivers/net/{ => ethernet/isa}/eth16i.c            |    0
>  drivers/net/{ => ethernet/isa}/ewrk3.c             |    0
>  drivers/net/{ => ethernet/isa}/ewrk3.h             |    0
>  drivers/net/{ => ethernet/isa}/lp486e.c            |    0
>  drivers/net/{ => ethernet/isa}/seeq8005.c          |    0
>  drivers/net/{ => ethernet/isa}/seeq8005.h          |    0
>  drivers/net/{ => ethernet/isa}/znet.c              |    0
>  drivers/net/{ => ethernet}/jme.c                   |    0
>  drivers/net/{ => ethernet}/jme.h                   |    0
>  drivers/net/{ => ethernet}/korina.c                |    0
>  drivers/net/ethernet/marvell/Kconfig               |   40 +
>  drivers/net/ethernet/marvell/Makefile              |    6 +
>  drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |    0
>  drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
>  drivers/net/ethernet/mellanox/Kconfig              |   18 +
>  drivers/net/ethernet/mellanox/Makefile             |    5 +
>  drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
>  drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
>  .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
>  .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
>  .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
>  .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
>  drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
>  drivers/net/ethernet/micrel/Kconfig                |   51 +
>  drivers/net/ethernet/micrel/Makefile               |    8 +
>  drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
>  drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
>  drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
>  drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
>  drivers/net/{ => ethernet/micrel}/ksz884x.c        |    0
>  drivers/net/ethernet/mips/Kconfig                  |   61 +
>  drivers/net/ethernet/mips/Makefile                 |   10 +
>  drivers/net/{ => ethernet/mips}/au1000_eth.c       |    0
>  drivers/net/{ => ethernet/mips}/au1000_eth.h       |    0
>  drivers/net/{ => ethernet/mips}/lasi_82596.c       |    0
>  drivers/net/{ => ethernet/mips}/mipsnet.c          |    0
>  drivers/net/{ => ethernet/mips}/sni_82596.c        |    0
>  drivers/net/{ => ethernet/mips}/tc35815.c          |    0
>  drivers/net/{ => ethernet/motorola}/82596.c        |    0
>  drivers/net/ethernet/motorola/Kconfig              |   88 +
>  drivers/net/ethernet/motorola/Makefile             |   13 +
>  drivers/net/{ => ethernet/motorola}/fec.c          |    0
>  drivers/net/{ => ethernet/motorola}/fec.h          |    0
>  drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c  |    0
>  drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h  |    0
>  .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c  |    0
>  drivers/net/ethernet/myricom/Kconfig               |   42 +
>  drivers/net/ethernet/myricom/Makefile              |    5 +
>  .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
>  .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    0
>  .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
>  .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
>  drivers/net/ethernet/natsemi/Kconfig               |   63 +
>  drivers/net/ethernet/natsemi/Makefile              |    9 +
>  drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    0
>  drivers/net/{ => ethernet/natsemi}/macsonic.c      |    0
>  drivers/net/{ => ethernet/natsemi}/natsemi.c       |    0
>  drivers/net/{ => ethernet/natsemi}/ns83820.c       |    0
>  drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
>  drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
>  drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    0
>  drivers/net/ethernet/neterion/Kconfig              |   50 +
>  drivers/net/ethernet/neterion/Makefile             |    6 +
>  drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
>  drivers/net/{ => ethernet/neterion}/s2io.c         |    0
>  drivers/net/{ => ethernet/neterion}/s2io.h         |    0
>  drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
>  .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
>  .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
>  .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
>  .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
>  .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    0
>  .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
>  .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
>  .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
>  .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
>  .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
>  drivers/net/{ => ethernet}/netx-eth.c              |    0
>  drivers/net/{ => ethernet}/octeon/Kconfig          |    0
>  drivers/net/{ => ethernet}/octeon/Makefile         |    0
>  drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    0
>  drivers/net/ethernet/oki/Kconfig                   |   18 +
>  drivers/net/ethernet/oki/Makefile                  |    5 +
>  drivers/net/ethernet/oki/pch_gbe/Kconfig           |   20 +
>  drivers/net/{ => ethernet/oki}/pch_gbe/Makefile    |    0
>  drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe.h   |    0
>  .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.c   |    0
>  .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.h   |    0
>  .../{ => ethernet/oki}/pch_gbe/pch_gbe_ethtool.c   |    0
>  .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_main.c  |    0
>  .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_param.c |    0
>  .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.c   |    0
>  .../net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.h   |    0
>  drivers/net/ethernet/packetengines/Kconfig         |   42 +
>  drivers/net/ethernet/packetengines/Makefile        |    6 +
>  drivers/net/{ => ethernet/packetengines}/hamachi.c |    0
>  .../net/{ => ethernet/packetengines}/yellowfin.c   |    0
>  drivers/net/{ => ethernet}/pasemi_mac.c            |    0
>  drivers/net/{ => ethernet}/pasemi_mac.h            |    0
>  drivers/net/{ => ethernet}/pasemi_mac_ethtool.c    |    0
>  drivers/net/ethernet/qlogic/Kconfig                |   49 +
>  drivers/net/ethernet/qlogic/Makefile               |    8 +
>  drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
>  .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    0
>  .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
>  .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
>  .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
>  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
>  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
>  .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    0
>  .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |    0
>  drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    0
>  drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
>  drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
>  drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |    0
>  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |    0
>  .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |    0
>  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    0
>  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    0
>  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |    0
>  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |    0
>  drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
>  drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
>  drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
>  .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
>  drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    0
>  drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
>  drivers/net/{ => ethernet}/r6040.c                 |    0
>  drivers/net/ethernet/racal/Kconfig                 |   50 +
>  drivers/net/ethernet/racal/Makefile                |    7 +
>  drivers/net/{ => ethernet/racal}/ni5010.c          |    0
>  drivers/net/{ => ethernet/racal}/ni5010.h          |    0
>  drivers/net/{ => ethernet/racal}/ni52.c            |    0
>  drivers/net/{ => ethernet/racal}/ni52.h            |    0
>  drivers/net/{ => ethernet/racal}/ni65.c            |    0
>  drivers/net/{ => ethernet/racal}/ni65.h            |    0
>  drivers/net/ethernet/radisys/Kconfig               |   16 +
>  drivers/net/ethernet/radisys/Makefile              |    5 +
>  drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig |    2 +-
>  .../net/{ => ethernet/radisys}/ixp2000/Makefile    |    0
>  drivers/net/{ => ethernet/radisys}/ixp2000/caleb.c |    0
>  drivers/net/{ => ethernet/radisys}/ixp2000/caleb.h |    0
>  .../net/{ => ethernet/radisys}/ixp2000/enp2611.c   |    0
>  .../{ => ethernet/radisys}/ixp2000/ixp2400-msf.c   |    0
>  .../{ => ethernet/radisys}/ixp2000/ixp2400-msf.h   |    0
>  .../{ => ethernet/radisys}/ixp2000/ixp2400_rx.uc   |    0
>  .../radisys}/ixp2000/ixp2400_rx.ucode              |    0
>  .../{ => ethernet/radisys}/ixp2000/ixp2400_tx.uc   |    0
>  .../radisys}/ixp2000/ixp2400_tx.ucode              |    0
>  .../net/{ => ethernet/radisys}/ixp2000/ixpdev.c    |    0
>  .../net/{ => ethernet/radisys}/ixp2000/ixpdev.h    |    0
>  .../{ => ethernet/radisys}/ixp2000/ixpdev_priv.h   |    0
>  .../net/{ => ethernet/radisys}/ixp2000/pm3386.c    |    0
>  .../net/{ => ethernet/radisys}/ixp2000/pm3386.h    |    0
>  drivers/net/{ => ethernet/realtek}/8139cp.c        |    0
>  drivers/net/{ => ethernet/realtek}/8139too.c       |    0
>  drivers/net/ethernet/realtek/Kconfig               |  110 +
>  drivers/net/ethernet/realtek/Makefile              |    8 +
>  drivers/net/{ => ethernet/realtek}/atp.c           |    0
>  drivers/net/{ => ethernet/realtek}/atp.h           |    0
>  drivers/net/{ => ethernet/realtek}/r8169.c         |    0
>  drivers/net/ethernet/renesas/Kconfig               |   18 +
>  drivers/net/ethernet/renesas/Makefile              |    5 +
>  drivers/net/{ => ethernet/renesas}/sh_eth.c        |    0
>  drivers/net/{ => ethernet/renesas}/sh_eth.h        |    0
>  drivers/net/{ => ethernet}/s6gmac.c                |    0
>  drivers/net/{ => ethernet}/sc92031.c               |    0
>  drivers/net/{ => ethernet}/sfc/Kconfig             |    0
>  drivers/net/{ => ethernet}/sfc/Makefile            |    0
>  drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
>  drivers/net/{ => ethernet}/sfc/efx.c               |    0
>  drivers/net/{ => ethernet}/sfc/efx.h               |    0
>  drivers/net/{ => ethernet}/sfc/enum.h              |    0
>  drivers/net/{ => ethernet}/sfc/ethtool.c           |    0
>  drivers/net/{ => ethernet}/sfc/falcon.c            |    0
>  drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
>  drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
>  drivers/net/{ => ethernet}/sfc/filter.c            |    0
>  drivers/net/{ => ethernet}/sfc/filter.h            |    0
>  drivers/net/{ => ethernet}/sfc/io.h                |    0
>  drivers/net/{ => ethernet}/sfc/mac.h               |    0
>  drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
>  drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
>  drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
>  drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
>  drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
>  drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
>  drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
>  drivers/net/{ => ethernet}/sfc/mtd.c               |    0
>  drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
>  drivers/net/{ => ethernet}/sfc/nic.c               |    0
>  drivers/net/{ => ethernet}/sfc/nic.h               |    0
>  drivers/net/{ => ethernet}/sfc/phy.h               |    0
>  drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
>  drivers/net/{ => ethernet}/sfc/regs.h              |    0
>  drivers/net/{ => ethernet}/sfc/rx.c                |    0
>  drivers/net/{ => ethernet}/sfc/selftest.c          |    0
>  drivers/net/{ => ethernet}/sfc/selftest.h          |    0
>  drivers/net/{ => ethernet}/sfc/siena.c             |    0
>  drivers/net/{ => ethernet}/sfc/spi.h               |    0
>  drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
>  drivers/net/{ => ethernet}/sfc/tx.c                |    0
>  drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
>  drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
>  drivers/net/ethernet/sgi/Kconfig                   |   37 +
>  drivers/net/ethernet/sgi/Makefile                  |    7 +
>  drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    0
>  drivers/net/{ => ethernet/sgi}/meth.c              |    0
>  drivers/net/{ => ethernet/sgi}/meth.h              |    0
>  drivers/net/{ => ethernet/sgi}/sgiseeq.c           |    0
>  drivers/net/{ => ethernet/sgi}/sgiseeq.h           |    0
>  drivers/net/ethernet/sis/Kconfig                   |   46 +
>  drivers/net/ethernet/sis/Makefile                  |    6 +
>  drivers/net/{ => ethernet/sis}/sis190.c            |    0
>  drivers/net/{ => ethernet/sis}/sis900.c            |    0
>  drivers/net/{ => ethernet/sis}/sis900.h            |    0
>  drivers/net/ethernet/smc/Kconfig                   |   61 +
>  drivers/net/ethernet/smc/Makefile                  |    7 +
>  drivers/net/{ => ethernet/smc}/epic100.c           |    0
>  drivers/net/{ => ethernet/smc}/smc9194.c           |    0
>  drivers/net/{ => ethernet/smc}/smc9194.h           |    0
>  drivers/net/{ => ethernet/smc}/smc91x.c            |    0
>  drivers/net/{ => ethernet/smc}/smc91x.h            |    0
>  drivers/net/ethernet/smsc/Kconfig                  |   71 +
>  drivers/net/ethernet/smsc/Makefile                 |    7 +
>  drivers/net/{ => ethernet/smsc}/smc911x.c          |    0
>  drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
>  drivers/net/{ => ethernet/smsc}/smsc911x.c         |    0
>  drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
>  drivers/net/{ => ethernet/smsc}/smsc9420.c         |    0
>  drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
>  drivers/net/ethernet/sony/Kconfig                  |   38 +
>  drivers/net/ethernet/sony/Makefile                 |    7 +
>  drivers/net/{ => ethernet/sony}/ps3_gelic_net.c    |    0
>  drivers/net/{ => ethernet/sony}/ps3_gelic_net.h    |    0
>  .../net/{ => ethernet/sony}/ps3_gelic_wireless.c   |    0
>  .../net/{ => ethernet/sony}/ps3_gelic_wireless.h   |    0
>  drivers/net/{ => ethernet}/starfire.c              |    0
>  drivers/net/ethernet/stmicro/Kconfig               |   18 +
>  drivers/net/ethernet/stmicro/Makefile              |    5 +
>  drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +-
>  drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
>  drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
>  drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
>  .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
>  .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
>  .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
>  .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
>  .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
>  .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
>  .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
>  .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
>  .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
>  .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
>  drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
>  .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
>  .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |    0
>  .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
>  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
>  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
>  drivers/net/ethernet/sun/Kconfig                   |   91 +
>  drivers/net/ethernet/sun/Makefile                  |   12 +
>  drivers/net/{ => ethernet/sun}/cassini.c           |    0
>  drivers/net/{ => ethernet/sun}/cassini.h           |    0
>  drivers/net/{ => ethernet/sun}/niu.c               |    0
>  drivers/net/{ => ethernet/sun}/niu.h               |    0
>  drivers/net/{ => ethernet/sun}/sun3_82586.c        |    0
>  drivers/net/{ => ethernet/sun}/sun3_82586.h        |    0
>  drivers/net/{ => ethernet/sun}/sunbmac.c           |    0
>  drivers/net/{ => ethernet/sun}/sunbmac.h           |    0
>  drivers/net/{ => ethernet/sun}/sungem.c            |    0
>  drivers/net/{ => ethernet/sun}/sungem.h            |    0
>  drivers/net/{ => ethernet/sun}/sungem_phy.c        |    0
>  drivers/net/{ => ethernet/sun}/sungem_phy.h        |    0
>  drivers/net/{ => ethernet/sun}/sunhme.c            |    0
>  drivers/net/{ => ethernet/sun}/sunhme.h            |    0
>  drivers/net/{ => ethernet/sun}/sunqe.c             |    0
>  drivers/net/{ => ethernet/sun}/sunqe.h             |    0
>  drivers/net/{ => ethernet/sun}/sunvnet.c           |    0
>  drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
>  drivers/net/{ => ethernet}/sundance.c              |    0
>  drivers/net/ethernet/syskonnect/Kconfig            |   74 +
>  drivers/net/ethernet/syskonnect/Makefile           |    6 +
>  drivers/net/{ => ethernet/syskonnect}/skge.c       |    0
>  drivers/net/{ => ethernet/syskonnect}/skge.h       |    0
>  drivers/net/{ => ethernet/syskonnect}/sky2.c       |    0
>  drivers/net/{ => ethernet/syskonnect}/sky2.h       |    0
>  drivers/net/{ => ethernet}/tehuti.c                |    0
>  drivers/net/{ => ethernet}/tehuti.h                |    0
>  drivers/net/ethernet/ti/Kconfig                    |   41 +
>  drivers/net/ethernet/ti/Makefile                   |    6 +
>  drivers/net/{ => ethernet/ti}/cpmac.c              |    0
>  drivers/net/{ => ethernet/ti}/tlan.c               |    0
>  drivers/net/{ => ethernet/ti}/tlan.h               |    0
>  drivers/net/{ => ethernet}/tsi108_eth.c            |    0
>  drivers/net/{ => ethernet}/tsi108_eth.h            |    0
>  drivers/net/{ => ethernet}/tulip/21142.c           |    0
>  drivers/net/{ => ethernet}/tulip/Kconfig           |   34 +-
>  drivers/net/{ => ethernet}/tulip/Makefile          |    0
>  drivers/net/{ => ethernet}/tulip/de2104x.c         |    0
>  drivers/net/{ => ethernet}/tulip/de4x5.c           |    0
>  drivers/net/{ => ethernet}/tulip/de4x5.h           |    0
>  drivers/net/{ => ethernet}/tulip/dmfe.c            |    0
>  drivers/net/{ => ethernet}/tulip/eeprom.c          |    0
>  drivers/net/{ => ethernet}/tulip/interrupt.c       |    0
>  drivers/net/{ => ethernet}/tulip/media.c           |    0
>  drivers/net/{ => ethernet}/tulip/pnic.c            |    0
>  drivers/net/{ => ethernet}/tulip/pnic2.c           |    0
>  drivers/net/{ => ethernet}/tulip/timer.c           |    0
>  drivers/net/{ => ethernet}/tulip/tulip.h           |    0
>  drivers/net/{ => ethernet}/tulip/tulip_core.c      |    0
>  drivers/net/{ => ethernet}/tulip/uli526x.c         |    0
>  drivers/net/{ => ethernet}/tulip/winbond-840.c     |    0
>  drivers/net/{ => ethernet}/tulip/xircom_cb.c       |    0
>  drivers/net/ethernet/via/Kconfig                   |   52 +
>  drivers/net/ethernet/via/Makefile                  |    6 +
>  drivers/net/{ => ethernet/via}/via-rhine.c         |    0
>  drivers/net/{ => ethernet/via}/via-velocity.c      |    0
>  drivers/net/{ => ethernet/via}/via-velocity.h      |    0
>  drivers/net/ethernet/xilinx/Kconfig                |   31 +
>  drivers/net/ethernet/xilinx/Makefile               |    7 +
>  drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
>  drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    0
>  drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
>  .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
>  drivers/net/pcmcia/Kconfig                         |   39 -
>  drivers/net/pcmcia/Makefile                        |    4 -
>  drivers/scsi/bnx2fc/bnx2fc.h                       |    2 +-
>  drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
>  drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
>  drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
>  872 files changed, 4096 insertions(+), 3223 deletions(-)
>  delete mode 100644 drivers/net/arm/Kconfig
>  delete mode 100644 drivers/net/benet/Kconfig
>  rename drivers/net/{ => ethernet/3com}/3c501.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
>  rename drivers/net/{ => ethernet/3com}/3c503.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c503.h (100%)
>  rename drivers/net/{ => ethernet/3com}/3c505.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c505.h (100%)
>  rename drivers/net/{ => ethernet/3com}/3c507.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c509.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c515.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c523.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c523.h (100%)
>  rename drivers/net/{ => ethernet/3com}/3c527.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c527.h (100%)
>  rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (100%)
>  rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (100%)
>  rename drivers/net/{ => ethernet/3com}/3c59x.c (100%)
>  create mode 100644 drivers/net/ethernet/3com/Kconfig
>  create mode 100644 drivers/net/ethernet/3com/Makefile
>  rename drivers/net/{ => ethernet/3com}/acenic.c (100%)
>  rename drivers/net/{ => ethernet/3com}/acenic.h (100%)
>  rename drivers/net/{ => ethernet/3com}/typhoon.c (100%)
>  rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
>  rename drivers/net/{ => ethernet/8390}/8390.c (100%)
>  rename drivers/net/{ => ethernet/8390}/8390.h (100%)
>  rename drivers/net/{ => ethernet/8390}/8390p.c (100%)
>  create mode 100644 drivers/net/ethernet/8390/Kconfig
>  create mode 100644 drivers/net/ethernet/8390/Makefile
>  rename drivers/net/{ => ethernet/8390}/ac3200.c (100%)
>  rename drivers/net/{ => ethernet/8390}/apne.c (100%)
>  rename drivers/net/{ => ethernet/8390}/ax88796.c (100%)
>  rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
>  rename drivers/net/{ => ethernet/8390}/e2100.c (100%)
>  rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
>  rename drivers/net/{ => ethernet/8390}/hp-plus.c (100%)
>  rename drivers/net/{ => ethernet/8390}/hp.c (100%)
>  rename drivers/net/{ => ethernet/8390}/hydra.c (100%)
>  rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
>  rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
>  rename drivers/net/{ => ethernet/8390}/mac8390.c (100%)
>  rename drivers/net/{ => ethernet/8390}/ne-h8300.c (100%)
>  rename drivers/net/{ => ethernet/8390}/ne.c (100%)
>  rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
>  rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (100%)
>  rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
>  rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
>  rename drivers/net/{ => ethernet/8390}/smc-mca.c (100%)
>  rename drivers/net/{ => ethernet/8390}/smc-ultra.c (100%)
>  rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (100%)
>  rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
>  rename drivers/net/{ => ethernet/8390}/wd.c (100%)
>  rename drivers/net/{ => ethernet/8390}/zorro8390.c (100%)
>  create mode 100644 drivers/net/ethernet/Kconfig
>  create mode 100644 drivers/net/ethernet/Makefile
>  rename drivers/net/{ => ethernet}/a2065.c (100%)
>  rename drivers/net/{ => ethernet}/a2065.h (100%)
>  create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
>  create mode 100644 drivers/net/ethernet/aeroflex/Makefile
>  rename drivers/net/{ => ethernet/aeroflex}/greth.c (100%)
>  rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
>  rename drivers/net/{ => ethernet/amd}/7990.c (100%)
>  rename drivers/net/{ => ethernet/amd}/7990.h (100%)
>  create mode 100644 drivers/net/ethernet/amd/Kconfig
>  create mode 100644 drivers/net/ethernet/amd/Makefile
>  rename drivers/net/{ => ethernet/amd}/amd8111e.c (100%)
>  rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
>  rename drivers/net/{ => ethernet/amd}/atarilance.c (100%)
>  rename drivers/net/{ => ethernet/amd}/declance.c (100%)
>  rename drivers/net/{ => ethernet/amd}/hplance.c (100%)
>  rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
>  rename drivers/net/{ => ethernet/amd}/lance.c (100%)
>  rename drivers/net/{ => ethernet/amd}/mvme147.c (100%)
>  rename drivers/net/{ => ethernet/amd}/pcnet32.c (100%)
>  rename drivers/net/{ => ethernet/amd}/sun3lance.c (100%)
>  rename drivers/net/{ => ethernet/amd}/sunlance.c (100%)
>  create mode 100644 drivers/net/ethernet/apple/Kconfig
>  create mode 100644 drivers/net/ethernet/apple/Makefile
>  rename drivers/net/{ => ethernet/apple}/bmac.c (100%)
>  rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
>  rename drivers/net/{ => ethernet/apple}/cs89x0.c (100%)
>  rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
>  rename drivers/net/{ => ethernet/apple}/mac89x0.c (100%)
>  rename drivers/net/{ => ethernet/apple}/mace.c (100%)
>  rename drivers/net/{ => ethernet/apple}/mace.h (100%)
>  rename drivers/net/{ => ethernet/apple}/macmace.c (100%)
>  rename drivers/net/{ => ethernet}/ariadne.c (100%)
>  rename drivers/net/{ => ethernet}/ariadne.h (100%)
>  create mode 100644 drivers/net/ethernet/arm/Kconfig
>  rename drivers/net/{ => ethernet}/arm/Makefile (74%)
>  rename drivers/net/{ => ethernet}/arm/am79c961a.c (100%)
>  rename drivers/net/{ => ethernet}/arm/am79c961a.h (100%)
>  rename drivers/net/{ => ethernet}/arm/at91_ether.c (100%)
>  rename drivers/net/{ => ethernet}/arm/at91_ether.h (100%)
>  rename drivers/net/{ => ethernet/arm}/davinci_cpdma.c (100%)
>  rename drivers/net/{ => ethernet/arm}/davinci_cpdma.h (100%)
>  rename drivers/net/{ => ethernet/arm}/davinci_emac.c (100%)
>  rename drivers/net/{ => ethernet/arm}/davinci_mdio.c (100%)
>  rename drivers/net/{ => ethernet}/arm/ep93xx_eth.c (100%)
>  rename drivers/net/{ => ethernet}/arm/ether1.c (100%)
>  rename drivers/net/{ => ethernet}/arm/ether1.h (100%)
>  rename drivers/net/{ => ethernet}/arm/ether3.c (100%)
>  rename drivers/net/{ => ethernet}/arm/ether3.h (100%)
>  rename drivers/net/{ => ethernet}/arm/etherh.c (100%)
>  rename drivers/net/{ => ethernet}/arm/ixp4xx_eth.c (100%)
>  rename drivers/net/{ => ethernet}/arm/ks8695net.c (100%)
>  rename drivers/net/{ => ethernet}/arm/ks8695net.h (100%)
>  rename drivers/net/{ => ethernet}/arm/w90p910_ether.c (100%)
>  rename drivers/net/{ => ethernet}/at1700.c (100%)
>  create mode 100644 drivers/net/ethernet/atheros/Kconfig
>  create mode 100644 drivers/net/ethernet/atheros/Makefile
>  rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
>  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
>  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
>  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
>  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
>  create mode 100644 drivers/net/ethernet/atmel/Kconfig
>  create mode 100644 drivers/net/ethernet/atmel/Makefile
>  rename drivers/net/{ => ethernet/atmel}/macb.c (100%)
>  rename drivers/net/{ => ethernet/atmel}/macb.h (100%)
>  create mode 100644 drivers/net/ethernet/blackfin/Kconfig
>  create mode 100644 drivers/net/ethernet/blackfin/Makefile
>  rename drivers/net/{ => ethernet/blackfin}/bfin_mac.c (100%)
>  rename drivers/net/{ => ethernet/blackfin}/bfin_mac.h (100%)
>  create mode 100644 drivers/net/ethernet/broadcom/Kconfig
>  create mode 100644 drivers/net/ethernet/broadcom/Makefile
>  rename drivers/net/{ => ethernet/broadcom}/b44.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
>  rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
>  rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/tg3.c (100%)
>  rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%)
>  create mode 100644 drivers/net/ethernet/brocade/Kconfig
>  create mode 100644 drivers/net/ethernet/brocade/Makefile
>  create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
>  rename drivers/net/{ => ethernet/brocade}/bna/Makefile (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_sm.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfa_wc.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bna.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bna_hw.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/cna.h (100%)
>  rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
>  create mode 100644 drivers/net/ethernet/chelsio/Kconfig
>  create mode 100644 drivers/net/ethernet/chelsio/Makefile
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
>  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
>  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
>  create mode 100644 drivers/net/ethernet/cisco/Kconfig
>  create mode 100644 drivers/net/ethernet/cisco/Makefile
>  create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
>  rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
>  rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
>  create mode 100644 drivers/net/ethernet/davicom/Kconfig
>  create mode 100644 drivers/net/ethernet/davicom/Makefile
>  rename drivers/net/{ => ethernet/davicom}/dm9000.c (100%)
>  rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
>  rename drivers/net/{ => ethernet}/depca.c (100%)
>  rename drivers/net/{ => ethernet}/depca.h (100%)
>  create mode 100644 drivers/net/ethernet/dlink/Kconfig
>  create mode 100644 drivers/net/ethernet/dlink/Makefile
>  rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
>  rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
>  rename drivers/net/{ => ethernet/dlink}/de620.c (100%)
>  rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
>  rename drivers/net/{ => ethernet/dlink}/dl2k.c (100%)
>  rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)
>  rename drivers/net/{ => ethernet}/dnet.c (100%)
>  rename drivers/net/{ => ethernet}/dnet.h (100%)
>  create mode 100644 drivers/net/ethernet/emulex/Kconfig
>  create mode 100644 drivers/net/ethernet/emulex/Makefile
>  create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
>  rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
>  rename drivers/net/{ => ethernet/emulex}/benet/be.h (100%)
>  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (100%)
>  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (100%)
>  rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (100%)
>  rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (100%)
>  rename drivers/net/{ => ethernet}/enc28j60.c (100%)
>  rename drivers/net/{ => ethernet}/enc28j60_hw.h (100%)
>  rename drivers/net/{ => ethernet}/ethoc.c (100%)
>  create mode 100644 drivers/net/ethernet/faraday/Kconfig
>  create mode 100644 drivers/net/ethernet/faraday/Makefile
>  rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
>  rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
>  rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
>  rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
>  rename drivers/net/{ => ethernet}/fealnx.c (100%)
>  rename drivers/net/{ => ethernet}/forcedeth.c (100%)
>  create mode 100644 drivers/net/ethernet/freescale/Kconfig
>  create mode 100644 drivers/net/ethernet/freescale/Makefile
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
>  rename drivers/net/{ => ethernet/freescale}/gianfar.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
>  rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (100%)
>  rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
>  rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
>  rename drivers/net/{ => ethernet}/hp100.c (100%)
>  rename drivers/net/{ => ethernet}/hp100.h (100%)
>  create mode 100644 drivers/net/ethernet/ibm/Kconfig
>  create mode 100644 drivers/net/ethernet/ibm/Makefile
>  rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
>  rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig (97%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/Makefile (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibmlana.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibmlana.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
>  rename drivers/net/{ => ethernet/ibm}/spider_net.c (100%)
>  rename drivers/net/{ => ethernet/ibm}/spider_net.h (99%)
>  rename drivers/net/{ => ethernet/ibm}/spider_net_ethtool.c (100%)
>  create mode 100644 drivers/net/ethernet/icplus/Kconfig
>  create mode 100644 drivers/net/ethernet/icplus/Makefile
>  rename drivers/net/{ => ethernet/icplus}/ipg.c (100%)
>  rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
>  create mode 100644 drivers/net/ethernet/intel/Kconfig
>  create mode 100644 drivers/net/ethernet/intel/Makefile
>  rename drivers/net/{ => ethernet/intel}/e100.c (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
>  rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (99%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (92%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
>  rename drivers/net/{e1000e/e1000.h => ethernet/intel/e1000e/e1000e.h} (100%)
>  rename drivers/net/{e1000e/netdev.c => ethernet/intel/e1000e/e1000e_main.c} (99%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (99%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (99%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/param.c (99%)
>  rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (99%)
>  rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
>  rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
>  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
>  create mode 100644 drivers/net/ethernet/isa/Kconfig
>  create mode 100644 drivers/net/ethernet/isa/Makefile
>  rename drivers/net/{ => ethernet/isa}/eepro.c (100%)
>  rename drivers/net/{ => ethernet/isa}/eexpress.c (100%)
>  rename drivers/net/{ => ethernet/isa}/eexpress.h (100%)
>  rename drivers/net/{ => ethernet/isa}/eth16i.c (100%)
>  rename drivers/net/{ => ethernet/isa}/ewrk3.c (100%)
>  rename drivers/net/{ => ethernet/isa}/ewrk3.h (100%)
>  rename drivers/net/{ => ethernet/isa}/lp486e.c (100%)
>  rename drivers/net/{ => ethernet/isa}/seeq8005.c (100%)
>  rename drivers/net/{ => ethernet/isa}/seeq8005.h (100%)
>  rename drivers/net/{ => ethernet/isa}/znet.c (100%)
>  rename drivers/net/{ => ethernet}/jme.c (100%)
>  rename drivers/net/{ => ethernet}/jme.h (100%)
>  rename drivers/net/{ => ethernet}/korina.c (100%)
>  create mode 100644 drivers/net/ethernet/marvell/Kconfig
>  create mode 100644 drivers/net/ethernet/marvell/Makefile
>  rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (100%)
>  rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
>  create mode 100644 drivers/net/ethernet/mellanox/Kconfig
>  create mode 100644 drivers/net/ethernet/mellanox/Makefile
>  create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
>  rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
>  create mode 100644 drivers/net/ethernet/micrel/Kconfig
>  create mode 100644 drivers/net/ethernet/micrel/Makefile
>  rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
>  rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
>  rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
>  rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
>  rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
>  create mode 100644 drivers/net/ethernet/mips/Kconfig
>  create mode 100644 drivers/net/ethernet/mips/Makefile
>  rename drivers/net/{ => ethernet/mips}/au1000_eth.c (100%)
>  rename drivers/net/{ => ethernet/mips}/au1000_eth.h (100%)
>  rename drivers/net/{ => ethernet/mips}/lasi_82596.c (100%)
>  rename drivers/net/{ => ethernet/mips}/mipsnet.c (100%)
>  rename drivers/net/{ => ethernet/mips}/sni_82596.c (100%)
>  rename drivers/net/{ => ethernet/mips}/tc35815.c (100%)
>  rename drivers/net/{ => ethernet/motorola}/82596.c (100%)
>  create mode 100644 drivers/net/ethernet/motorola/Kconfig
>  create mode 100644 drivers/net/ethernet/motorola/Makefile
>  rename drivers/net/{ => ethernet/motorola}/fec.c (100%)
>  rename drivers/net/{ => ethernet/motorola}/fec.h (100%)
>  rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c (100%)
>  rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h (100%)
>  rename drivers/net/{ => ethernet/motorola}/fec_mpc52xx_phy.c (100%)
>  create mode 100644 drivers/net/ethernet/myricom/Kconfig
>  create mode 100644 drivers/net/ethernet/myricom/Makefile
>  rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
>  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
>  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
>  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
>  create mode 100644 drivers/net/ethernet/natsemi/Kconfig
>  create mode 100644 drivers/net/ethernet/natsemi/Makefile
>  rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/macsonic.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/natsemi.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/ns83820.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
>  rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
>  rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (100%)
>  create mode 100644 drivers/net/ethernet/neterion/Kconfig
>  create mode 100644 drivers/net/ethernet/neterion/Makefile
>  rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
>  rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
>  rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
>  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
>  rename drivers/net/{ => ethernet}/netx-eth.c (100%)
>  rename drivers/net/{ => ethernet}/octeon/Kconfig (100%)
>  rename drivers/net/{ => ethernet}/octeon/Makefile (100%)
>  rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
>  create mode 100644 drivers/net/ethernet/oki/Kconfig
>  create mode 100644 drivers/net/ethernet/oki/Makefile
>  create mode 100644 drivers/net/ethernet/oki/pch_gbe/Kconfig
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/Makefile (100%)
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe.h (100%)
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.c (100%)
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_api.h (100%)
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_main.c (100%)
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_param.c (100%)
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.c (100%)
>  rename drivers/net/{ => ethernet/oki}/pch_gbe/pch_gbe_phy.h (100%)
>  create mode 100644 drivers/net/ethernet/packetengines/Kconfig
>  create mode 100644 drivers/net/ethernet/packetengines/Makefile
>  rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
>  rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)
>  rename drivers/net/{ => ethernet}/pasemi_mac.c (100%)
>  rename drivers/net/{ => ethernet}/pasemi_mac.h (100%)
>  rename drivers/net/{ => ethernet}/pasemi_mac_ethtool.c (100%)
>  create mode 100644 drivers/net/ethernet/qlogic/Kconfig
>  create mode 100644 drivers/net/ethernet/qlogic/Makefile
>  rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
>  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (100%)
>  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
>  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
>  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (100%)
>  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
>  rename drivers/net/{ => ethernet}/r6040.c (100%)
>  create mode 100644 drivers/net/ethernet/racal/Kconfig
>  create mode 100644 drivers/net/ethernet/racal/Makefile
>  rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
>  rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
>  rename drivers/net/{ => ethernet/racal}/ni52.c (100%)
>  rename drivers/net/{ => ethernet/racal}/ni52.h (100%)
>  rename drivers/net/{ => ethernet/racal}/ni65.c (100%)
>  rename drivers/net/{ => ethernet/racal}/ni65.h (100%)
>  create mode 100644 drivers/net/ethernet/radisys/Kconfig
>  create mode 100644 drivers/net/ethernet/radisys/Makefile
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig (80%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/Makefile (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/caleb.c (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/caleb.h (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/enp2611.c (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400-msf.c (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400-msf.h (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_rx.uc (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_rx.ucode (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_tx.uc (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_tx.ucode (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev.c (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev.h (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev_priv.h (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/pm3386.c (100%)
>  rename drivers/net/{ => ethernet/radisys}/ixp2000/pm3386.h (100%)
>  rename drivers/net/{ => ethernet/realtek}/8139cp.c (100%)
>  rename drivers/net/{ => ethernet/realtek}/8139too.c (100%)
>  create mode 100644 drivers/net/ethernet/realtek/Kconfig
>  create mode 100644 drivers/net/ethernet/realtek/Makefile
>  rename drivers/net/{ => ethernet/realtek}/atp.c (100%)
>  rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
>  rename drivers/net/{ => ethernet/realtek}/r8169.c (100%)
>  create mode 100644 drivers/net/ethernet/renesas/Kconfig
>  create mode 100644 drivers/net/ethernet/renesas/Makefile
>  rename drivers/net/{ => ethernet/renesas}/sh_eth.c (100%)
>  rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
>  rename drivers/net/{ => ethernet}/s6gmac.c (100%)
>  rename drivers/net/{ => ethernet}/sc92031.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/Kconfig (100%)
>  rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
>  rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/efx.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/io.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
>  rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
>  rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
>  create mode 100644 drivers/net/ethernet/sgi/Kconfig
>  create mode 100644 drivers/net/ethernet/sgi/Makefile
>  rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (100%)
>  rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
>  rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
>  rename drivers/net/{ => ethernet/sgi}/sgiseeq.c (100%)
>  rename drivers/net/{ => ethernet/sgi}/sgiseeq.h (100%)
>  create mode 100644 drivers/net/ethernet/sis/Kconfig
>  create mode 100644 drivers/net/ethernet/sis/Makefile
>  rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
>  rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
>  rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
>  create mode 100644 drivers/net/ethernet/smc/Kconfig
>  create mode 100644 drivers/net/ethernet/smc/Makefile
>  rename drivers/net/{ => ethernet/smc}/epic100.c (100%)
>  rename drivers/net/{ => ethernet/smc}/smc9194.c (100%)
>  rename drivers/net/{ => ethernet/smc}/smc9194.h (100%)
>  rename drivers/net/{ => ethernet/smc}/smc91x.c (100%)
>  rename drivers/net/{ => ethernet/smc}/smc91x.h (100%)
>  create mode 100644 drivers/net/ethernet/smsc/Kconfig
>  create mode 100644 drivers/net/ethernet/smsc/Makefile
>  rename drivers/net/{ => ethernet/smsc}/smc911x.c (100%)
>  rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
>  rename drivers/net/{ => ethernet/smsc}/smsc911x.c (100%)
>  rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
>  rename drivers/net/{ => ethernet/smsc}/smsc9420.c (100%)
>  rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
>  create mode 100644 drivers/net/ethernet/sony/Kconfig
>  create mode 100644 drivers/net/ethernet/sony/Makefile
>  rename drivers/net/{ => ethernet/sony}/ps3_gelic_net.c (100%)
>  rename drivers/net/{ => ethernet/sony}/ps3_gelic_net.h (100%)
>  rename drivers/net/{ => ethernet/sony}/ps3_gelic_wireless.c (100%)
>  rename drivers/net/{ => ethernet/sony}/ps3_gelic_wireless.h (100%)
>  rename drivers/net/{ => ethernet}/starfire.c (100%)
>  create mode 100644 drivers/net/ethernet/stmicro/Kconfig
>  create mode 100644 drivers/net/ethernet/stmicro/Makefile
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (92%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
>  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
>  create mode 100644 drivers/net/ethernet/sun/Kconfig
>  create mode 100644 drivers/net/ethernet/sun/Makefile
>  rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
>  rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
>  rename drivers/net/{ => ethernet/sun}/niu.c (100%)
>  rename drivers/net/{ => ethernet/sun}/niu.h (100%)
>  rename drivers/net/{ => ethernet/sun}/sun3_82586.c (100%)
>  rename drivers/net/{ => ethernet/sun}/sun3_82586.h (100%)
>  rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
>  rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
>  rename drivers/net/{ => ethernet/sun}/sungem.c (100%)
>  rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
>  rename drivers/net/{ => ethernet/sun}/sungem_phy.c (100%)
>  rename drivers/net/{ => ethernet/sun}/sungem_phy.h (100%)
>  rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
>  rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
>  rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
>  rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
>  rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
>  rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
>  rename drivers/net/{ => ethernet}/sundance.c (100%)
>  create mode 100644 drivers/net/ethernet/syskonnect/Kconfig
>  create mode 100644 drivers/net/ethernet/syskonnect/Makefile
>  rename drivers/net/{ => ethernet/syskonnect}/skge.c (100%)
>  rename drivers/net/{ => ethernet/syskonnect}/skge.h (100%)
>  rename drivers/net/{ => ethernet/syskonnect}/sky2.c (100%)
>  rename drivers/net/{ => ethernet/syskonnect}/sky2.h (100%)
>  rename drivers/net/{ => ethernet}/tehuti.c (100%)
>  rename drivers/net/{ => ethernet}/tehuti.h (100%)
>  create mode 100644 drivers/net/ethernet/ti/Kconfig
>  create mode 100644 drivers/net/ethernet/ti/Makefile
>  rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
>  rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
>  rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
>  rename drivers/net/{ => ethernet}/tsi108_eth.c (100%)
>  rename drivers/net/{ => ethernet}/tsi108_eth.h (100%)
>  rename drivers/net/{ => ethernet}/tulip/21142.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/Kconfig (93%)
>  rename drivers/net/{ => ethernet}/tulip/Makefile (100%)
>  rename drivers/net/{ => ethernet}/tulip/de2104x.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/de4x5.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/de4x5.h (100%)
>  rename drivers/net/{ => ethernet}/tulip/dmfe.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/eeprom.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/interrupt.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/media.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/pnic.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/pnic2.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/timer.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/tulip.h (100%)
>  rename drivers/net/{ => ethernet}/tulip/tulip_core.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/uli526x.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/winbond-840.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/xircom_cb.c (100%)
>  create mode 100644 drivers/net/ethernet/via/Kconfig
>  create mode 100644 drivers/net/ethernet/via/Makefile
>  rename drivers/net/{ => ethernet/via}/via-rhine.c (100%)
>  rename drivers/net/{ => ethernet/via}/via-velocity.c (100%)
>  rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
>  create mode 100644 drivers/net/ethernet/xilinx/Kconfig
>  create mode 100644 drivers/net/ethernet/xilinx/Makefile
>  rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
>  rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
>  rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
>  rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)

Thank you everyone for the input and suggested changes.  I will start
the work to re-work the patch series and hope to have the re-worked
patches ready by next weekend.

Cheers,
Jeff

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 56/72] macb: Move the Atmel driver
  2011-06-25 13:59 ` [RFC 56/72] macb: Move the Atmel driver Jeff Kirsher
@ 2011-06-27  7:46   ` Nicolas Ferre
  2011-06-27  9:29     ` Jamie Iles
  0 siblings, 1 reply; 135+ messages in thread
From: Nicolas Ferre @ 2011-06-27  7:46 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Jamie Iles

Hi,

Le 25/06/2011 15:59, Jeff Kirsher :
> Move the Atmel driver into drivers/net/ethernet/atmel/ and

I am not sure that "atmel" is the proper name for a directory containing
the macb.c driver. This controller has not been made by atmel and will
be shared with others soon (Cf. paches by Jamie Iles).

So two questions remains:
- will we need to have a directory for this driver?
- what will be the name of this directory?

Best regards,

> make the necessary Kconfig and Makefile changes.
> 
> CC: Nicolas Ferre <nicolas.ferre@atmel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                             |    2 +-
>  drivers/net/Kconfig                     |   14 -------------
>  drivers/net/Makefile                    |    1 -
>  drivers/net/ethernet/Kconfig            |    1 +
>  drivers/net/ethernet/Makefile           |    1 +
>  drivers/net/ethernet/atmel/Kconfig      |   32 +++++++++++++++++++++++++++++++
>  drivers/net/ethernet/atmel/Makefile     |    5 ++++
>  drivers/net/{ => ethernet/atmel}/macb.c |    0
>  drivers/net/{ => ethernet/atmel}/macb.h |    0
>  9 files changed, 40 insertions(+), 16 deletions(-)
>  create mode 100644 drivers/net/ethernet/atmel/Kconfig
>  create mode 100644 drivers/net/ethernet/atmel/Makefile
>  rename drivers/net/{ => ethernet/atmel}/macb.c (100%)
>  rename drivers/net/{ => ethernet/atmel}/macb.h (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 506d4d0..9ddb715 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1303,7 +1303,7 @@ F:	include/video/atmel_lcdc.h
>  ATMEL MACB ETHERNET DRIVER
>  M:	Nicolas Ferre <nicolas.ferre@atmel.com>
>  S:	Supported
> -F:	drivers/net/macb.*
> +F:	drivers/net/ethernet/atmel/
>  
>  ATMEL SPI DRIVER
>  M:	Nicolas Ferre <nicolas.ferre@atmel.com>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 9709106..7063b9c 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -2,9 +2,6 @@
>  # Network device configuration
>  #
>  
> -config HAVE_NET_MACB
> -	bool
> -
>  menuconfig NETDEVICES
>  	default y if UML
>  	depends on NET
> @@ -224,17 +221,6 @@ menuconfig NET_ETHERNET
>  
>  if NET_ETHERNET
>  
> -config MACB
> -	tristate "Atmel MACB support"
> -	depends on HAVE_NET_MACB
> -	select PHYLIB
> -	help
> -	  The Atmel MACB ethernet interface is found on many AT32 and AT91
> -	  parts. Say Y to include support for the MACB chip.
> -
> -	  To compile this driver as a module, choose M here: the module
> -	  will be called macb.
> -
>  config SH_ETH
>  	tristate "Renesas SuperH Ethernet support"
>  	depends on SUPERH && \
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 5c189ab..a2a1e0a 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -68,7 +68,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
>  obj-$(CONFIG_GRETH) += greth.o
>  
>  obj-$(CONFIG_DNET) += dnet.o
> -obj-$(CONFIG_MACB) += macb.o
>  
>  obj-$(CONFIG_DEV_APPLETALK) += appletalk/
>  obj-$(CONFIG_ETHERNET) += ethernet/
> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> index fede911..e7c5f0b 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -39,6 +39,7 @@ config ARIADNE
>  
>  source "drivers/net/ethernet/arm/Kconfig"
>  source "drivers/net/ethernet/atheros/Kconfig"
> +source "drivers/net/ethernet/atmel/Kconfig"
>  source "drivers/net/ethernet/blackfin/Kconfig"
>  source "drivers/net/ethernet/broadcom/Kconfig"
>  source "drivers/net/ethernet/brocade/Kconfig"
> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> index b8cc6ef..6c69e98 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
>  obj-$(CONFIG_ARIADNE) += ariadne.o
>  obj-$(CONFIG_NET_ARM) += arm/
>  obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
> +obj-$(CONFIG_NET_ATMEL) += atmel/
>  obj-$(CONFIG_NET_BFIN) += blackfin/
>  obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
>  obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
> diff --git a/drivers/net/ethernet/atmel/Kconfig b/drivers/net/ethernet/atmel/Kconfig
> new file mode 100644
> index 0000000..a8c11ea
> --- /dev/null
> +++ b/drivers/net/ethernet/atmel/Kconfig
> @@ -0,0 +1,32 @@
> +#
> +# Atmel device configuration
> +#
> +
> +config HAVE_NET_MACB
> +	bool
> +
> +config NET_ATMEL
> +	bool "Atmel devices"
> +	depends on HAVE_NET_MACB
> +	---help---
> +	  If you have a network (Ethernet) card belonging to this class, say Y.
> +	  Make sure you know the name of your card. Read the Ethernet-HOWTO,
> +	  available from <http://www.tldp.org/docs.html#howto>.
> +
> +	  If unsure, say Y.
> +
> +	  Note that the answer to this question doesn't directly affect the
> +	  kernel: saying N will just cause the configurator to skip all
> +	  the remaining Atmel network card questions. If you say Y, you will be
> +	  asked for your specific card in the following questions.
> +
> +config MACB
> +	tristate "Atmel MACB support"
> +	depends on NET_ATMEL && HAVE_NET_MACB
> +	select PHYLIB
> +	---help---
> +	  The Atmel MACB ethernet interface is found on many AT32 and AT91
> +	  parts. Say Y to include support for the MACB chip.
> +
> +	  To compile this driver as a module, choose M here: the module
> +	  will be called macb.
> diff --git a/drivers/net/ethernet/atmel/Makefile b/drivers/net/ethernet/atmel/Makefile
> new file mode 100644
> index 0000000..91f79b1
> --- /dev/null
> +++ b/drivers/net/ethernet/atmel/Makefile
> @@ -0,0 +1,5 @@
> +#
> +# Makefile for the Atmel network device drivers.
> +#
> +
> +obj-$(CONFIG_MACB) += macb.o
> diff --git a/drivers/net/macb.c b/drivers/net/ethernet/atmel/macb.c
> similarity index 100%
> rename from drivers/net/macb.c
> rename to drivers/net/ethernet/atmel/macb.c
> diff --git a/drivers/net/macb.h b/drivers/net/ethernet/atmel/macb.h
> similarity index 100%
> rename from drivers/net/macb.h
> rename to drivers/net/ethernet/atmel/macb.h


-- 
Nicolas Ferre


^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 56/72] macb: Move the Atmel driver
  2011-06-27  7:46   ` Nicolas Ferre
@ 2011-06-27  9:29     ` Jamie Iles
  0 siblings, 0 replies; 135+ messages in thread
From: Jamie Iles @ 2011-06-27  9:29 UTC (permalink / raw)
  To: Nicolas Ferre; +Cc: Jeff Kirsher, davem, netdev, Jamie Iles

On Mon, Jun 27, 2011 at 09:46:58AM +0200, Nicolas Ferre wrote:
> Hi,
> 
> Le 25/06/2011 15:59, Jeff Kirsher :
> > Move the Atmel driver into drivers/net/ethernet/atmel/ and
> 
> I am not sure that "atmel" is the proper name for a directory containing
> the macb.c driver. This controller has not been made by atmel and will
> be shared with others soon (Cf. paches by Jamie Iles).
> 
> So two questions remains:
> - will we need to have a directory for this driver?
> - what will be the name of this directory?

The MACB is actually a Cadence IP block and I have a set of patches that 
add support for the Cadence GEM	so personally I'd be happy with 
drivers/net/ethernet/cadence.

Jamie

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 69/72] dm9000: Move the Davicom driver
  2011-06-25 13:59 ` [RFC 69/72] dm9000: Move the Davicom driver Jeff Kirsher
@ 2011-06-27  9:45   ` Sascha Hauer
  0 siblings, 0 replies; 135+ messages in thread
From: Sascha Hauer @ 2011-06-27  9:45 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Ben Dooks

On Sat, Jun 25, 2011 at 06:59:20AM -0700, Jeff Kirsher wrote:
> Move the Davicom driver into drivers/net/ethernet/davicom/ and
> make the necessary Kconfig and Makefile changes.
> 
> CC: Ben Dooks <ben@simtec.co.uk>
> CC: Sascha Hauer <s.hauer@pengutronix.de>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

> ---
>  drivers/net/Kconfig                         |   28 ------------------------
>  drivers/net/Makefile                        |    1 -
>  drivers/net/ethernet/Kconfig                |    1 +
>  drivers/net/ethernet/Makefile               |    1 +
>  drivers/net/ethernet/davicom/Kconfig        |   31 +++++++++++++++++++++++++++
>  drivers/net/ethernet/davicom/Makefile       |    5 ++++
>  drivers/net/{ => ethernet/davicom}/dm9000.c |    0
>  drivers/net/{ => ethernet/davicom}/dm9000.h |    0
>  8 files changed, 38 insertions(+), 29 deletions(-)
>  create mode 100644 drivers/net/ethernet/davicom/Kconfig
>  create mode 100644 drivers/net/ethernet/davicom/Makefile
>  rename drivers/net/{ => ethernet/davicom}/dm9000.c (100%)
>  rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
> 
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index d1bcd23..4ddc389 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -246,34 +246,6 @@ config NET_NETX
>  	  To compile this driver as a module, choose M here. The module
>  	  will be called netx-eth.
>  
> -config DM9000
> -	tristate "DM9000 support"
> -	depends on ARM || BLACKFIN || MIPS
> -	select CRC32
> -	select MII
> -	---help---
> -	  Support for DM9000 chipset.
> -
> -	  To compile this driver as a module, choose M here.  The module
> -	  will be called dm9000.
> -
> -config DM9000_DEBUGLEVEL
> -	int "DM9000 maximum debug level"
> -	depends on DM9000
> -	default 4
> -	help
> -	  The maximum level of debugging code compiled into the DM9000
> -	  driver.
> -
> -config DM9000_FORCE_SIMPLE_PHY_POLL
> -	bool "Force simple NSR based PHY polling"
> -	depends on DM9000
> -	---help---
> -	  This configuration forces the DM9000 to use the NSR's LinkStatus
> -	  bit to determine if the link is up or down instead of the more
> -	  costly MII PHY reads. Note, this will not work if the chip is
> -	  operating with an external PHY.
> -
>  config NET_PCI
>  	bool "EISA, VLB, PCI and on board controllers"
>  	depends on ISA || EISA || PCI
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index b647529..83075d4 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -53,7 +53,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
>  obj-$(CONFIG_TUN) += tun.o
>  obj-$(CONFIG_VETH) += veth.o
>  obj-$(CONFIG_NET_NETX) += netx-eth.o
> -obj-$(CONFIG_DM9000) += dm9000.o
>  
>  obj-$(CONFIG_DEV_APPLETALK) += appletalk/
>  obj-$(CONFIG_ETHERNET) += ethernet/
> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> index ac88e7c..3ec1903 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -73,6 +73,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
>  source "drivers/net/ethernet/brocade/Kconfig"
>  source "drivers/net/ethernet/chelsio/Kconfig"
>  source "drivers/net/ethernet/cisco/Kconfig"
> +source "drivers/net/ethernet/davicom/Kconfig"
>  
>  config DNET
>  	tristate "Dave ethernet support (DNET)"
> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> index afbb0ff..3b2a35a 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -19,6 +19,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
>  obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
>  obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
>  obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
> +obj-$(CONFIG_DM9000) += davicom/
>  obj-$(CONFIG_DNET) += dnet.o
>  obj-$(CONFIG_DEPCA) += depca.o
>  obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
> diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig
> new file mode 100644
> index 0000000..0a03b0b
> --- /dev/null
> +++ b/drivers/net/ethernet/davicom/Kconfig
> @@ -0,0 +1,31 @@
> +#
> +# Davicom device configuration
> +#
> +
> +config DM9000
> +	tristate "DM9000 support"
> +	depends on ARM || BLACKFIN || MIPS
> +	select CRC32
> +	select MII
> +	---help---
> +	  Support for DM9000 chipset.
> +
> +	  To compile this driver as a module, choose M here.  The module
> +	  will be called dm9000.
> +
> +config DM9000_DEBUGLEVEL
> +	int "DM9000 maximum debug level"
> +	depends on DM9000
> +	default 4
> +	help
> +	  The maximum level of debugging code compiled into the DM9000
> +	  driver.
> +
> +config DM9000_FORCE_SIMPLE_PHY_POLL
> +	bool "Force simple NSR based PHY polling"
> +	depends on DM9000
> +	---help---
> +	  This configuration forces the DM9000 to use the NSR's LinkStatus
> +	  bit to determine if the link is up or down instead of the more
> +	  costly MII PHY reads. Note, this will not work if the chip is
> +	  operating with an external PHY.
> diff --git a/drivers/net/ethernet/davicom/Makefile b/drivers/net/ethernet/davicom/Makefile
> new file mode 100644
> index 0000000..74b31f0
> --- /dev/null
> +++ b/drivers/net/ethernet/davicom/Makefile
> @@ -0,0 +1,5 @@
> +#
> +# Makefile for the Davicom device drivers.
> +#
> +
> +obj-$(CONFIG_DM9000) += dm9000.o
> diff --git a/drivers/net/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
> similarity index 100%
> rename from drivers/net/dm9000.c
> rename to drivers/net/ethernet/davicom/dm9000.c
> diff --git a/drivers/net/dm9000.h b/drivers/net/ethernet/davicom/dm9000.h
> similarity index 100%
> rename from drivers/net/dm9000.h
> rename to drivers/net/ethernet/davicom/dm9000.h
> -- 
> 1.7.5.4
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 70/72] netx: Move the netx driver
  2011-06-25 13:59 ` [RFC 70/72] netx: Move the netx driver Jeff Kirsher
@ 2011-06-27  9:45   ` Sascha Hauer
  0 siblings, 0 replies; 135+ messages in thread
From: Sascha Hauer @ 2011-06-27  9:45 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

On Sat, Jun 25, 2011 at 06:59:21AM -0700, Jeff Kirsher wrote:
> Move the netx driver into drivers/net/ethernet/ and make the
> necessary Kconfig and Makefile changes.
> 
> CC: Sascha Hauer <s.hauer@pengutronix.de>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

> ---
>  drivers/net/Kconfig                   |   10 ----------
>  drivers/net/Makefile                  |    1 -
>  drivers/net/ethernet/Kconfig          |   10 ++++++++++
>  drivers/net/ethernet/Makefile         |    1 +
>  drivers/net/{ => ethernet}/netx-eth.c |    0
>  5 files changed, 11 insertions(+), 11 deletions(-)
>  rename drivers/net/{ => ethernet}/netx-eth.c (100%)
> 
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 4ddc389..dfae2ec 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -236,16 +236,6 @@ config SH_ETH
>  	  This driver supporting CPUs are:
>  		- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
>  
> -config NET_NETX
> -	tristate "NetX Ethernet support"
> -	select MII
> -	depends on ARCH_NETX
> -	help
> -	  This is support for the Hilscher netX builtin Ethernet ports
> -
> -	  To compile this driver as a module, choose M here. The module
> -	  will be called netx-eth.
> -
>  config NET_PCI
>  	bool "EISA, VLB, PCI and on board controllers"
>  	depends on ISA || EISA || PCI
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 83075d4..c24b5ef 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -52,7 +52,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
>  obj-$(CONFIG_EQUALIZER) += eql.o
>  obj-$(CONFIG_TUN) += tun.o
>  obj-$(CONFIG_VETH) += veth.o
> -obj-$(CONFIG_NET_NETX) += netx-eth.o
>  
>  obj-$(CONFIG_DEV_APPLETALK) += appletalk/
>  obj-$(CONFIG_ETHERNET) += ethernet/
> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> index 3ec1903..b7d8d9b 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -176,6 +176,16 @@ config FEALNX
>  source "drivers/net/ethernet/natsemi/Kconfig"
>  source "drivers/net/ethernet/8390/Kconfig"
>  
> +config NET_NETX
> +	tristate "NetX Ethernet support"
> +	depends on ARCH_NETX
> +	select MII
> +	---help---
> +	  This is support for the Hilscher netX builtin Ethernet ports
> +
> +	  To compile this driver as a module, choose M here. The module
> +	  will be called netx-eth.
> +
>  config FORCEDETH
>  	tristate "nForce Ethernet support"
>  	depends on PCI
> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> index 3b2a35a..c1a1c61 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -42,6 +42,7 @@ obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
>  obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
>  obj-$(CONFIG_FEALNX) += fealnx.o
>  obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
> +obj-$(CONFIG_NET_NETX) += netx-eth.o
>  obj-$(CONFIG_FORCEDETH) += forcedeth.o
>  obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
>  obj-$(CONFIG_ETHOC) += ethoc.o
> diff --git a/drivers/net/netx-eth.c b/drivers/net/ethernet/netx-eth.c
> similarity index 100%
> rename from drivers/net/netx-eth.c
> rename to drivers/net/ethernet/netx-eth.c
> -- 
> 1.7.5.4
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 135+ messages in thread
* RE: [RFC 55/72] bfin_mac: Move the Blackfin driver
  2011-06-25 13:59 ` [RFC 55/72] bfin_mac: Move the Blackfin driver Jeff Kirsher
  2011-06-25 14:57   ` Arnd Bergmann
@ 2011-06-27 18:41   ` Hennerich, Michael
  1 sibling, 0 replies; 135+ messages in thread
From: Hennerich, Michael @ 2011-06-27 18:41 UTC (permalink / raw)
  To: Jeff Kirsher, davem
  Cc: netdev, uclinux-dist-devel, Frysinger, Michael, Zhang, Sonic

Jeff Kirsher wrote on 2011-06-25:
> Move the Blackfin driver into drivers/net/ethernet/blackfin/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Michael Hennerich <michael.hennerich@analog.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                                    |    2 +-
>  drivers/net/Kconfig                            |   46 ----------------
>  - drivers/net/Makefile                           |    1 -
>  drivers/net/ethernet/Kconfig                   |    1 +
>  drivers/net/ethernet/Makefile                  |    1 +
>  drivers/net/ethernet/blackfin/Kconfig          |   65
>  ++++++++++++++++++++++++ drivers/net/ethernet/blackfin/Makefile
>  |    5 ++ drivers/net/{ => ethernet/blackfin}/bfin_mac.c |    0
>  drivers/net/{ => ethernet/blackfin}/bfin_mac.h |    0 9 files changed,
>  73 insertions(+), 48 deletions(-)  create mode 100644
>  drivers/net/ethernet/blackfin/Kconfig create mode 100644
>  drivers/net/ethernet/blackfin/Makefile rename drivers/net/{ =>
>  ethernet/blackfin}/bfin_mac.c (100%)  rename
> drivers/net/{ => ethernet/blackfin}/bfin_mac.h (100%)


Hi Jeff,

I'm no longer maintaining this driver, please use the MAINTAINERS L(ist): entry instead.
We'll update the MAINTAINERS entry shortly.

This patch looks good to me. I really don't have a preference blackfin/ sounds good
for the time being, but /adi might be more future proof.

I'll ACK this one and add the list, maybe someone else wants to comment, too.

Acked-by: Michael Hennerich <michael.hennerich@analog.com>

Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368; Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif


>
> diff --git a/MAINTAINERS b/MAINTAINERS index 53e2d11..506d4d0 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1426,7 +1426,7 @@ M:      Michael Hennerich
> <michael.hennerich@analog.com>
>  L:   uclinux-dist-devel@blackfin.uclinux.org
>  W:   http://blackfin.uclinux.org S:  Supported
> -F:   drivers/net/bfin_mac.*
> +F:   drivers/net/ethernet/blackfin/
>
>  BLACKFIN RTC DRIVER
>  M:   Mike Frysinger <vapier.adi@gmail.com>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index
> 29eca29..9709106 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -250,52 +250,6 @@ config SH_ETH
>         This driver supporting CPUs are:
>               - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
> -config BFIN_MAC -    tristate "Blackfin on-chip MAC support" -       depends on
> NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
> -     select CRC32 -  select MII -    select PHYLIB - select BFIN_MAC_USE_L1 if
> DMA_UNCACHED_NONE -   help -    This is the driver for Blackfin on-chip mac
> device. Say Y if you want it -          compiled into the kernel. This driver
> is also available as a module -         ( = code which can be inserted in and
> removed from the running kernel -       whenever you want). The module will
> be called bfin_mac. - -config BFIN_MAC_USE_L1 -       bool "Use L1 memory for
> rx/tx packets" -      depends on BFIN_MAC && (BF527 || BF537) -       default y
> -     help -    To get maximum network performance, you should use L1 memory
> as rx/tx buffers. -     Say N here if you want to reserve L1 memory for
> other uses. - -config BFIN_TX_DESC_NUM -      int "Number of transmit buffer
> packets" -    depends on BFIN_MAC -   range 6 10 if BFIN_MAC_USE_L1 - range
> 10 100 -      default "10" -  help -    Set the number of buffer packets used
> in driver. - -config BFIN_RX_DESC_NUM -       int "Number of receive buffer
> packets" -    depends on BFIN_MAC -   range 20 100 if BFIN_MAC_USE_L1 -       range
> 20 800 -      default "20" -  help -    Set the number of buffer packets used
> in driver. - -config BFIN_MAC_USE_HWSTAMP -   bool "Use IEEE 1588 hwstamp"
> -     depends on BFIN_MAC && BF518 -  default y -     help -    To support the
> IEEE 1588 Precision Time Protocol (PTP), select y here -
>  config NET_NETX
>       tristate "NetX Ethernet support"
>       select MII
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile index
> 4315328..5c189ab 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -62,7 +62,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
>  obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_VETH) += veth.o
>  obj-$(CONFIG_NET_NETX) += netx-eth.o -obj-$(CONFIG_BFIN_MAC) +=
>  bfin_mac.o obj-$(CONFIG_DM9000) += dm9000.o obj-$(CONFIG_ENC28J60) +=
>  enc28j60.o obj-$(CONFIG_ETHOC) += ethoc.o
> diff --git a/drivers/net/ethernet/Kconfig
> b/drivers/net/ethernet/Kconfig index ef622d2..fede911 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -39,6 +39,7 @@ config ARIADNE
>
>  source "drivers/net/ethernet/arm/Kconfig" source
>  "drivers/net/ethernet/atheros/Kconfig" +source
>  "drivers/net/ethernet/blackfin/Kconfig" source
>  "drivers/net/ethernet/broadcom/Kconfig" source
>  "drivers/net/ethernet/brocade/Kconfig" source
>  "drivers/net/ethernet/chelsio/Kconfig"
> diff --git a/drivers/net/ethernet/Makefile
> b/drivers/net/ethernet/Makefile index 1ab5f1f..b8cc6ef 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
>  obj-$(CONFIG_ARIADNE) += ariadne.o obj-$(CONFIG_NET_ARM) += arm/
>  obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/ +obj-$(CONFIG_NET_BFIN) +=
>  blackfin/ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
>  obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
>  obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ diff --git
 a/drivers/net/ethernet/blackfin/Kconfig
 b/drivers/net/ethernet/blackfin/Kconfig new file mode 100644 index
 0000000..a2c8a3b --- /dev/null +++
 b/drivers/net/ethernet/blackfin/Kconfig @@ -0,0 +1,65 @@ +# +# Blackfin
 device configuration +# + +config NET_BFIN +   bool "Blackfin devices"
 +      depends on BF516 || BF518 || BF526 || BF527 || BF536 || BF537
 +      ---help--- +      If you have a network (Ethernet) card belonging to this
 class, say Y. +          Make sure you know the name of your card. Read the
 Ethernet- HOWTO, +       available from
 <http://www.tldp.org/docs.html#howto>. + +       If unsure, say Y. + +   Note
 that the answer to this question doesn't directly affect the +   kernel:
 saying N will just cause the configurator to skip all +          the remaining
 Blackfin card questions. If you say Y, you will be +     asked for your
 specific card in the following questions. + +config BFIN_MAC + tristate
 "Blackfin on-chip MAC support" +       depends on NET_BFIN && (BF516 || BF518
 || BF526 || BF527 || \ +                BF536 || BF537) +      select CRC32 +  select MII
 +      select PHYLIB + select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
 +      ---help--- +      This is the driver for Blackfin on-chip mac device. Say
 Y if you want +          it compiled into the kernel. This driver is also
 available as a +         module ( = code which can be inserted in and removed
 from the running +       kernel whenever you want). The module will be called
 bfin_mac. + +config BFIN_MAC_USE_L1 +  bool "Use L1 memory for rx/tx
 packets" +     depends on BFIN_MAC && (BF527 || BF537) +       default y
 +      ---help--- +      To get maximum network performance, you should use L1
 memory as rx/tx +        buffers. Say N here if you want to reserve L1 memory
 for other uses. + +config BFIN_TX_DESC_NUM +   int "Number of transmit
 buffer packets" +      depends on BFIN_MAC +   range 6 10 if BFIN_MAC_USE_L1
 +      range 10 100 +  default "10" +  ---help--- +      Set the number of buffer
 packets used in driver. + +config BFIN_RX_DESC_NUM +   int "Number of
 receive buffer packets" +      depends on BFIN_MAC +   range 20 100 if
 BFIN_MAC_USE_L1 +      range 20 800 +  default "20" +  ---help--- +      Set the
 number of buffer packets used in driver. + +config BFIN_MAC_USE_HWSTAMP
 +      bool "Use IEEE 1588 hwstamp" +  depends on BFIN_MAC && BF518 +  default y
 +      ---help--- +      To support the IEEE 1588 Precision Time Protocol (PTP),
 select y +here diff --git a/drivers/net/ethernet/blackfin/Makefile
 b/drivers/net/ethernet/blackfin/Makefile new file mode 100644 index
 0000000..b1fbe19 --- /dev/null +++
 b/drivers/net/ethernet/blackfin/Makefile @@ -0,0 +1,5 @@ +# +# Makefile
 for the Blackfin device drivers. +# + +obj-$(CONFIG_BFIN_MAC) +=
 bfin_mac.o diff --git a/drivers/net/bfin_mac.c
 b/drivers/net/ethernet/blackfin/bfin_mac.c similarity index 100% rename
 from drivers/net/bfin_mac.c rename to
 drivers/net/ethernet/blackfin/bfin_mac.c diff --git
 a/drivers/net/bfin_mac.h b/drivers/net/ethernet/blackfin/bfin_mac.h
 similarity index 100% rename from drivers/net/bfin_mac.h rename to
 drivers/net/ethernet/blackfin/bfin_mac.h

Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368; Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif




^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers
  2011-06-25 13:58 ` [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers Jeff Kirsher
  2011-06-25 16:11   ` David Dillow
@ 2011-06-28  8:22   ` Alan Cox
  2011-07-09 15:27     ` Jeff Kirsher
  1 sibling, 1 reply; 135+ messages in thread
From: Alan Cox @ 2011-06-28  8:22 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: davem, netdev, Philip Blundell, Steffen Klassert, David Dillow,
	Jes Sorensen, Donald Becker, Craig Southeren, David Hinds

On Sat, 25 Jun 2011 06:58:13 -0700
Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:

> Moves the 3Com drivers into drivers/net/ethernet/3com/ and the
> necessary Kconfig and Makefile changes.

This seems a bizarre way to carve stuff up.

To start with several of the things you put in 3com are just branded
items, or are boards using non 3com devices which are currently with
the other drivers that do so, some even use shared midlayers that you
move them away from.

You also pull stuff out of pcmcia which makes it harder to scan stuff
grouped logically.

So this all seems a bit daft to me.

Surely it would make sense to put all the Intel 825xx stuff together,
all the 8390 stuff together and so on.

Alan

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-06-25 13:58 ` [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers Jeff Kirsher
@ 2011-06-28 20:33   ` Geert Uytterhoeven
  2011-07-09 14:30     ` Jeff Kirsher
  0 siblings, 1 reply; 135+ messages in thread
From: Geert Uytterhoeven @ 2011-06-28 20:33 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

On Sat, Jun 25, 2011 at 15:58, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -12,8 +12,31 @@ menuconfig ETHERNET
>  if ETHERNET
>
>  source "drivers/net/ethernet/3com/Kconfig"
> +
> +config A2065
> +       tristate "A2065 support"
> +       depends on ZORRO
> +       select CRC32
> +       ---help---
> +         If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
> +         say N.
> +
> +         To compile this driver as a module, choose M here: the module
> +         will be called a2065.
> +
>  source "drivers/net/ethernet/amd/Kconfig"
>  source "drivers/net/ethernet/apple/Kconfig"
> +
> +config ARIADNE
> +       tristate "Ariadne support"
> +       depends on ZORRO
> +       ---help---
> +         If you have a Village Tronic Ariadne Ethernet adapter, say Y.
> +         Otherwise, say N.
> +
> +         To compile this driver as a module, choose M here: the module
> +         will be called ariadne.
> +
>  source "drivers/net/ethernet/arm/Kconfig"
>  source "drivers/net/ethernet/atheros/Kconfig"

What's the rationale behind this "restructuring"?
FWIW, both the A2065 and Ariadne drivers are for AMD LANCE variants
(that is Am7990 and Am79C960)?

And (in some other patch) 82596.c is an Intel driver, not a Motorola driver.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers
  2011-06-25 13:58 ` [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers Jeff Kirsher
@ 2011-06-29 15:39   ` Tabi Timur-B04825
  2011-07-09 15:07     ` Jeff Kirsher
  0 siblings, 1 reply; 135+ messages in thread
From: Tabi Timur-B04825 @ 2011-06-29 15:39 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: davem, netdev, Sandeep Gopalpet, Fleming Andy-AFLEMING,
	Gridish Shlomi-RM96313, Li Yang-R58472, Pantelis Antoniou,
	Vitaly Bordug

On Sat, Jun 25, 2011 at 8:58 AM, Jeff Kirsher
<jeffrey.t.kirsher@intel.com> wrote:
> Move the Freescale driver into drivers/net/ethernet/freescale/ and
> make the necessary Kconfig and Makefile changes.

I don't have an actual objection to this, but I just don't understand
why it's necessary.  Is this a new trend for drivers/net, to have all
drivers grouped by manufacturer?  Or is there something special about
Freescale?

-- 
Timur Tabi
Linux kernel developer at Freescale

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 31/72] tulip: Move the tulip drivers
  2011-06-25 13:58 ` [RFC 31/72] tulip: Move the tulip drivers Jeff Kirsher
@ 2011-07-03  0:04   ` Grant Grundler
  0 siblings, 0 replies; 135+ messages in thread
From: Grant Grundler @ 2011-07-03  0:04 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev, Tobias Ringstrom

On Sat, Jun 25, 2011 at 06:58:42AM -0700, Jeff Kirsher wrote:
> Move the tulip driver into drivers/net/ethernet/tulip/ and make
> the necessary Kconfig and Makefile changes.
> 
> CC: Tobias Ringstrom <tori@unhappy.mine.nu>
> CC: Grant Grundler <grundler@parisc-linux.org>

Acked-by: Grant Grundler <grundler@parisc-linux.org>

thanks,
grant

> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                                    |    4 +-
>  drivers/net/Kconfig                            |    2 -
>  drivers/net/Makefile                           |    1 -
>  drivers/net/ethernet/Kconfig                   |    2 +
>  drivers/net/ethernet/Makefile                  |    1 +
>  drivers/net/{ => ethernet}/tulip/21142.c       |    0
>  drivers/net/{ => ethernet}/tulip/Kconfig       |   34 ++++++++++-------------
>  drivers/net/{ => ethernet}/tulip/Makefile      |    0
>  drivers/net/{ => ethernet}/tulip/de2104x.c     |    0
>  drivers/net/{ => ethernet}/tulip/de4x5.c       |    0
>  drivers/net/{ => ethernet}/tulip/de4x5.h       |    0
>  drivers/net/{ => ethernet}/tulip/dmfe.c        |    0
>  drivers/net/{ => ethernet}/tulip/eeprom.c      |    0
>  drivers/net/{ => ethernet}/tulip/interrupt.c   |    0
>  drivers/net/{ => ethernet}/tulip/media.c       |    0
>  drivers/net/{ => ethernet}/tulip/pnic.c        |    0
>  drivers/net/{ => ethernet}/tulip/pnic2.c       |    0
>  drivers/net/{ => ethernet}/tulip/timer.c       |    0
>  drivers/net/{ => ethernet}/tulip/tulip.h       |    0
>  drivers/net/{ => ethernet}/tulip/tulip_core.c  |    0
>  drivers/net/{ => ethernet}/tulip/uli526x.c     |    0
>  drivers/net/{ => ethernet}/tulip/winbond-840.c |    0
>  drivers/net/{ => ethernet}/tulip/xircom_cb.c   |    0
>  23 files changed, 20 insertions(+), 24 deletions(-)
>  rename drivers/net/{ => ethernet}/tulip/21142.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/Kconfig (93%)
>  rename drivers/net/{ => ethernet}/tulip/Makefile (100%)
>  rename drivers/net/{ => ethernet}/tulip/de2104x.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/de4x5.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/de4x5.h (100%)
>  rename drivers/net/{ => ethernet}/tulip/dmfe.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/eeprom.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/interrupt.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/media.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/pnic.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/pnic2.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/timer.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/tulip.h (100%)
>  rename drivers/net/{ => ethernet}/tulip/tulip_core.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/uli526x.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/winbond-840.c (100%)
>  rename drivers/net/{ => ethernet}/tulip/xircom_cb.c (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f72a8bd..26d1029 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2040,7 +2040,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
>  L:	netdev@vger.kernel.org
>  S:	Orphan
>  F:	Documentation/networking/dmfe.txt
> -F:	drivers/net/tulip/dmfe.c
> +F:	drivers/net/ethernet/tulip/dmfe.c
>  
>  DC390/AM53C974 SCSI driver
>  M:	Kurt Garloff <garloff@suse.de>
> @@ -6278,7 +6278,7 @@ TULIP NETWORK DRIVERS
>  M:	Grant Grundler <grundler@parisc-linux.org>
>  L:	netdev@vger.kernel.org
>  S:	Maintained
> -F:	drivers/net/tulip/
> +F:	drivers/net/ethernet/tulip/
>  
>  TUN/TAP driver
>  M:	Maxim Krasnyansky <maxk@qualcomm.com>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 71efbe4..0846518 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -481,8 +481,6 @@ config DNET
>  	  To compile this driver as a module, choose M here: the module
>  	  will be called dnet.
>  
> -source "drivers/net/tulip/Kconfig"
> -
>  config AT1700
>  	tristate "AT1700/1720 support (EXPERIMENTAL)"
>  	depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 1ac4164..ec07331 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -160,7 +160,6 @@ obj-$(CONFIG_USB_ZD1201)        += usb/
>  obj-$(CONFIG_USB_IPHETH)        += usb/
>  
>  obj-$(CONFIG_WLAN) += wireless/
> -obj-$(CONFIG_NET_TULIP) += tulip/
>  obj-$(CONFIG_HAMRADIO) += hamradio/
>  obj-$(CONFIG_IRDA) += irda/
>  obj-$(CONFIG_ETRAX_ETHERNET) += cris/
> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> index 6fb1625..369f5bb 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -55,4 +55,6 @@ config TEHUTI
>  	---help---
>  	  Tehuti Networks 10G Ethernet NIC
>  
> +source "drivers/net/ethernet/tulip/Kconfig"
> +
>  endif # ETHERNET
> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> index 1123a3d..189d112 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -31,3 +31,4 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
>  obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
>  obj-$(CONFIG_NET_VENDOR_SUN) += sun/
>  obj-$(CONFIG_TEHUTI) += tehuti.o
> +obj-$(CONFIG_NET_TULIP) += tulip/
> diff --git a/drivers/net/tulip/21142.c b/drivers/net/ethernet/tulip/21142.c
> similarity index 100%
> rename from drivers/net/tulip/21142.c
> rename to drivers/net/ethernet/tulip/21142.c
> diff --git a/drivers/net/tulip/Kconfig b/drivers/net/ethernet/tulip/Kconfig
> similarity index 93%
> rename from drivers/net/tulip/Kconfig
> rename to drivers/net/ethernet/tulip/Kconfig
> index 1f8d4a8..c298a08 100644
> --- a/drivers/net/tulip/Kconfig
> +++ b/drivers/net/ethernet/tulip/Kconfig
> @@ -2,17 +2,15 @@
>  # Tulip family network device configuration
>  #
>  
> -menuconfig NET_TULIP
> -	bool "\"Tulip\" family network device support"
> +config NET_TULIP
> +	bool "\"Tulip\" family network devices"
>  	depends on PCI || EISA || CARDBUS
> -	help
> +	---help---
>  	  This selects the "Tulip" family of EISA/PCI network cards.
>  
> -if NET_TULIP
> -
>  config DE2104X
>  	tristate "Early DECchip Tulip (dc2104x) PCI support"
> -	depends on PCI
> +	depends on NET_TULIP && PCI
>  	select CRC32
>  	---help---
>  	  This driver is developed for the SMC EtherPower series Ethernet
> @@ -32,7 +30,7 @@ config DE2104X_DSL
>  	depends on DE2104X
>  	range 0 31
>  	default 0
> -	help
> +	---help---
>  	  Setting this value allows to align ring buffer descriptors into their
>  	  own cache lines. Value of 4 corresponds to the typical 32 byte line
>  	  (the descriptor is 16 bytes). This is necessary on systems that lack
> @@ -41,7 +39,7 @@ config DE2104X_DSL
>  
>  config TULIP
>  	tristate "DECchip Tulip (dc2114x) PCI support"
> -	depends on PCI
> +	depends on NET_TULIP && PCI
>  	select CRC32
>  	---help---
>  	  This driver is developed for the SMC EtherPower series Ethernet
> @@ -59,7 +57,7 @@ config TULIP
>  config TULIP_MWI
>  	bool "New bus configuration (EXPERIMENTAL)"
>  	depends on TULIP && EXPERIMENTAL
> -	help
> +	---help---
>  	  This configures your Tulip card specifically for the card and
>  	  system cache line size type you are using.
>  
> @@ -70,7 +68,7 @@ config TULIP_MWI
>  config TULIP_MMIO
>  	bool "Use PCI shared mem for NIC registers"
>  	depends on TULIP
> -	help
> +	---help---
>  	  Use PCI shared memory for the NIC registers, rather than going through
>  	  the Tulip's PIO (programmed I/O ports).  Faster, but could produce
>  	  obscure bugs if your mainboard has memory controller timing issues.
> @@ -79,7 +77,7 @@ config TULIP_MMIO
>  config TULIP_NAPI
>  	bool "Use RX polling (NAPI)"
>  	depends on TULIP
> -	help
> +	---help---
>  	  NAPI is a new driver API designed to reduce CPU and interrupt load
>  	  when the driver is receiving lots of packets from the card. It is
>  	  still somewhat experimental and thus not yet enabled by default.
> @@ -107,7 +105,7 @@ config TULIP_DM910X
>  
>  config DE4X5
>  	tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
> -	depends on PCI || EISA
> +	depends on NET_TULIP && (PCI || EISA)
>  	select CRC32
>  	---help---
>  	  This is support for the DIGITAL series of PCI/EISA Ethernet cards.
> @@ -123,10 +121,10 @@ config DE4X5
>  
>  config WINBOND_840
>  	tristate "Winbond W89c840 Ethernet support"
> -	depends on PCI
> +	depends on NET_TULIP && PCI
>  	select CRC32
>  	select MII
> -	help
> +	---help---
>  	  This driver is for the Winbond W89c840 chip.  It also works with 
>  	  the TX9882 chip on the Compex RL100-ATX board.
>  	  More specific information and updates are available from
> @@ -134,7 +132,7 @@ config WINBOND_840
>  
>  config DM9102
>  	tristate "Davicom DM910x/DM980x support"
> -	depends on PCI
> +	depends on NET_TULIP && PCI
>  	select CRC32
>  	---help---
>  	  This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from
> @@ -147,7 +145,7 @@ config DM9102
>  
>  config ULI526X
>  	tristate "ULi M526x controller support"
> -	depends on PCI
> +	depends on NET_TULIP && PCI
>  	select CRC32
>  	---help---
>  	  This driver is for ULi M5261/M5263 10/100M Ethernet Controller
> @@ -158,7 +156,7 @@ config ULI526X
>  	  
>  config PCMCIA_XIRCOM
>  	tristate "Xircom CardBus support"
> -	depends on CARDBUS
> +	depends on NET_TULIP && CARDBUS
>  	---help---
>  	  This driver is for the Digital "Tulip" Ethernet CardBus adapters.
>  	  It should work with most DEC 21*4*-based chips/ethercards, as well
> @@ -167,5 +165,3 @@ config PCMCIA_XIRCOM
>  
>  	  To compile this driver as a module, choose M here. The module will
>  	  be called xircom_cb.  If unsure, say N.
> -
> -endif # NET_TULIP
> diff --git a/drivers/net/tulip/Makefile b/drivers/net/ethernet/tulip/Makefile
> similarity index 100%
> rename from drivers/net/tulip/Makefile
> rename to drivers/net/ethernet/tulip/Makefile
> diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/ethernet/tulip/de2104x.c
> similarity index 100%
> rename from drivers/net/tulip/de2104x.c
> rename to drivers/net/ethernet/tulip/de2104x.c
> diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/ethernet/tulip/de4x5.c
> similarity index 100%
> rename from drivers/net/tulip/de4x5.c
> rename to drivers/net/ethernet/tulip/de4x5.c
> diff --git a/drivers/net/tulip/de4x5.h b/drivers/net/ethernet/tulip/de4x5.h
> similarity index 100%
> rename from drivers/net/tulip/de4x5.h
> rename to drivers/net/ethernet/tulip/de4x5.h
> diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/ethernet/tulip/dmfe.c
> similarity index 100%
> rename from drivers/net/tulip/dmfe.c
> rename to drivers/net/ethernet/tulip/dmfe.c
> diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/ethernet/tulip/eeprom.c
> similarity index 100%
> rename from drivers/net/tulip/eeprom.c
> rename to drivers/net/ethernet/tulip/eeprom.c
> diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/ethernet/tulip/interrupt.c
> similarity index 100%
> rename from drivers/net/tulip/interrupt.c
> rename to drivers/net/ethernet/tulip/interrupt.c
> diff --git a/drivers/net/tulip/media.c b/drivers/net/ethernet/tulip/media.c
> similarity index 100%
> rename from drivers/net/tulip/media.c
> rename to drivers/net/ethernet/tulip/media.c
> diff --git a/drivers/net/tulip/pnic.c b/drivers/net/ethernet/tulip/pnic.c
> similarity index 100%
> rename from drivers/net/tulip/pnic.c
> rename to drivers/net/ethernet/tulip/pnic.c
> diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/ethernet/tulip/pnic2.c
> similarity index 100%
> rename from drivers/net/tulip/pnic2.c
> rename to drivers/net/ethernet/tulip/pnic2.c
> diff --git a/drivers/net/tulip/timer.c b/drivers/net/ethernet/tulip/timer.c
> similarity index 100%
> rename from drivers/net/tulip/timer.c
> rename to drivers/net/ethernet/tulip/timer.c
> diff --git a/drivers/net/tulip/tulip.h b/drivers/net/ethernet/tulip/tulip.h
> similarity index 100%
> rename from drivers/net/tulip/tulip.h
> rename to drivers/net/ethernet/tulip/tulip.h
> diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/ethernet/tulip/tulip_core.c
> similarity index 100%
> rename from drivers/net/tulip/tulip_core.c
> rename to drivers/net/ethernet/tulip/tulip_core.c
> diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/ethernet/tulip/uli526x.c
> similarity index 100%
> rename from drivers/net/tulip/uli526x.c
> rename to drivers/net/ethernet/tulip/uli526x.c
> diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/ethernet/tulip/winbond-840.c
> similarity index 100%
> rename from drivers/net/tulip/winbond-840.c
> rename to drivers/net/ethernet/tulip/winbond-840.c
> diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/ethernet/tulip/xircom_cb.c
> similarity index 100%
> rename from drivers/net/tulip/xircom_cb.c
> rename to drivers/net/ethernet/tulip/xircom_cb.c
> -- 
> 1.7.5.4

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-06-28 20:33   ` Geert Uytterhoeven
@ 2011-07-09 14:30     ` Jeff Kirsher
  2011-07-10 19:34       ` Geert Uytterhoeven
  2011-07-10 19:56       ` Christoph Hellwig
  0 siblings, 2 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-07-09 14:30 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: davem, netdev

[-- Attachment #1: Type: text/plain, Size: 2268 bytes --]

On Tue, 2011-06-28 at 13:33 -0700, Geert Uytterhoeven wrote:
> On Sat, Jun 25, 2011 at 15:58, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> > --- a/drivers/net/ethernet/Kconfig
> > +++ b/drivers/net/ethernet/Kconfig
> > @@ -12,8 +12,31 @@ menuconfig ETHERNET
> >  if ETHERNET
> >
> >  source "drivers/net/ethernet/3com/Kconfig"
> > +
> > +config A2065
> > +       tristate "A2065 support"
> > +       depends on ZORRO
> > +       select CRC32
> > +       ---help---
> > +         If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
> > +         say N.
> > +
> > +         To compile this driver as a module, choose M here: the module
> > +         will be called a2065.
> > +
> >  source "drivers/net/ethernet/amd/Kconfig"
> >  source "drivers/net/ethernet/apple/Kconfig"
> > +
> > +config ARIADNE
> > +       tristate "Ariadne support"
> > +       depends on ZORRO
> > +       ---help---
> > +         If you have a Village Tronic Ariadne Ethernet adapter, say Y.
> > +         Otherwise, say N.
> > +
> > +         To compile this driver as a module, choose M here: the module
> > +         will be called ariadne.
> > +
> >  source "drivers/net/ethernet/arm/Kconfig"
> >  source "drivers/net/ethernet/atheros/Kconfig"
> 
> What's the rationale behind this "restructuring"?

In short to better organize drivers/net/.  There are a large number of
drivers in drivers/net/ so we are trying to organize the directory
structure to make it easier to maintain in the future.

> FWIW, both the A2065 and Ariadne drivers are for AMD LANCE variants
> (that is Am7990 and Am79C960)?

I saw that they were LANCE variants, yet did not use the "common" LANCE
code like the other LANCE drivers.  Based on suggestions from Arnd
Bergmann and Joe Perches, I am moving these into the AMD LANCE driver
directory.

> 
> And (in some other patch) 82596.c is an Intel driver, not a Motorola driver.

82596.c is not an Intel driver, it is an Intel part.  The driver was
written and support by someone other than Intel.  I am looking at how to
better organize the 82596.c, lasi_82596.c, lib82596.c, and sni_82596.c
which all use an Intel Ethernet chip but were written and supported by
someone other than Intel.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers
  2011-06-29 15:39   ` Tabi Timur-B04825
@ 2011-07-09 15:07     ` Jeff Kirsher
  0 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-07-09 15:07 UTC (permalink / raw)
  To: Tabi Timur-B04825
  Cc: davem, netdev, Sandeep Gopalpet, Fleming Andy-AFLEMING,
	Gridish Shlomi-RM96313, Li Yang-R58472, Pantelis Antoniou,
	Vitaly Bordug

[-- Attachment #1: Type: text/plain, Size: 977 bytes --]

On Wed, 2011-06-29 at 08:39 -0700, Tabi Timur-B04825 wrote:
> On Sat, Jun 25, 2011 at 8:58 AM, Jeff Kirsher
> <jeffrey.t.kirsher@intel.com> wrote:
> > Move the Freescale driver into drivers/net/ethernet/freescale/ and
> > make the necessary Kconfig and Makefile changes.
> 
> I don't have an actual objection to this, but I just don't understand
> why it's necessary.  Is this a new trend for drivers/net, to have all
> drivers grouped by manufacturer?  Or is there something special about
> Freescale?
> 

What we are trying to do is better organize the drivers/net directory
structure.  So I am placing all the Ethernet drivers in
drivers/net/ethernet/ and so on.  Under drivers/net/ethernet/, I have
tried to organize drivers by the most appropriate way to help in
maintaining the drivers, a lot of the time it tended to be by
manufacturer.  It made sense to group all the Freescale drivers into a
common directory so that it would be easier to maintain.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers
  2011-06-28  8:22   ` Alan Cox
@ 2011-07-09 15:27     ` Jeff Kirsher
  0 siblings, 0 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-07-09 15:27 UTC (permalink / raw)
  To: Alan Cox
  Cc: davem, netdev, Philip Blundell, Steffen Klassert, David Dillow,
	Jes Sorensen, Donald Becker, Craig Southeren, David Hinds

[-- Attachment #1: Type: text/plain, Size: 1813 bytes --]

On Tue, 2011-06-28 at 01:22 -0700, Alan Cox wrote:
> On Sat, 25 Jun 2011 06:58:13 -0700
> Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> 
> > Moves the 3Com drivers into drivers/net/ethernet/3com/ and the
> > necessary Kconfig and Makefile changes.
> 
> This seems a bizarre way to carve stuff up.
> 
> To start with several of the things you put in 3com are just branded
> items, or are boards using non 3com devices which are currently with
> the other drivers that do so, some even use shared midlayers that you
> move them away from.

When I first started the process of organizing drivers/net/ I thought it
made sense to group the 3Com drivers together, even though one of the
drivers (3c503) used the 8390 common code.  Looking back, it does make
sense to keep the 3c503 driver in drivers/net/ethernet/8390/ along with
the other 8390 drivers.

> 
> You also pull stuff out of pcmcia which makes it harder to scan stuff
> grouped logically.

The logic behind this was to have all the Ethernet drivers in
drivers/net/ethernet/.  Since the drivers in drivers/net/pcmcia/ are not
sharing any special network common code or library, it did not seem to
make sense to me to keep them in drivers/net/pcmcia.  Eventually, there
would not be a drivers/net/pcmcia directory since all the drivers in
that directory would be moved into the appropriate
drivers/net/<technology>/ directory (i.e. ethernet, token-ring,fddi,
wireless, etc).  If there were a number of PCMCIA Ethernet drivers,
which all shared a common library or code, then it would make sense to
place them in drivers/net/ethernet/pcmcia/


> So this all seems a bit daft to me.
> 
> Surely it would make sense to put all the Intel 825xx stuff together,
> all the 8390 stuff together and so on.
> 
> Alan



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 46/72] ixp2000: Move the Radisys driver
  2011-06-26 11:47   ` Lennert Buytenhek
@ 2011-07-09 15:58     ` Jeff Kirsher
  2011-07-15  0:08       ` Lennert Buytenhek
  0 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-07-09 15:58 UTC (permalink / raw)
  To: Lennert Buytenhek; +Cc: davem, netdev, Lennert Buytenhek

[-- Attachment #1: Type: text/plain, Size: 2047 bytes --]

On Sun, 2011-06-26 at 04:47 -0700, Lennert Buytenhek wrote:
> On Sat, Jun 25, 2011 at 06:58:57AM -0700, Jeff Kirsher wrote:
> 
> > Move the Radisys driver into drivers/net/ethernet/radisys/ and
> > make the necessary Kconfig and Makefile changes
> > 
> > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > ---
> >  MAINTAINERS                                        |    2 +-
> >  drivers/net/Kconfig                                |    2 --
> >  drivers/net/Makefile                               |    1 -
> >  drivers/net/ethernet/Kconfig                       |    1 +
> >  drivers/net/ethernet/Makefile                      |    1 +
> >  drivers/net/ethernet/radisys/Kconfig               |   16 ++++++++++++++++
> >  drivers/net/ethernet/radisys/Makefile              |    5 +++++
> >  drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig |    2 +-
> >  .../net/{ => ethernet/radisys}/ixp2000/Makefile    |    0
> 
> The ixp2000 is a series of Intel ARM SoCs, and the ENP2611 is a Radisys
> PCI board based on the ixp2000 series (ixp2400), so it doesn't make
> sense to put everything in the radisys/ directory.

It was suggested earlier that it probably should be in either ixp/ or
radisys/, and someone suggested that ixp/ might be confusing.  If you
would like to keep it under drivers/net/ethernet/ixp2000, I am fine with
that as well.

> 
> If you insist on moving all drivers into vendor directories (I don't
> like that idea at all -- are we going to rename directories and shuffle
> stuff around every time vendor A buys vendor B or takes over one of
> vendor B's products?), at least the core ixp2000 code should be under
> intel/.

It was not my preference to place drivers into vendor specific
directories because of that very reason, as I did the work, it just
tended to work out that way.

The reason (as stated before) that it was not moved into intel/
directory is because the driver was not written (and supported) by
Intel.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-07-09 14:30     ` Jeff Kirsher
@ 2011-07-10 19:34       ` Geert Uytterhoeven
  2011-07-11  0:48         ` Jeff Kirsher
  2011-07-10 19:56       ` Christoph Hellwig
  1 sibling, 1 reply; 135+ messages in thread
From: Geert Uytterhoeven @ 2011-07-10 19:34 UTC (permalink / raw)
  To: jeffrey.t.kirsher; +Cc: davem, netdev

On Sat, Jul 9, 2011 at 16:30, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> On Tue, 2011-06-28 at 13:33 -0700, Geert Uytterhoeven wrote:
>> And (in some other patch) 82596.c is an Intel driver, not a Motorola driver.
>
> 82596.c is not an Intel driver, it is an Intel part.  The driver was

Sorry, I meant "driver for an Intel part".

> written and support by someone other than Intel.  I am looking at how to

Sure. But I'm strongly against classifying drivers based on who wrote them ;-)

> better organize the 82596.c, lasi_82596.c, lib82596.c, and sni_82596.c
> which all use an Intel Ethernet chip but were written and supported by
> someone other than Intel.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-07-09 14:30     ` Jeff Kirsher
  2011-07-10 19:34       ` Geert Uytterhoeven
@ 2011-07-10 19:56       ` Christoph Hellwig
  1 sibling, 0 replies; 135+ messages in thread
From: Christoph Hellwig @ 2011-07-10 19:56 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: Geert Uytterhoeven, davem, netdev

On Sat, Jul 09, 2011 at 07:30:26AM -0700, Jeff Kirsher wrote:
> 82596.c is not an Intel driver, it is an Intel part.  The driver was
> written and support by someone other than Intel.

Which doesn't matter at all.


^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-07-10 19:34       ` Geert Uytterhoeven
@ 2011-07-11  0:48         ` Jeff Kirsher
  2011-07-11  6:33           ` Geert Uytterhoeven
  0 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-07-11  0:48 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: davem, netdev

[-- Attachment #1: Type: text/plain, Size: 2439 bytes --]

On Sun, 2011-07-10 at 12:34 -0700, Geert Uytterhoeven wrote:
> On Sat, Jul 9, 2011 at 16:30, Jeff Kirsher
> <jeffrey.t.kirsher@intel.com> wrote:
> > On Tue, 2011-06-28 at 13:33 -0700, Geert Uytterhoeven wrote:
> >> And (in some other patch) 82596.c is an Intel driver, not a
> Motorola driver.
> >
> > 82596.c is not an Intel driver, it is an Intel part.  The driver was
> 
> Sorry, I meant "driver for an Intel part".
> 
> > written and support by someone other than Intel.  I am looking at
> how to
> 
> Sure. But I'm strongly against classifying drivers based on who wrote
> them ;-)

I agree to some extent, because if that were the case, we would have a
donald_becker/ directory for several of the drivers. :)

Here is one of the problem's I keep running into and there is no simple
answer.  While most of the drivers can be grouped together by the
hardware they use, that does not work "logically" for every driver.

In addition, if vendor 'A' makes a part and vendor 'B' uses same part in
a device/system/NIC and vendor 'B' creates the driver, supports the
driver and maintains the driver.  Should the part be categorized under
vendor 'A'?  IMHO, I think it should be categorized as a vendor 'B'
driver.

I started this work with the idea of trying to organize the drivers in
the same way that the drivers were to be in the Kconfig, which tended to
be drivers/net/ethernet/<manufacturer>.

One of the problems that arise in this organization is what do we do
when vendor A is bought by vendor B, and vendor B takes on the support
of all the old vendor A parts/drivers?

So I am open to suggestions.  The process I have using to organize the
drivers has been to group drivers that use common libraries and/or code
first, then group by either manufacturer, maintainer, or common
platform.

I would like to keep the lasi_82506.c, sni_82596.c, 82506.c and similar
drivers out of the intel/ directory because we would not be supporting
the drivers and they are not similar to our drivers that we do support
that would be in the intel/ directory.

Again, I open to suggestions on how to best organize these types of
drivers.  Maybe create a misc/ or <bus_type>/ for these types of
drivers? 

> 
> > better organize the 82596.c, lasi_82596.c, lib82596.c, and
> sni_82596.c
> > which all use an Intel Ethernet chip but were written and supported
> by
> > someone other than Intel. 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-07-11  0:48         ` Jeff Kirsher
@ 2011-07-11  6:33           ` Geert Uytterhoeven
  2011-07-11  9:39             ` Jeff Kirsher
  0 siblings, 1 reply; 135+ messages in thread
From: Geert Uytterhoeven @ 2011-07-11  6:33 UTC (permalink / raw)
  To: jeffrey.t.kirsher; +Cc: davem, netdev

On Mon, Jul 11, 2011 at 02:48, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> On Sun, 2011-07-10 at 12:34 -0700, Geert Uytterhoeven wrote:
>> On Sat, Jul 9, 2011 at 16:30, Jeff Kirsher
>> <jeffrey.t.kirsher@intel.com> wrote:
>> > On Tue, 2011-06-28 at 13:33 -0700, Geert Uytterhoeven wrote:
>> >> And (in some other patch) 82596.c is an Intel driver, not a
>> Motorola driver.
>> >
>> > 82596.c is not an Intel driver, it is an Intel part.  The driver was
>>
>> Sorry, I meant "driver for an Intel part".
>>
>> > written and support by someone other than Intel.  I am looking at
>> how to
>>
>> Sure. But I'm strongly against classifying drivers based on who wrote
>> them ;-)
>
> I agree to some extent, because if that were the case, we would have a
> donald_becker/ directory for several of the drivers. :)
>
> Here is one of the problem's I keep running into and there is no simple
> answer.  While most of the drivers can be grouped together by the
> hardware they use, that does not work "logically" for every driver.
>
> In addition, if vendor 'A' makes a part and vendor 'B' uses same part in
> a device/system/NIC and vendor 'B' creates the driver, supports the
> driver and maintains the driver.  Should the part be categorized under
> vendor 'A'?  IMHO, I think it should be categorized as a vendor 'B'
> driver.

Several of the Ethernet drivers are of a third type: vendor A chip, vendor B
card, entity C software.

> I started this work with the idea of trying to organize the drivers in
> the same way that the drivers were to be in the Kconfig, which tended to
> be drivers/net/ethernet/<manufacturer>.
>
> One of the problems that arise in this organization is what do we do
> when vendor A is bought by vendor B, and vendor B takes on the support
> of all the old vendor A parts/drivers?

We don't care. We don't sort drivers by who support them. Eventually, vendors
lose interest and they all end up under "Linux kernel community" anyway.

> So I am open to suggestions.  The process I have using to organize the
> drivers has been to group drivers that use common libraries and/or code
> first, then group by either manufacturer, maintainer, or common
> platform.
>
> I would like to keep the lasi_82506.c, sni_82596.c, 82506.c and similar
> drivers out of the intel/ directory because we would not be supporting
> the drivers and they are not similar to our drivers that we do support
> that would be in the intel/ directory.
>
> Again, I open to suggestions on how to best organize these types of
> drivers.  Maybe create a misc/ or <bus_type>/ for these types of
> drivers?

"Similar" drivers should be together and consolidated (if someone has time
to do it). They can even be of different brands.
I.e. not all Tulip-compatibles were manufactured by Digital or Intel.

>> > better organize the 82596.c, lasi_82596.c, lib82596.c, and
>> sni_82596.c
>> > which all use an Intel Ethernet chip but were written and supported
>> by
>> > someone other than Intel.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-07-11  6:33           ` Geert Uytterhoeven
@ 2011-07-11  9:39             ` Jeff Kirsher
  2011-07-11  9:51               ` Geert Uytterhoeven
  2011-07-11 11:31               ` Christoph Hellwig
  0 siblings, 2 replies; 135+ messages in thread
From: Jeff Kirsher @ 2011-07-11  9:39 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: davem, netdev

[-- Attachment #1: Type: text/plain, Size: 4130 bytes --]

On Sun, 2011-07-10 at 23:33 -0700, Geert Uytterhoeven wrote:
> On Mon, Jul 11, 2011 at 02:48, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> > On Sun, 2011-07-10 at 12:34 -0700, Geert Uytterhoeven wrote:
> >> On Sat, Jul 9, 2011 at 16:30, Jeff Kirsher
> >> <jeffrey.t.kirsher@intel.com> wrote:
> >> > On Tue, 2011-06-28 at 13:33 -0700, Geert Uytterhoeven wrote:
> >> >> And (in some other patch) 82596.c is an Intel driver, not a
> >> Motorola driver.
> >> >
> >> > 82596.c is not an Intel driver, it is an Intel part.  The driver was
> >>
> >> Sorry, I meant "driver for an Intel part".
> >>
> >> > written and support by someone other than Intel.  I am looking at
> >> how to
> >>
> >> Sure. But I'm strongly against classifying drivers based on who wrote
> >> them ;-)
> >
> > I agree to some extent, because if that were the case, we would have a
> > donald_becker/ directory for several of the drivers. :)
> >
> > Here is one of the problem's I keep running into and there is no simple
> > answer.  While most of the drivers can be grouped together by the
> > hardware they use, that does not work "logically" for every driver.
> >
> > In addition, if vendor 'A' makes a part and vendor 'B' uses same part in
> > a device/system/NIC and vendor 'B' creates the driver, supports the
> > driver and maintains the driver.  Should the part be categorized under
> > vendor 'A'?  IMHO, I think it should be categorized as a vendor 'B'
> > driver.
> 
> Several of the Ethernet drivers are of a third type: vendor A chip, vendor B
> card, entity C software.
> 
> > I started this work with the idea of trying to organize the drivers in
> > the same way that the drivers were to be in the Kconfig, which tended to
> > be drivers/net/ethernet/<manufacturer>.
> >
> > One of the problems that arise in this organization is what do we do
> > when vendor A is bought by vendor B, and vendor B takes on the support
> > of all the old vendor A parts/drivers?
> 
> We don't care. We don't sort drivers by who support them. Eventually, vendors
> lose interest and they all end up under "Linux kernel community" anyway.

It may just be me, these statements seem negative and bitter and is not
helping us "solve" the issue.  While the statements may be true,  I
would like to try and find a solution, what ever it may be, to better
organize drivers/net/ethernet/ drivers to help with maintenance and
future development.

> 
> > So I am open to suggestions.  The process I have using to organize the
> > drivers has been to group drivers that use common libraries and/or code
> > first, then group by either manufacturer, maintainer, or common
> > platform.
> >
> > I would like to keep the lasi_82506.c, sni_82596.c, 82506.c and similar
> > drivers out of the intel/ directory because we would not be supporting
> > the drivers and they are not similar to our drivers that we do support
> > that would be in the intel/ directory.
> >
> > Again, I open to suggestions on how to best organize these types of
> > drivers.  Maybe create a misc/ or <bus_type>/ for these types of
> > drivers?
> 
> "Similar" drivers should be together and consolidated (if someone has time
> to do it). They can even be of different brands.
> I.e. not all Tulip-compatibles were manufactured by Digital or Intel.

I agree and understand, that is why I am taking the time to do it.  The
drivers/net/ethernet/8390/, drivers/net/ethernet/tulip and
drivers/net/ethernet/sun/ are some examples of this.

> 
> >> > better organize the 82596.c, lasi_82596.c, lib82596.c, and
> >> sni_82596.c
> >> > which all use an Intel Ethernet chip but were written and supported
> >> by
> >> > someone other than Intel.
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-07-11  9:39             ` Jeff Kirsher
@ 2011-07-11  9:51               ` Geert Uytterhoeven
  2011-07-11 11:31               ` Christoph Hellwig
  1 sibling, 0 replies; 135+ messages in thread
From: Geert Uytterhoeven @ 2011-07-11  9:51 UTC (permalink / raw)
  To: jeffrey.t.kirsher; +Cc: davem, netdev

On Mon, Jul 11, 2011 at 11:39, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> On Sun, 2011-07-10 at 23:33 -0700, Geert Uytterhoeven wrote:
>> On Mon, Jul 11, 2011 at 02:48, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
>> > On Sun, 2011-07-10 at 12:34 -0700, Geert Uytterhoeven wrote:
>> >> On Sat, Jul 9, 2011 at 16:30, Jeff Kirsher
>> >> <jeffrey.t.kirsher@intel.com> wrote:
>> >> > On Tue, 2011-06-28 at 13:33 -0700, Geert Uytterhoeven wrote:
>> >> >> And (in some other patch) 82596.c is an Intel driver, not a
>> >> Motorola driver.
>> >> >
>> >> > 82596.c is not an Intel driver, it is an Intel part.  The driver was
>> >>
>> >> Sorry, I meant "driver for an Intel part".
>> >>
>> >> > written and support by someone other than Intel.  I am looking at
>> >> how to
>> >>
>> >> Sure. But I'm strongly against classifying drivers based on who wrote
>> >> them ;-)
>> >
>> > I agree to some extent, because if that were the case, we would have a
>> > donald_becker/ directory for several of the drivers. :)
>> >
>> > Here is one of the problem's I keep running into and there is no simple
>> > answer.  While most of the drivers can be grouped together by the
>> > hardware they use, that does not work "logically" for every driver.
>> >
>> > In addition, if vendor 'A' makes a part and vendor 'B' uses same part in
>> > a device/system/NIC and vendor 'B' creates the driver, supports the
>> > driver and maintains the driver.  Should the part be categorized under
>> > vendor 'A'?  IMHO, I think it should be categorized as a vendor 'B'
>> > driver.
>>
>> Several of the Ethernet drivers are of a third type: vendor A chip, vendor B
>> card, entity C software.
>>
>> > I started this work with the idea of trying to organize the drivers in
>> > the same way that the drivers were to be in the Kconfig, which tended to
>> > be drivers/net/ethernet/<manufacturer>.
>> >
>> > One of the problems that arise in this organization is what do we do
>> > when vendor A is bought by vendor B, and vendor B takes on the support
>> > of all the old vendor A parts/drivers?
>>
>> We don't care. We don't sort drivers by who support them. Eventually, vendors
>> lose interest and they all end up under "Linux kernel community" anyway.
>
> It may just be me, these statements seem negative and bitter and is not
> helping us "solve" the issue.  While the statements may be true,  I
> would like to try and find a solution, what ever it may be, to better
> organize drivers/net/ethernet/ drivers to help with maintenance and
> future development.
>
>> > So I am open to suggestions.  The process I have using to organize the
>> > drivers has been to group drivers that use common libraries and/or code
>> > first, then group by either manufacturer, maintainer, or common
>> > platform.
>> >
>> > I would like to keep the lasi_82506.c, sni_82596.c, 82506.c and similar
>> > drivers out of the intel/ directory because we would not be supporting
>> > the drivers and they are not similar to our drivers that we do support
>> > that would be in the intel/ directory.
>> >
>> > Again, I open to suggestions on how to best organize these types of
>> > drivers.  Maybe create a misc/ or <bus_type>/ for these types of
>> > drivers?
>>
>> "Similar" drivers should be together and consolidated (if someone has time
>> to do it). They can even be of different brands.
>> I.e. not all Tulip-compatibles were manufactured by Digital or Intel.
>
> I agree and understand, that is why I am taking the time to do it.  The
> drivers/net/ethernet/8390/, drivers/net/ethernet/tulip and
> drivers/net/ethernet/sun/ are some examples of this.

I have no problems with moving all 82596 drivers to drivers/net/ethernet/intel/.

>> >> > better organize the 82596.c, lasi_82596.c, lib82596.c, and
>> >> sni_82596.c
>> >> > which all use an Intel Ethernet chip but were written and supported
>> >> by
>> >> > someone other than Intel.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-07-11  9:39             ` Jeff Kirsher
  2011-07-11  9:51               ` Geert Uytterhoeven
@ 2011-07-11 11:31               ` Christoph Hellwig
  2011-07-11 11:41                 ` David Miller
  1 sibling, 1 reply; 135+ messages in thread
From: Christoph Hellwig @ 2011-07-11 11:31 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: Geert Uytterhoeven, davem, netdev

On Mon, Jul 11, 2011 at 02:39:57AM -0700, Jeff Kirsher wrote:
> It may just be me, these statements seem negative and bitter and is not
> helping us "solve" the issue.  While the statements may be true,  I
> would like to try and find a solution, what ever it may be, to better
> organize drivers/net/ethernet/ drivers to help with maintenance and
> future development.

It would help what the whole point of shuffling these drivers around
in arbitrary ways is.  Splitting them up for the actual protocols might
make some sense, as would giving a subdirectory to every non-trivial
driver.  But what whole vendor split, even if consistently implemented
seems like a lot of wanking for very little juice.


^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
  2011-07-11 11:31               ` Christoph Hellwig
@ 2011-07-11 11:41                 ` David Miller
  0 siblings, 0 replies; 135+ messages in thread
From: David Miller @ 2011-07-11 11:41 UTC (permalink / raw)
  To: hch; +Cc: jeffrey.t.kirsher, geert, netdev

From: Christoph Hellwig <hch@infradead.org>
Date: Mon, 11 Jul 2011 07:31:28 -0400

> But what whole vendor split, even if consistently implemented seems
> like a lot of wanking for very little juice.

There's simply too much stuff under drivers/net right now, I
want TAB completion to actually start being useful again.

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 46/72] ixp2000: Move the Radisys driver
  2011-07-09 15:58     ` Jeff Kirsher
@ 2011-07-15  0:08       ` Lennert Buytenhek
  2011-07-15  1:19         ` Jeff Kirsher
  0 siblings, 1 reply; 135+ messages in thread
From: Lennert Buytenhek @ 2011-07-15  0:08 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

On Sat, Jul 09, 2011 at 08:58:56AM -0700, Jeff Kirsher wrote:

> > > Move the Radisys driver into drivers/net/ethernet/radisys/ and
> > > make the necessary Kconfig and Makefile changes
> > > 
> > > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > > ---
> > >  MAINTAINERS                                        |    2 +-
> > >  drivers/net/Kconfig                                |    2 --
> > >  drivers/net/Makefile                               |    1 -
> > >  drivers/net/ethernet/Kconfig                       |    1 +
> > >  drivers/net/ethernet/Makefile                      |    1 +
> > >  drivers/net/ethernet/radisys/Kconfig               |   16 ++++++++++++++++
> > >  drivers/net/ethernet/radisys/Makefile              |    5 +++++
> > >  drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig |    2 +-
> > >  .../net/{ => ethernet/radisys}/ixp2000/Makefile    |    0
> > 
> > The ixp2000 is a series of Intel ARM SoCs, and the ENP2611 is a Radisys
> > PCI board based on the ixp2000 series (ixp2400), so it doesn't make
> > sense to put everything in the radisys/ directory.
> 
> It was suggested earlier that it probably should be in either ixp/ or
> radisys/, and someone suggested that ixp/ might be confusing.  If you
> would like to keep it under drivers/net/ethernet/ixp2000, I am fine with
> that as well.
> 
> > If you insist on moving all drivers into vendor directories (I don't
> > like that idea at all -- are we going to rename directories and shuffle
> > stuff around every time vendor A buys vendor B or takes over one of
> > vendor B's products?), at least the core ixp2000 code should be under
> > intel/.
> 
> It was not my preference to place drivers into vendor specific
> directories because of that very reason, as I did the work, it just
> tended to work out that way.
> 
> The reason (as stated before) that it was not moved into intel/
> directory is because the driver was not written (and supported) by
> Intel.

I didn't follow the discussion, but that seems like a silly argument.
Does that mean that any non-vendor supported driver can't go into
drivers/net/$vendor/?  What if the vendor starts contributing to the
driver later on, will the driver be moved then?

It seems that what you're saying is that you don't want the ixp2000
driver in "your" subdirectory.

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 46/72] ixp2000: Move the Radisys driver
  2011-07-15  0:08       ` Lennert Buytenhek
@ 2011-07-15  1:19         ` Jeff Kirsher
  2011-07-15 10:32           ` Lennert Buytenhek
  0 siblings, 1 reply; 135+ messages in thread
From: Jeff Kirsher @ 2011-07-15  1:19 UTC (permalink / raw)
  To: Lennert Buytenhek; +Cc: davem, netdev

[-- Attachment #1: Type: text/plain, Size: 3337 bytes --]

On Thu, 2011-07-14 at 17:08 -0700, Lennert Buytenhek wrote:
> On Sat, Jul 09, 2011 at 08:58:56AM -0700, Jeff Kirsher wrote:
> 
> > > > Move the Radisys driver into drivers/net/ethernet/radisys/ and
> > > > make the necessary Kconfig and Makefile changes
> > > > 
> > > > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > > > ---
> > > >  MAINTAINERS                                        |    2 +-
> > > >  drivers/net/Kconfig                                |    2 --
> > > >  drivers/net/Makefile                               |    1 -
> > > >  drivers/net/ethernet/Kconfig                       |    1 +
> > > >  drivers/net/ethernet/Makefile                      |    1 +
> > > >  drivers/net/ethernet/radisys/Kconfig               |   16 ++++++++++++++++
> > > >  drivers/net/ethernet/radisys/Makefile              |    5 +++++
> > > >  drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig |    2 +-
> > > >  .../net/{ => ethernet/radisys}/ixp2000/Makefile    |    0
> > > 
> > > The ixp2000 is a series of Intel ARM SoCs, and the ENP2611 is a Radisys
> > > PCI board based on the ixp2000 series (ixp2400), so it doesn't make
> > > sense to put everything in the radisys/ directory.
> > 
> > It was suggested earlier that it probably should be in either ixp/ or
> > radisys/, and someone suggested that ixp/ might be confusing.  If you
> > would like to keep it under drivers/net/ethernet/ixp2000, I am fine with
> > that as well.
> > 
> > > If you insist on moving all drivers into vendor directories (I don't
> > > like that idea at all -- are we going to rename directories and shuffle
> > > stuff around every time vendor A buys vendor B or takes over one of
> > > vendor B's products?), at least the core ixp2000 code should be under
> > > intel/.
> > 
> > It was not my preference to place drivers into vendor specific
> > directories because of that very reason, as I did the work, it just
> > tended to work out that way.
> > 
> > The reason (as stated before) that it was not moved into intel/
> > directory is because the driver was not written (and supported) by
> > Intel.
> 
> I didn't follow the discussion, but that seems like a silly argument.
> Does that mean that any non-vendor supported driver can't go into
> drivers/net/$vendor/?  What if the vendor starts contributing to the
> driver later on, will the driver be moved then?
> 
> It seems that what you're saying is that you don't want the ixp2000
> driver in "your" subdirectory.

It is more that all the drivers that in intel/ are all very similar and
have "common" code which potentially code be shared.  We have been
looking at what possibilities there are for the common code between the
Intel supported drivers.  So it really did not make sense to throw a
driver into the intel/ directory just because it used an Intel chip, but
has nothing in common with the other drivers in that directory.  Sorry
if my previous explanation sounded like it I just did not want the
drivers in the intel/ because we did not write or support it.

After looking at ixp2000/ixp4xx drivers and the 82586/82596 drivers a
bit more, I came up with the solution of putting the IXP drivers in
xscale/ and the 82586/82596 drivers in i825xx/ directory.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 135+ messages in thread
* Re: [RFC 46/72] ixp2000: Move the Radisys driver
  2011-07-15  1:19         ` Jeff Kirsher
@ 2011-07-15 10:32           ` Lennert Buytenhek
  0 siblings, 0 replies; 135+ messages in thread
From: Lennert Buytenhek @ 2011-07-15 10:32 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: davem, netdev

On Thu, Jul 14, 2011 at 06:19:17PM -0700, Jeff Kirsher wrote:

> > > > > Move the Radisys driver into drivers/net/ethernet/radisys/ and
> > > > > make the necessary Kconfig and Makefile changes
> > > > > 
> > > > > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > > > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > > > > ---
> > > > >  MAINTAINERS                                        |    2 +-
> > > > >  drivers/net/Kconfig                                |    2 --
> > > > >  drivers/net/Makefile                               |    1 -
> > > > >  drivers/net/ethernet/Kconfig                       |    1 +
> > > > >  drivers/net/ethernet/Makefile                      |    1 +
> > > > >  drivers/net/ethernet/radisys/Kconfig               |   16 ++++++++++++++++
> > > > >  drivers/net/ethernet/radisys/Makefile              |    5 +++++
> > > > >  drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig |    2 +-
> > > > >  .../net/{ => ethernet/radisys}/ixp2000/Makefile    |    0
> > > > 
> > > > The ixp2000 is a series of Intel ARM SoCs, and the ENP2611 is a Radisys
> > > > PCI board based on the ixp2000 series (ixp2400), so it doesn't make
> > > > sense to put everything in the radisys/ directory.
> > > 
> > > It was suggested earlier that it probably should be in either ixp/ or
> > > radisys/, and someone suggested that ixp/ might be confusing.  If you
> > > would like to keep it under drivers/net/ethernet/ixp2000, I am fine with
> > > that as well.
> > > 
> > > > If you insist on moving all drivers into vendor directories (I don't
> > > > like that idea at all -- are we going to rename directories and shuffle
> > > > stuff around every time vendor A buys vendor B or takes over one of
> > > > vendor B's products?), at least the core ixp2000 code should be under
> > > > intel/.
> > > 
> > > It was not my preference to place drivers into vendor specific
> > > directories because of that very reason, as I did the work, it just
> > > tended to work out that way.
> > > 
> > > The reason (as stated before) that it was not moved into intel/
> > > directory is because the driver was not written (and supported) by
> > > Intel.
> > 
> > I didn't follow the discussion, but that seems like a silly argument.
> > Does that mean that any non-vendor supported driver can't go into
> > drivers/net/$vendor/?  What if the vendor starts contributing to the
> > driver later on, will the driver be moved then?
> > 
> > It seems that what you're saying is that you don't want the ixp2000
> > driver in "your" subdirectory.
> 
> It is more that all the drivers that in intel/ are all very similar and
> have "common" code which potentially code be shared.  We have been
> looking at what possibilities there are for the common code between the
> Intel supported drivers.  So it really did not make sense to throw a
> driver into the intel/ directory just because it used an Intel chip, but
> has nothing in common with the other drivers in that directory.  Sorry
> if my previous explanation sounded like it I just did not want the
> drivers in the intel/ because we did not write or support it.
> 
> After looking at ixp2000/ixp4xx drivers and the 82586/82596 drivers a
> bit more, I came up with the solution of putting the IXP drivers in
> xscale/ and the 82586/82596 drivers in i825xx/ directory.

That sounds fine with me.

^ permalink raw reply	[flat|nested] 135+ messages in thread
end of thread, other threads:[~2011-07-15 10:32 UTC | newest]

Thread overview: 135+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-25 13:58 [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Jeff Kirsher
2011-06-25 13:58 ` [RFC 01/72] drivers/net/ethernet: Add ethernet dir and config option Jeff Kirsher
2011-06-25 13:58 ` [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers Jeff Kirsher
2011-06-25 16:11   ` David Dillow
2011-06-28  8:22   ` Alan Cox
2011-07-09 15:27     ` Jeff Kirsher
2011-06-25 13:58 ` [RFC 03/72] amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 04/72] 8390: Move the 8390 related drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 05/72] broadcom: Move the Broadcom drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 06/72] chelsio: Move the Chelsio drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 07/72] intel: Move the Intel wired LAN drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 08/72] qlogic: Move the QLogic drivers Jeff Kirsher
2011-06-27  1:30   ` Anirban Chakraborty
2011-06-25 13:58 ` [RFC 09/72] smc: Move the SMC drivers Jeff Kirsher
2011-06-25 14:30   ` Arnd Bergmann
2011-06-25 13:58 ` [RFC 10/72] ni5*/ni65: Move the Racal-Interlan (Micom) drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 11/72] cassini/niu/sun*: Move the Sun drivers Jeff Kirsher
2011-06-25 14:46   ` Oliver Hartkopp
2011-06-25 23:56     ` David Miller
2011-06-25 13:58 ` [RFC 12/72] sfc: Move the Solarflare drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 13/72] be2net: Move the Emulex driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 14/72] bna: Move the Brocade driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 15/72] mlx4: Move the Mellanox driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 16/72] myri*: Move the Myricom drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 17/72] s2io/vxge: Move the Exar drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 18/72] ehea/ibm*: Move the IBM drivers Jeff Kirsher
2011-06-25 14:39   ` Oliver Hartkopp
2011-06-25 15:04     ` Arnd Bergmann
2011-06-26  0:37       ` Benjamin Herrenschmidt
2011-06-25 13:58 ` [RFC 19/72] enic: Move the Cisco driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 20/72] pasemic_mac*: Move the PA Semi driver Jeff Kirsher
2011-06-26  1:34   ` Olof Johansson
2011-06-25 13:58 ` [RFC 21/72] tehuti: Move the Tehuti driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 22/72] stmmac: Move the STMicroelectronics driver Jeff Kirsher
2011-06-25 13:58 ` [RFC 23/72] bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 24/72] *sonic/natsemi/ns83829: Move the National Semi-conductor drivers Jeff Kirsher
2011-06-25 17:21   ` Marc Gauthier
2011-06-25 13:58 ` [RFC 25/72] smsc*/smc911x: Move the SMSC drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 26/72] arm: Move the ARM/ACORN drivers Jeff Kirsher
2011-06-25 14:48   ` Arnd Bergmann
2011-06-25 14:50     ` Arnd Bergmann
2011-06-25 15:53     ` Russell King - ARM Linux
2011-06-25 16:03       ` Arnd Bergmann
2011-06-25 16:12         ` Russell King - ARM Linux
2011-06-25 16:59           ` Arnd Bergmann
2011-06-25 18:02             ` Jeff Kirsher
2011-06-25 18:06             ` Jeff Kirsher
2011-06-25 18:22               ` Arnd Bergmann
2011-06-26  6:38               ` Joe Perches
2011-06-27  3:10     ` Gole, Anant
2011-06-25 13:58 ` [RFC 27/72] ftgmac100/ftmac100: Move the Faraday drivers Jeff Kirsher
2011-06-27  1:51   ` Po-Yu Chuang
2011-06-25 13:58 ` [RFC 28/72] 8139*/atp/r8169: Move the Realtek drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 29/72] de6*/dl2k: Move the D-Link drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 30/72] atl*: Move the Atheros drivers Jeff Kirsher
2011-06-25 18:16   ` Chris Snook
2011-06-25 13:58 ` [RFC 31/72] tulip: Move the tulip drivers Jeff Kirsher
2011-07-03  0:04   ` Grant Grundler
2011-06-25 13:58 ` [RFC 32/72] ioc3-eth/meth/sgiseeq: Move the SGI drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 33/72] pch_gbe: Move the OKI driver Jeff Kirsher
2011-06-27  1:53   ` Toshiharu Okada
2011-06-25 13:58 ` [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers Jeff Kirsher
2011-06-25 14:49   ` Arnd Bergmann
2011-06-25 16:26     ` Stephen Hemminger
2011-06-25 13:58 ` [RFC 35/72] via-*: Move the VIA drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 36/72] eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers Jeff Kirsher
2011-06-29 15:39   ` Tabi Timur-B04825
2011-07-09 15:07     ` Jeff Kirsher
2011-06-25 13:58 ` [RFC 38/72] ks8*/ksz8*: Move the Micrel drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 39/72] mv643xx/pxa168: Move the Marvell drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 40/72] spider_net: Move the spider_net (IBM) driver Jeff Kirsher
2011-06-25 14:34   ` Arnd Bergmann
2011-06-25 13:58 ` [RFC 41/72] sis*: Move the Silicon Integrated Systems (SiS) drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 42/72] 82586.c/fec*: Move the Motorola drivers Jeff Kirsher
2011-06-25 16:53   ` Arnd Bergmann
2011-06-25 13:58 ` [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers Jeff Kirsher
2011-06-28 20:33   ` Geert Uytterhoeven
2011-07-09 14:30     ` Jeff Kirsher
2011-07-10 19:34       ` Geert Uytterhoeven
2011-07-11  0:48         ` Jeff Kirsher
2011-07-11  6:33           ` Geert Uytterhoeven
2011-07-11  9:39             ` Jeff Kirsher
2011-07-11  9:51               ` Geert Uytterhoeven
2011-07-11 11:31               ` Christoph Hellwig
2011-07-11 11:41                 ` David Miller
2011-07-10 19:56       ` Christoph Hellwig
2011-06-25 13:58 ` [RFC 44/72] s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 45/72] tlan/cpmac: Move the TI drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 46/72] ixp2000: Move the Radisys driver Jeff Kirsher
2011-06-26 11:47   ` Lennert Buytenhek
2011-07-09 15:58     ` Jeff Kirsher
2011-07-15  0:08       ` Lennert Buytenhek
2011-07-15  1:19         ` Jeff Kirsher
2011-07-15 10:32           ` Lennert Buytenhek
2011-06-25 13:58 ` [RFC 47/72] hamachi/yellowfin: Move the packet engine drivers Jeff Kirsher
2011-06-25 13:58 ` [RFC 48/72] octeon: Move the Cavium driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 49/72] jme: Move the JME driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 50/72] xilinx/ll_temac: Move the Xilinx drivers Jeff Kirsher
2011-06-25 13:59 ` [RFC 51/72] ipg: Move the IC Plus driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers Jeff Kirsher
2011-06-25 14:54   ` Arnd Bergmann
2011-06-25 16:25   ` Geoff Levand
2011-06-25 13:59 ` [RFC 53/72] korina: Move the IDT driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 54/72] au1000_eth/mipsnet/tc35815: Move the MIPS drivers Jeff Kirsher
2011-06-25 16:13   ` Ralf Baechle
2011-06-25 18:11     ` Jeff Kirsher
2011-06-25 13:59 ` [RFC 55/72] bfin_mac: Move the Blackfin driver Jeff Kirsher
2011-06-25 14:57   ` Arnd Bergmann
2011-06-27 18:41   ` Hennerich, Michael
2011-06-25 13:59 ` [RFC 56/72] macb: Move the Atmel driver Jeff Kirsher
2011-06-27  7:46   ` Nicolas Ferre
2011-06-27  9:29     ` Jamie Iles
2011-06-25 13:59 ` [RFC 57/72] sc92031: Move the Silan driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 58/72] sundance: Move the sundance driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 59/72] r6040: Move the RDC driver Jeff Kirsher
2011-06-25 18:59   ` Florian Fainelli
2011-06-25 13:59 ` [RFC 60/72] fealnx: Move the Myson driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 61/72] forcedeth: Move the NVIDIA nForce driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 62/72] starfire: Move the starfire driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 63/72] hp100/depca: Move the HP and Digital drivers Jeff Kirsher
2011-06-25 13:59 ` [RFC 64/72] at1700: Move the Allied Telesis driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 65/72] dnet: Move the Dave Ethernet driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 66/72] ethoc: Move the Avionic driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 67/72] greth: Move the Aeroflex Gaisler driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 68/72] enc28j60: Move the enc28j60 driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 69/72] dm9000: Move the Davicom driver Jeff Kirsher
2011-06-27  9:45   ` Sascha Hauer
2011-06-25 13:59 ` [RFC 70/72] netx: Move the netx driver Jeff Kirsher
2011-06-27  9:45   ` Sascha Hauer
2011-06-25 13:59 ` [RFC 71/72] sh_eth: Move the Renesas SuperH driver Jeff Kirsher
2011-06-25 13:59 ` [RFC 72/72] drivers/net: Kconfig and Makefile cleanup Jeff Kirsher
2011-06-26  7:54 ` [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/ Bill Fink
2011-06-26  8:35 ` Francois Romieu
2011-06-27  5:35 ` Jeff Kirsher

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.