* RE: [PATCH net-next-2.6 1/3] be2net: fix netdev_stats_update
From: Eric Dumazet @ 2011-06-27 6:05 UTC (permalink / raw)
To: Sathya.Perla; +Cc: davem, netdev
In-Reply-To: <3367B80B08154D42A3B2BC708B5D41F63F188EE7A3@EXMAIL.ad.emulex.com>
Le dimanche 26 juin 2011 à 22:19 -0700, Sathya.Perla@Emulex.Com a
écrit :
> >-----Original Message-----
> >From: David Miller [mailto:davem@davemloft.net]
> >Sent: Saturday, June 25, 2011 1:29 AM
> >To: eric.dumazet@gmail.com
> >Cc: Perla, Sathya; netdev@vger.kernel.org
> >Subject: Re: [PATCH net-next-2.6 1/3] be2net: fix netdev_stats_update
> >
> >From: Eric Dumazet <eric.dumazet@gmail.com>
> >Date: Fri, 24 Jun 2011 12:32:00 +0200
> >
> >> Hmm, isnt it a patch I provided 10 days ago ?
> >>
> >> I find very strange so few people are able to properly attribute work
> >> today...
> >
> >Sathya, if this patch is almost entriely the same as Eric's patch,
> >and you only made small minor changes, then it isn't your work.
>
> Dave, Sure, I'm fine with that. Could you apply this patch by replacing
> my name with Eric's? Or should I do the same and send you another one...
Please resend the patch, I am fine with you being the committer, but
please add in Changelog _some_ attribution, like :
Problem initialy reported and fixed by Eric Dumazet.
You see, there is a difference if you at least acknowledge fact that
someone spent some time before you on the problem.
Correct attribution is an incent for people to look at your drivers and
fix their bugs, its a win-win.
^ permalink raw reply
* Re: [RFC 00/72] Organize/Move of the Ethernet drivers in drivers/net/
From: Jeff Kirsher @ 2011-06-27 5:35 UTC (permalink / raw)
To: davem@davemloft.net, Arnd Bergmann, Russell King - ARM Linux,
Joe Perches, Toshiharu Okada <toshiha
Cc: netdev@vger.kernel.org
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
[-- 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
* Re: linux-next: build failure after merge of the final tree (net tree related)
From: Stephen Rothwell @ 2011-06-27 5:35 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Alexey Dobriyan
In-Reply-To: <20110623152535.e9ec4ad2.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]
Hi all,
On Thu, 23 Jun 2011 15:25:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/net/can/sja1000/sja1000_of_platform.c: In function 'sja1000_ofp_read_reg':
> drivers/net/can/sja1000/sja1000_of_platform.c:61:2: error: implicit declaration of function 'in_8'
> drivers/net/can/sja1000/sja1000_of_platform.c: In function 'sja1000_ofp_write_reg':
> drivers/net/can/sja1000/sja1000_of_platform.c:67:2: error: implicit declaration of function 'out_8'
> drivers/net/can/sja1000/sja1000_of_platform.c: In function 'sja1000_ofp_remove':
> drivers/net/can/sja1000/sja1000_of_platform.c:81:2: error: implicit declaration of function 'iounmap'
> drivers/net/can/sja1000/sja1000_of_platform.c: In function 'sja1000_ofp_probe':
> drivers/net/can/sja1000/sja1000_of_platform.c:113:2: error: implicit declaration of function 'ioremap_nocache'
> drivers/net/can/sja1000/sja1000_of_platform.c:113:7: warning: assignment makes pointer from integer without a cast
>
> Since this file has not been changed recently, I suspect that this was
> caused by commit b7f080cfe223 ("net: remove mm.h inclusion from
> netdevice.h").
>
> I have left the build broken for now since it is also broken for other
> reasons.
I am still getting these, is there a fix pending?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net tree related)
From: Stephen Rothwell @ 2011-06-27 5:29 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: David Miller, netdev, linux-next, linux-kernel
In-Reply-To: <BANLkTin+iCahNVJGKc-_26pb9zEERTc8_A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 696 bytes --]
Hi Alexey,
On Thu, 23 Jun 2011 16:04:13 +0300 Alexey Dobriyan <adobriyan@gmail.com> wrote:
>
> On Thu, Jun 23, 2011 at 8:29 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
>
> I build on all powerpc defconfigs, somehow this driver is not pinned
> by any of them :^)
Well, yes, but an allmodconfig or allyesconfig build will get the error.
>
> > drivers/net/ll_temac_main.c:209:4: error: implicit declaration of function 'dma_unmap_single'
>
Is there a fix?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* RE: [PATCH net-next-2.6 1/3] be2net: fix netdev_stats_update
From: Sathya.Perla @ 2011-06-27 5:19 UTC (permalink / raw)
To: davem, eric.dumazet; +Cc: netdev
In-Reply-To: <20110624.125905.362177986003856504.davem@davemloft.net>
>-----Original Message-----
>From: David Miller [mailto:davem@davemloft.net]
>Sent: Saturday, June 25, 2011 1:29 AM
>To: eric.dumazet@gmail.com
>Cc: Perla, Sathya; netdev@vger.kernel.org
>Subject: Re: [PATCH net-next-2.6 1/3] be2net: fix netdev_stats_update
>
>From: Eric Dumazet <eric.dumazet@gmail.com>
>Date: Fri, 24 Jun 2011 12:32:00 +0200
>
>> Hmm, isnt it a patch I provided 10 days ago ?
>>
>> I find very strange so few people are able to properly attribute work
>> today...
>
>Sathya, if this patch is almost entriely the same as Eric's patch,
>and you only made small minor changes, then it isn't your work.
Dave, Sure, I'm fine with that. Could you apply this patch by replacing
my name with Eric's? Or should I do the same and send you another one...
^ permalink raw reply
* [PATCH 7/8] ixp4xx_hss: Update to current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev, Krzysztof Halasa; +Cc: linux-kernel
In-Reply-To: <cover.1309150683.git.joe@perches.com>
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/ixp4xx_hss.c | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index f1e1643..aaaca9a 100644
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -8,6 +8,8 @@
* as published by the Free Software Foundation.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/bitops.h>
#include <linux/cdev.h>
#include <linux/dma-mapping.h>
@@ -358,9 +360,8 @@ static void hss_npe_send(struct port *port, struct msg *msg, const char* what)
{
u32 *val = (u32*)msg;
if (npe_send_message(port->npe, msg, what)) {
- printk(KERN_CRIT "HSS-%i: unable to send command [%08X:%08X]"
- " to %s\n", port->id, val[0], val[1],
- npe_name(port->npe));
+ pr_crit("HSS-%i: unable to send command [%08X:%08X] to %s\n",
+ port->id, val[0], val[1], npe_name(port->npe));
BUG();
}
}
@@ -447,8 +448,7 @@ static void hss_config(struct port *port)
if (npe_recv_message(port->npe, &msg, "HSS_LOAD_CONFIG") ||
/* HSS_LOAD_CONFIG for port #1 returns port_id = #4 */
msg.cmd != PORT_CONFIG_LOAD || msg.data32) {
- printk(KERN_CRIT "HSS-%i: HSS_LOAD_CONFIG failed\n",
- port->id);
+ pr_crit("HSS-%i: HSS_LOAD_CONFIG failed\n", port->id);
BUG();
}
@@ -477,8 +477,7 @@ static u32 hss_get_status(struct port *port)
msg.hss_port = port->id;
hss_npe_send(port, &msg, "PORT_ERROR_READ");
if (npe_recv_message(port->npe, &msg, "PORT_ERROR_READ")) {
- printk(KERN_CRIT "HSS-%i: unable to read HSS status\n",
- port->id);
+ pr_crit("HSS-%i: unable to read HSS status\n", port->id);
BUG();
}
@@ -736,9 +735,8 @@ static int hss_hdlc_poll(struct napi_struct *napi, int budget)
dev->stats.rx_errors++;
break;
default: /* FIXME - remove printk */
- printk(KERN_ERR "%s: hss_hdlc_poll: status 0x%02X"
- " errors %u\n", dev->name, desc->status,
- desc->error_count);
+ netdev_err(dev, "hss_hdlc_poll: status 0x%02X errors %u\n",
+ desc->status, desc->error_count);
dev->stats.rx_errors++;
}
@@ -1127,8 +1125,8 @@ static int hss_hdlc_close(struct net_device *dev)
buffs--;
if (buffs)
- printk(KERN_CRIT "%s: unable to drain RX queue, %i buffer(s)"
- " left in NPE\n", dev->name, buffs);
+ netdev_crit(dev, "unable to drain RX queue, %i buffer(s) left in NPE\n",
+ buffs);
buffs = TX_DESCS;
while (queue_get_desc(queue_ids[port->id].tx, port, 1) >= 0)
@@ -1143,8 +1141,8 @@ static int hss_hdlc_close(struct net_device *dev)
} while (++i < MAX_CLOSE_WAIT);
if (buffs)
- printk(KERN_CRIT "%s: unable to drain TX queue, %i buffer(s) "
- "left in NPE\n", dev->name, buffs);
+ netdev_crit(dev, "unable to drain TX queue, %i buffer(s) left in NPE\n",
+ buffs);
#if DEBUG_CLOSE
if (!buffs)
printk(KERN_DEBUG "Draining TX queues took %i cycles\n", i);
@@ -1364,7 +1362,7 @@ static int __devinit hss_init_one(struct platform_device *pdev)
platform_set_drvdata(pdev, port);
- printk(KERN_INFO "%s: HSS-%i\n", dev->name, port->id);
+ netdev_info(dev, "HSS-%i\n", port->id);
return 0;
err_free_netdev:
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 6/8] farsync: Update to current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev, Kevin Curtis; +Cc: linux-kernel
In-Reply-To: <cover.1309150683.git.joe@perches.com>
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/farsync.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 0f27f4c..ebb9f24 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -1665,10 +1665,9 @@ check_started_ok(struct fst_card_info *card)
* existing firmware etc so we just report it for the moment.
*/
if (FST_RDL(card, numberOfPorts) != card->nports) {
- pr_warning("Port count mismatch on card %d. "
- "Firmware thinks %d we say %d\n",
- card->card_no,
- FST_RDL(card, numberOfPorts), card->nports);
+ pr_warn("Port count mismatch on card %d. Firmware thinks %d we say %d\n",
+ card->card_no,
+ FST_RDL(card, numberOfPorts), card->nports);
}
}
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 1/8] generic_hdlc: Update to current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev, Krzysztof Halasa; +Cc: linux-kernel
In-Reply-To: <cover.1309150683.git.joe@perches.com>
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/c101.c | 30 +++++++-------
drivers/net/wan/hd64570.c | 8 ++--
drivers/net/wan/hd64572.c | 8 ++--
drivers/net/wan/hdlc.c | 16 ++++---
drivers/net/wan/hdlc_cisco.c | 21 ++++------
drivers/net/wan/hdlc_fr.c | 96 +++++++++++++++++++-----------------------
drivers/net/wan/hdlc_ppp.c | 9 ++--
drivers/net/wan/hdlc_x25.c | 12 ++---
drivers/net/wan/n2.c | 42 +++++++++---------
drivers/net/wan/pc300too.c | 36 +++++++--------
drivers/net/wan/pci200syn.c | 29 ++++++-------
drivers/net/wan/wanxl.c | 90 ++++++++++++++++++---------------------
12 files changed, 186 insertions(+), 211 deletions(-)
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 4ac85a0..54f995f 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -14,6 +14,8 @@
* Moxa C101 User's Manual
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/capability.h>
@@ -313,44 +315,44 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
int result;
if (irq<3 || irq>15 || irq == 6) /* FIXME */ {
- printk(KERN_ERR "c101: invalid IRQ value\n");
+ pr_err("invalid IRQ value\n");
return -ENODEV;
}
if (winbase < 0xC0000 || winbase > 0xDFFFF || (winbase & 0x3FFF) !=0) {
- printk(KERN_ERR "c101: invalid RAM value\n");
+ pr_err("invalid RAM value\n");
return -ENODEV;
}
card = kzalloc(sizeof(card_t), GFP_KERNEL);
if (card == NULL) {
- printk(KERN_ERR "c101: unable to allocate memory\n");
+ pr_err("unable to allocate memory\n");
return -ENOBUFS;
}
card->dev = alloc_hdlcdev(card);
if (!card->dev) {
- printk(KERN_ERR "c101: unable to allocate memory\n");
+ pr_err("unable to allocate memory\n");
kfree(card);
return -ENOBUFS;
}
if (request_irq(irq, sca_intr, 0, devname, card)) {
- printk(KERN_ERR "c101: could not allocate IRQ\n");
+ pr_err("could not allocate IRQ\n");
c101_destroy_card(card);
return -EBUSY;
}
card->irq = irq;
if (!request_mem_region(winbase, C101_MAPPED_RAM_SIZE, devname)) {
- printk(KERN_ERR "c101: could not request RAM window\n");
+ pr_err("could not request RAM window\n");
c101_destroy_card(card);
return -EBUSY;
}
card->phy_winbase = winbase;
card->win0base = ioremap(winbase, C101_MAPPED_RAM_SIZE);
if (!card->win0base) {
- printk(KERN_ERR "c101: could not map I/O address\n");
+ pr_err("could not map I/O address\n");
c101_destroy_card(card);
return -EFAULT;
}
@@ -381,7 +383,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
result = register_hdlc_device(dev);
if (result) {
- printk(KERN_WARNING "c101: unable to register hdlc device\n");
+ pr_warn("unable to register hdlc device\n");
c101_destroy_card(card);
return result;
}
@@ -389,10 +391,8 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
sca_init_port(card); /* Set up C101 memory */
set_carrier(card);
- printk(KERN_INFO "%s: Moxa C101 on IRQ%u,"
- " using %u TX + %u RX packets rings\n",
- dev->name, card->irq,
- card->tx_ring_buffers, card->rx_ring_buffers);
+ netdev_info(dev, "Moxa C101 on IRQ%u, using %u TX + %u RX packets rings\n",
+ card->irq, card->tx_ring_buffers, card->rx_ring_buffers);
*new_card = card;
new_card = &card->next_card;
@@ -405,12 +405,12 @@ static int __init c101_init(void)
{
if (hw == NULL) {
#ifdef MODULE
- printk(KERN_INFO "c101: no card initialized\n");
+ pr_info("no card initialized\n");
#endif
return -EINVAL; /* no parameters specified, abort */
}
- printk(KERN_INFO "%s\n", version);
+ pr_info("%s\n", version);
do {
unsigned long irq, ram;
@@ -428,7 +428,7 @@ static int __init c101_init(void)
return first_card ? 0 : -EINVAL;
}while(*hw++ == ':');
- printk(KERN_ERR "c101: invalid hardware parameters\n");
+ pr_err("invalid hardware parameters\n");
return first_card ? 0 : -EINVAL;
}
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index a3ea27c..33b67d8 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -582,8 +582,8 @@ static void sca_dump_rings(struct net_device *dev)
sca_in(DSR_RX(phy_node(port)), card), port->rxin,
sca_in(DSR_RX(phy_node(port)), card) & DSR_DE ? "" : "in");
for (cnt = 0; cnt < port_to_card(port)->rx_ring_buffers; cnt++)
- printk(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
- printk(KERN_CONT "\n");
+ pr_cont(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
+ pr_cont("\n");
printk(KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
"last=%u %sactive",
@@ -593,8 +593,8 @@ static void sca_dump_rings(struct net_device *dev)
sca_in(DSR_TX(phy_node(port)), card) & DSR_DE ? "" : "in");
for (cnt = 0; cnt < port_to_card(port)->tx_ring_buffers; cnt++)
- printk(" %02X", readb(&(desc_address(port, cnt, 1)->stat)));
- printk("\n");
+ pr_cont(" %02X", readb(&(desc_address(port, cnt, 1)->stat)));
+ pr_cont("\n");
printk(KERN_DEBUG "MSCI: MD: %02x %02x %02x, ST: %02x %02x %02x %02x,"
" FST: %02x CST: %02x %02x\n",
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index e305274..efc0db1 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -530,8 +530,8 @@ static void sca_dump_rings(struct net_device *dev)
sca_in(DSR_RX(port->chan), card), port->rxin,
sca_in(DSR_RX(port->chan), card) & DSR_DE ? "" : "in");
for (cnt = 0; cnt < port->card->rx_ring_buffers; cnt++)
- printk(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
- printk(KERN_CONT "\n");
+ pr_cont(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
+ pr_cont("\n");
printk(KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
"last=%u %sactive",
@@ -541,8 +541,8 @@ static void sca_dump_rings(struct net_device *dev)
sca_in(DSR_TX(port->chan), card) & DSR_DE ? "" : "in");
for (cnt = 0; cnt < port->card->tx_ring_buffers; cnt++)
- printk(" %02X", readb(&(desc_address(port, cnt, 1)->stat)));
- printk("\n");
+ pr_cont(" %02X", readb(&(desc_address(port, cnt, 1)->stat)));
+ pr_cont("\n");
printk(KERN_DEBUG "MSCI: MD: %02x %02x %02x,"
" ST: %02x %02x %02x %02x %02x, FST: %02x CST: %02x %02x\n",
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index 5d4bb61..10cc7df 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -22,6 +22,8 @@
* - proto->start() and stop() are called with spin_lock_irq held.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/errno.h>
#include <linux/hdlc.h>
#include <linux/if_arp.h>
@@ -130,10 +132,10 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event,
goto carrier_exit;
if (hdlc->carrier) {
- printk(KERN_INFO "%s: Carrier detected\n", dev->name);
+ netdev_info(dev, "Carrier detected\n");
hdlc_proto_start(dev);
} else {
- printk(KERN_INFO "%s: Carrier lost\n", dev->name);
+ netdev_info(dev, "Carrier lost\n");
hdlc_proto_stop(dev);
}
@@ -165,10 +167,10 @@ int hdlc_open(struct net_device *dev)
spin_lock_irq(&hdlc->state_lock);
if (hdlc->carrier) {
- printk(KERN_INFO "%s: Carrier detected\n", dev->name);
+ netdev_info(dev, "Carrier detected\n");
hdlc_proto_start(dev);
} else
- printk(KERN_INFO "%s: No carrier\n", dev->name);
+ netdev_info(dev, "No carrier\n");
hdlc->open = 1;
@@ -281,8 +283,8 @@ int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,
if (size)
if ((dev_to_hdlc(dev)->state = kmalloc(size,
GFP_KERNEL)) == NULL) {
- printk(KERN_WARNING "Memory squeeze on"
- " hdlc_proto_attach()\n");
+ netdev_warn(dev,
+ "Memory squeeze on hdlc_proto_attach()\n");
module_put(proto->module);
return -ENOBUFS;
}
@@ -363,7 +365,7 @@ static int __init hdlc_module_init(void)
{
int result;
- printk(KERN_INFO "%s\n", version);
+ pr_info("%s\n", version);
if ((result = register_netdevice_notifier(&hdlc_notifier)) != 0)
return result;
dev_add_pack(&hdlc_packet_type);
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index b1e5e5b..3f20808 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -103,9 +103,7 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,
skb = dev_alloc_skb(sizeof(struct hdlc_header) +
sizeof(struct cisco_packet));
if (!skb) {
- printk(KERN_WARNING
- "%s: Memory squeeze on cisco_keepalive_send()\n",
- dev->name);
+ netdev_warn(dev, "Memory squeeze on cisco_keepalive_send()\n");
return;
}
skb_reserve(skb, 4);
@@ -181,8 +179,8 @@ static int cisco_rx(struct sk_buff *skb)
CISCO_PACKET_LEN) &&
(skb->len != sizeof(struct hdlc_header) +
CISCO_BIG_PACKET_LEN)) {
- printk(KERN_INFO "%s: Invalid length of Cisco control"
- " packet (%d bytes)\n", dev->name, skb->len);
+ netdev_info(dev, "Invalid length of Cisco control packet (%d bytes)\n",
+ skb->len);
goto rx_error;
}
@@ -217,8 +215,7 @@ static int cisco_rx(struct sk_buff *skb)
return NET_RX_SUCCESS;
case CISCO_ADDR_REPLY:
- printk(KERN_INFO "%s: Unexpected Cisco IP address "
- "reply\n", dev->name);
+ netdev_info(dev, "Unexpected Cisco IP address reply\n");
goto rx_error;
case CISCO_KEEPALIVE_REQ:
@@ -235,9 +232,8 @@ static int cisco_rx(struct sk_buff *skb)
min = sec / 60; sec -= min * 60;
hrs = min / 60; min -= hrs * 60;
days = hrs / 24; hrs -= days * 24;
- printk(KERN_INFO "%s: Link up (peer "
- "uptime %ud%uh%um%us)\n",
- dev->name, days, hrs, min, sec);
+ netdev_info(dev, "Link up (peer uptime %ud%uh%um%us)\n",
+ days, hrs, min, sec);
netif_dormant_off(dev);
st->up = 1;
}
@@ -249,8 +245,7 @@ static int cisco_rx(struct sk_buff *skb)
} /* switch (keepalive type) */
} /* switch (protocol) */
- printk(KERN_INFO "%s: Unsupported protocol %x\n", dev->name,
- ntohs(data->protocol));
+ netdev_info(dev, "Unsupported protocol %x\n", ntohs(data->protocol));
dev_kfree_skb_any(skb);
return NET_RX_DROP;
@@ -272,7 +267,7 @@ static void cisco_timer(unsigned long arg)
if (st->up &&
time_after(jiffies, st->last_poll + st->settings.timeout * HZ)) {
st->up = 0;
- printk(KERN_INFO "%s: Link down\n", dev->name);
+ netdev_info(dev, "Link down\n");
netif_dormant_on(dev);
}
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index fc433f2..b25c922 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -446,15 +446,14 @@ static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev)
static inline void fr_log_dlci_active(pvc_device *pvc)
{
- printk(KERN_INFO "%s: DLCI %d [%s%s%s]%s %s\n",
- pvc->frad->name,
- pvc->dlci,
- pvc->main ? pvc->main->name : "",
- pvc->main && pvc->ether ? " " : "",
- pvc->ether ? pvc->ether->name : "",
- pvc->state.new ? " new" : "",
- !pvc->state.exist ? "deleted" :
- pvc->state.active ? "active" : "inactive");
+ netdev_info(pvc->frad, "DLCI %d [%s%s%s]%s %s\n",
+ pvc->dlci,
+ pvc->main ? pvc->main->name : "",
+ pvc->main && pvc->ether ? " " : "",
+ pvc->ether ? pvc->ether->name : "",
+ pvc->state.new ? " new" : "",
+ !pvc->state.exist ? "deleted" :
+ pvc->state.active ? "active" : "inactive");
}
@@ -481,16 +480,14 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
if (dce && fullrep) {
len += state(hdlc)->dce_pvc_count * (2 + stat_len);
if (len > HDLC_MAX_MRU) {
- printk(KERN_WARNING "%s: Too many PVCs while sending "
- "LMI full report\n", dev->name);
+ netdev_warn(dev, "Too many PVCs while sending LMI full report\n");
return;
}
}
skb = dev_alloc_skb(len);
if (!skb) {
- printk(KERN_WARNING "%s: Memory squeeze on fr_lmi_send()\n",
- dev->name);
+ netdev_warn(dev, "Memory squeeze on fr_lmi_send()\n");
return;
}
memset(skb->data, 0, len);
@@ -615,8 +612,7 @@ static void fr_timer(unsigned long arg)
state(hdlc)->last_errors <<= 1; /* Shift the list */
if (state(hdlc)->request) {
if (state(hdlc)->reliable)
- printk(KERN_INFO "%s: No LMI status reply "
- "received\n", dev->name);
+ netdev_info(dev, "No LMI status reply received\n");
state(hdlc)->last_errors |= 1;
}
@@ -628,8 +624,7 @@ static void fr_timer(unsigned long arg)
}
if (state(hdlc)->reliable != reliable) {
- printk(KERN_INFO "%s: Link %sreliable\n", dev->name,
- reliable ? "" : "un");
+ netdev_info(dev, "Link %sreliable\n", reliable ? "" : "un");
fr_set_link_state(reliable, dev);
}
@@ -665,33 +660,32 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
if (skb->len < (lmi == LMI_ANSI ? LMI_ANSI_LENGTH :
LMI_CCITT_CISCO_LENGTH)) {
- printk(KERN_INFO "%s: Short LMI frame\n", dev->name);
+ netdev_info(dev, "Short LMI frame\n");
return 1;
}
if (skb->data[3] != (lmi == LMI_CISCO ? NLPID_CISCO_LMI :
NLPID_CCITT_ANSI_LMI)) {
- printk(KERN_INFO "%s: Received non-LMI frame with LMI DLCI\n",
- dev->name);
+ netdev_info(dev, "Received non-LMI frame with LMI DLCI\n");
return 1;
}
if (skb->data[4] != LMI_CALLREF) {
- printk(KERN_INFO "%s: Invalid LMI Call reference (0x%02X)\n",
- dev->name, skb->data[4]);
+ netdev_info(dev, "Invalid LMI Call reference (0x%02X)\n",
+ skb->data[4]);
return 1;
}
if (skb->data[5] != (dce ? LMI_STATUS_ENQUIRY : LMI_STATUS)) {
- printk(KERN_INFO "%s: Invalid LMI Message type (0x%02X)\n",
- dev->name, skb->data[5]);
+ netdev_info(dev, "Invalid LMI Message type (0x%02X)\n",
+ skb->data[5]);
return 1;
}
if (lmi == LMI_ANSI) {
if (skb->data[6] != LMI_ANSI_LOCKSHIFT) {
- printk(KERN_INFO "%s: Not ANSI locking shift in LMI"
- " message (0x%02X)\n", dev->name, skb->data[6]);
+ netdev_info(dev, "Not ANSI locking shift in LMI message (0x%02X)\n",
+ skb->data[6]);
return 1;
}
i = 7;
@@ -700,34 +694,34 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
if (skb->data[i] != (lmi == LMI_CCITT ? LMI_CCITT_REPTYPE :
LMI_ANSI_CISCO_REPTYPE)) {
- printk(KERN_INFO "%s: Not an LMI Report type IE (0x%02X)\n",
- dev->name, skb->data[i]);
+ netdev_info(dev, "Not an LMI Report type IE (0x%02X)\n",
+ skb->data[i]);
return 1;
}
if (skb->data[++i] != LMI_REPT_LEN) {
- printk(KERN_INFO "%s: Invalid LMI Report type IE length"
- " (%u)\n", dev->name, skb->data[i]);
+ netdev_info(dev, "Invalid LMI Report type IE length (%u)\n",
+ skb->data[i]);
return 1;
}
reptype = skb->data[++i];
if (reptype != LMI_INTEGRITY && reptype != LMI_FULLREP) {
- printk(KERN_INFO "%s: Unsupported LMI Report type (0x%02X)\n",
- dev->name, reptype);
+ netdev_info(dev, "Unsupported LMI Report type (0x%02X)\n",
+ reptype);
return 1;
}
if (skb->data[++i] != (lmi == LMI_CCITT ? LMI_CCITT_ALIVE :
LMI_ANSI_CISCO_ALIVE)) {
- printk(KERN_INFO "%s: Not an LMI Link integrity verification"
- " IE (0x%02X)\n", dev->name, skb->data[i]);
+ netdev_info(dev, "Not an LMI Link integrity verification IE (0x%02X)\n",
+ skb->data[i]);
return 1;
}
if (skb->data[++i] != LMI_INTEG_LEN) {
- printk(KERN_INFO "%s: Invalid LMI Link integrity verification"
- " IE length (%u)\n", dev->name, skb->data[i]);
+ netdev_info(dev, "Invalid LMI Link integrity verification IE length (%u)\n",
+ skb->data[i]);
return 1;
}
i++;
@@ -801,14 +795,14 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
if (skb->data[i] != (lmi == LMI_CCITT ? LMI_CCITT_PVCSTAT :
LMI_ANSI_CISCO_PVCSTAT)) {
- printk(KERN_INFO "%s: Not an LMI PVC status IE"
- " (0x%02X)\n", dev->name, skb->data[i]);
+ netdev_info(dev, "Not an LMI PVC status IE (0x%02X)\n",
+ skb->data[i]);
return 1;
}
if (skb->data[++i] != stat_len) {
- printk(KERN_INFO "%s: Invalid LMI PVC status IE length"
- " (%u)\n", dev->name, skb->data[i]);
+ netdev_info(dev, "Invalid LMI PVC status IE length (%u)\n",
+ skb->data[i]);
return 1;
}
i++;
@@ -829,9 +823,7 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
pvc = add_pvc(dev, dlci);
if (!pvc && !no_ram) {
- printk(KERN_WARNING
- "%s: Memory squeeze on fr_lmi_recv()\n",
- dev->name);
+ netdev_warn(dev, "Memory squeeze on fr_lmi_recv()\n");
no_ram = 1;
}
@@ -902,8 +894,8 @@ static int fr_rx(struct sk_buff *skb)
pvc = find_pvc(hdlc, dlci);
if (!pvc) {
#ifdef DEBUG_PKT
- printk(KERN_INFO "%s: No PVC for received frame's DLCI %d\n",
- frad->name, dlci);
+ netdev_info(frad, "No PVC for received frame's DLCI %d\n",
+ dlci);
#endif
dev_kfree_skb_any(skb);
return NET_RX_DROP;
@@ -962,14 +954,14 @@ static int fr_rx(struct sk_buff *skb)
break;
default:
- printk(KERN_INFO "%s: Unsupported protocol, OUI=%x "
- "PID=%x\n", frad->name, oui, pid);
+ netdev_info(frad, "Unsupported protocol, OUI=%x PID=%x\n",
+ oui, pid);
dev_kfree_skb_any(skb);
return NET_RX_DROP;
}
} else {
- printk(KERN_INFO "%s: Unsupported protocol, NLPID=%x "
- "length = %i\n", frad->name, data[3], skb->len);
+ netdev_info(frad, "Unsupported protocol, NLPID=%x length=%i\n",
+ data[3], skb->len);
dev_kfree_skb_any(skb);
return NET_RX_DROP;
}
@@ -1073,8 +1065,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
int used;
if ((pvc = add_pvc(frad, dlci)) == NULL) {
- printk(KERN_WARNING "%s: Memory squeeze on fr_add_pvc()\n",
- frad->name);
+ netdev_warn(frad, "Memory squeeze on fr_add_pvc()\n");
return -ENOBUFS;
}
@@ -1089,8 +1080,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
dev = alloc_netdev(0, "pvc%d", pvc_setup);
if (!dev) {
- printk(KERN_WARNING "%s: Memory squeeze on fr_pvc()\n",
- frad->name);
+ netdev_warn(frad, "Memory squeeze on fr_pvc()\n");
delete_unused_pvcs(hdlc);
return -ENOBUFS;
}
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 941f053..055a918 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -223,8 +223,7 @@ static void ppp_tx_cp(struct net_device *dev, u16 pid, u8 code,
skb = dev_alloc_skb(sizeof(struct hdlc_header) +
sizeof(struct cp_header) + magic_len + len);
if (!skb) {
- printk(KERN_WARNING "%s: out of memory in ppp_tx_cp()\n",
- dev->name);
+ netdev_warn(dev, "out of memory in ppp_tx_cp()\n");
return;
}
skb_reserve(skb, sizeof(struct hdlc_header));
@@ -345,7 +344,7 @@ static void ppp_cp_event(struct net_device *dev, u16 pid, u16 event, u8 code,
ppp_tx_cp(dev, pid, CP_CODE_REJ, ++ppp->seq, len, data);
if (old_state != OPENED && proto->state == OPENED) {
- printk(KERN_INFO "%s: %s up\n", dev->name, proto_name(pid));
+ netdev_info(dev, "%s up\n", proto_name(pid));
if (pid == PID_LCP) {
netif_dormant_off(dev);
ppp_cp_event(dev, PID_IPCP, START, 0, 0, 0, NULL);
@@ -356,7 +355,7 @@ static void ppp_cp_event(struct net_device *dev, u16 pid, u16 event, u8 code,
}
}
if (old_state == OPENED && proto->state != OPENED) {
- printk(KERN_INFO "%s: %s down\n", dev->name, proto_name(pid));
+ netdev_info(dev, "%s down\n", proto_name(pid));
if (pid == PID_LCP) {
netif_dormant_on(dev);
ppp_cp_event(dev, PID_IPCP, STOP, 0, 0, 0, NULL);
@@ -585,7 +584,7 @@ static void ppp_timer(unsigned long arg)
break;
if (time_after(jiffies, ppp->last_pong +
ppp->keepalive_timeout * HZ)) {
- printk(KERN_INFO "%s: Link down\n", proto->dev->name);
+ netdev_info(proto->dev, "Link down\n");
ppp_cp_event(proto->dev, PID_LCP, STOP, 0, 0, 0, NULL);
ppp_cp_event(proto->dev, PID_LCP, START, 0, 0, 0, NULL);
} else { /* send keep-alive packet */
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index 70527e5..56aeb01 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -34,7 +34,7 @@ static void x25_connect_disconnect(struct net_device *dev, int reason, int code)
unsigned char *ptr;
if ((skb = dev_alloc_skb(1)) == NULL) {
- printk(KERN_ERR "%s: out of memory\n", dev->name);
+ netdev_err(dev, "out of memory\n");
return;
}
@@ -106,9 +106,8 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
/* Send connect confirm. msg to level 3 */
x25_connected(dev, 0);
else
- printk(KERN_ERR "%s: LAPB connect request "
- "failed, error code = %i\n",
- dev->name, result);
+ netdev_err(dev, "LAPB connect request failed, error code = %i\n",
+ result);
}
break;
@@ -118,9 +117,8 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
/* Send disconnect confirm. msg to level 3 */
x25_disconnected(dev, 0);
else
- printk(KERN_ERR "%s: LAPB disconnect request "
- "failed, error code = %i\n",
- dev->name, result);
+ netdev_err(dev, "LAPB disconnect request failed, error code = %i\n",
+ result);
}
break;
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 17d408f..5129ad5 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -16,6 +16,8 @@
* SDL Inc. PPP/HDLC/CISCO driver
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/capability.h>
@@ -341,57 +343,57 @@ static int __init n2_run(unsigned long io, unsigned long irq,
int i;
if (io < 0x200 || io > 0x3FF || (io % N2_IOPORTS) != 0) {
- printk(KERN_ERR "n2: invalid I/O port value\n");
+ pr_err("invalid I/O port value\n");
return -ENODEV;
}
if (irq < 3 || irq > 15 || irq == 6) /* FIXME */ {
- printk(KERN_ERR "n2: invalid IRQ value\n");
+ pr_err("invalid IRQ value\n");
return -ENODEV;
}
if (winbase < 0xA0000 || winbase > 0xFFFFF || (winbase & 0xFFF) != 0) {
- printk(KERN_ERR "n2: invalid RAM value\n");
+ pr_err("invalid RAM value\n");
return -ENODEV;
}
card = kzalloc(sizeof(card_t), GFP_KERNEL);
if (card == NULL) {
- printk(KERN_ERR "n2: unable to allocate memory\n");
+ pr_err("unable to allocate memory\n");
return -ENOBUFS;
}
card->ports[0].dev = alloc_hdlcdev(&card->ports[0]);
card->ports[1].dev = alloc_hdlcdev(&card->ports[1]);
if (!card->ports[0].dev || !card->ports[1].dev) {
- printk(KERN_ERR "n2: unable to allocate memory\n");
+ pr_err("unable to allocate memory\n");
n2_destroy_card(card);
return -ENOMEM;
}
if (!request_region(io, N2_IOPORTS, devname)) {
- printk(KERN_ERR "n2: I/O port region in use\n");
+ pr_err("I/O port region in use\n");
n2_destroy_card(card);
return -EBUSY;
}
card->io = io;
if (request_irq(irq, sca_intr, 0, devname, card)) {
- printk(KERN_ERR "n2: could not allocate IRQ\n");
+ pr_err("could not allocate IRQ\n");
n2_destroy_card(card);
return -EBUSY;
}
card->irq = irq;
if (!request_mem_region(winbase, USE_WINDOWSIZE, devname)) {
- printk(KERN_ERR "n2: could not request RAM window\n");
+ pr_err("could not request RAM window\n");
n2_destroy_card(card);
return -EBUSY;
}
card->phy_winbase = winbase;
card->winbase = ioremap(winbase, USE_WINDOWSIZE);
if (!card->winbase) {
- printk(KERN_ERR "n2: ioremap() failed\n");
+ pr_err("ioremap() failed\n");
n2_destroy_card(card);
return -EFAULT;
}
@@ -413,7 +415,7 @@ static int __init n2_run(unsigned long io, unsigned long irq,
break;
default:
- printk(KERN_ERR "n2: invalid window size\n");
+ pr_err("invalid window size\n");
n2_destroy_card(card);
return -ENODEV;
}
@@ -433,12 +435,12 @@ static int __init n2_run(unsigned long io, unsigned long irq,
card->buff_offset = (valid0 + valid1) * sizeof(pkt_desc) *
(card->tx_ring_buffers + card->rx_ring_buffers);
- printk(KERN_INFO "n2: RISCom/N2 %u KB RAM, IRQ%u, "
- "using %u TX + %u RX packets rings\n", card->ram_size / 1024,
- card->irq, card->tx_ring_buffers, card->rx_ring_buffers);
+ pr_info("RISCom/N2 %u KB RAM, IRQ%u, using %u TX + %u RX packets rings\n",
+ card->ram_size / 1024, card->irq,
+ card->tx_ring_buffers, card->rx_ring_buffers);
if (card->tx_ring_buffers < 1) {
- printk(KERN_ERR "n2: RAM test failed\n");
+ pr_err("RAM test failed\n");
n2_destroy_card(card);
return -EIO;
}
@@ -474,16 +476,14 @@ static int __init n2_run(unsigned long io, unsigned long irq,
port->card = card;
if (register_hdlc_device(dev)) {
- printk(KERN_WARNING "n2: unable to register hdlc "
- "device\n");
+ pr_warn("unable to register hdlc device\n");
port->card = NULL;
n2_destroy_card(card);
return -ENOBUFS;
}
sca_init_port(port); /* Set up SCA memory */
- printk(KERN_INFO "%s: RISCom/N2 node %d\n",
- dev->name, port->phy_node);
+ netdev_info(dev, "RISCom/N2 node %d\n", port->phy_node);
}
*new_card = card;
@@ -498,12 +498,12 @@ static int __init n2_init(void)
{
if (hw==NULL) {
#ifdef MODULE
- printk(KERN_INFO "n2: no card initialized\n");
+ pr_info("no card initialized\n");
#endif
return -EINVAL; /* no parameters specified, abort */
}
- printk(KERN_INFO "%s\n", version);
+ pr_info("%s\n", version);
do {
unsigned long io, irq, ram;
@@ -541,7 +541,7 @@ static int __init n2_init(void)
return first_card ? 0 : -EINVAL;
}while(*hw++ == ':');
- printk(KERN_ERR "n2: invalid hardware parameters\n");
+ pr_err("invalid hardware parameters\n");
return first_card ? 0 : -EINVAL;
}
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index c7ab3be..c49c1b3 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -17,6 +17,8 @@
* PC300/X21 cards.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -318,7 +320,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
card = kzalloc(sizeof(card_t), GFP_KERNEL);
if (card == NULL) {
- printk(KERN_ERR "pc300: unable to allocate memory\n");
+ pr_err("unable to allocate memory\n");
pci_release_regions(pdev);
pci_disable_device(pdev);
return -ENOBUFS;
@@ -328,7 +330,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
if (pci_resource_len(pdev, 0) != PC300_PLX_SIZE ||
pci_resource_len(pdev, 2) != PC300_SCA_SIZE ||
pci_resource_len(pdev, 3) < 16384) {
- printk(KERN_ERR "pc300: invalid card EEPROM parameters\n");
+ pr_err("invalid card EEPROM parameters\n");
pc300_pci_remove_one(pdev);
return -EFAULT;
}
@@ -345,7 +347,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
if (card->plxbase == NULL ||
card->scabase == NULL ||
card->rambase == NULL) {
- printk(KERN_ERR "pc300: ioremap() failed\n");
+ pr_err("ioremap() failed\n");
pc300_pci_remove_one(pdev);
}
@@ -370,7 +372,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
for (i = 0; i < card->n_ports; i++)
if (!(card->ports[i].netdev = alloc_hdlcdev(&card->ports[i]))) {
- printk(KERN_ERR "pc300: unable to allocate memory\n");
+ pr_err("unable to allocate memory\n");
pc300_pci_remove_one(pdev);
return -ENOMEM;
}
@@ -411,15 +413,14 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
card->buff_offset = card->n_ports * sizeof(pkt_desc) *
(card->tx_ring_buffers + card->rx_ring_buffers);
- printk(KERN_INFO "pc300: PC300/%s, %u KB RAM at 0x%x, IRQ%u, "
- "using %u TX + %u RX packets rings\n",
- card->type == PC300_X21 ? "X21" :
- card->type == PC300_TE ? "TE" : "RSV",
- ramsize / 1024, ramphys, pdev->irq,
- card->tx_ring_buffers, card->rx_ring_buffers);
+ pr_info("PC300/%s, %u KB RAM at 0x%x, IRQ%u, using %u TX + %u RX packets rings\n",
+ card->type == PC300_X21 ? "X21" :
+ card->type == PC300_TE ? "TE" : "RSV",
+ ramsize / 1024, ramphys, pdev->irq,
+ card->tx_ring_buffers, card->rx_ring_buffers);
if (card->tx_ring_buffers < 1) {
- printk(KERN_ERR "pc300: RAM test failed\n");
+ pr_err("RAM test failed\n");
pc300_pci_remove_one(pdev);
return -EFAULT;
}
@@ -429,8 +430,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
/* Allocate IRQ */
if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, "pc300", card)) {
- printk(KERN_WARNING "pc300: could not allocate IRQ%d.\n",
- pdev->irq);
+ pr_warn("could not allocate IRQ%d\n", pdev->irq);
pc300_pci_remove_one(pdev);
return -EBUSY;
}
@@ -466,15 +466,13 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
sca_init_port(port);
if (register_hdlc_device(dev)) {
- printk(KERN_ERR "pc300: unable to register hdlc "
- "device\n");
+ pr_err("unable to register hdlc device\n");
port->card = NULL;
pc300_pci_remove_one(pdev);
return -ENOBUFS;
}
- printk(KERN_INFO "%s: PC300 channel %d\n",
- dev->name, port->chan);
+ netdev_info(dev, "PC300 channel %d\n", port->chan);
}
return 0;
}
@@ -505,11 +503,11 @@ static struct pci_driver pc300_pci_driver = {
static int __init pc300_init_module(void)
{
if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
- printk(KERN_ERR "pc300: Invalid PCI clock frequency\n");
+ pr_err("Invalid PCI clock frequency\n");
return -EINVAL;
}
if (use_crystal_clock != 0 && use_crystal_clock != 1) {
- printk(KERN_ERR "pc300: Invalid 'use_crystal_clock' value\n");
+ pr_err("Invalid 'use_crystal_clock' value\n");
return -EINVAL;
}
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index fd73759..1ce2116 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -14,6 +14,8 @@
* PLX Technology Inc. PCI9052 Data Book
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/capability.h>
@@ -297,7 +299,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
card = kzalloc(sizeof(card_t), GFP_KERNEL);
if (card == NULL) {
- printk(KERN_ERR "pci200syn: unable to allocate memory\n");
+ pr_err("unable to allocate memory\n");
pci_release_regions(pdev);
pci_disable_device(pdev);
return -ENOBUFS;
@@ -306,7 +308,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
card->ports[0].netdev = alloc_hdlcdev(&card->ports[0]);
card->ports[1].netdev = alloc_hdlcdev(&card->ports[1]);
if (!card->ports[0].netdev || !card->ports[1].netdev) {
- printk(KERN_ERR "pci200syn: unable to allocate memory\n");
+ pr_err("unable to allocate memory\n");
pci200_pci_remove_one(pdev);
return -ENOMEM;
}
@@ -314,7 +316,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
if (pci_resource_len(pdev, 0) != PCI200SYN_PLX_SIZE ||
pci_resource_len(pdev, 2) != PCI200SYN_SCA_SIZE ||
pci_resource_len(pdev, 3) < 16384) {
- printk(KERN_ERR "pci200syn: invalid card EEPROM parameters\n");
+ pr_err("invalid card EEPROM parameters\n");
pci200_pci_remove_one(pdev);
return -EFAULT;
}
@@ -331,7 +333,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
if (card->plxbase == NULL ||
card->scabase == NULL ||
card->rambase == NULL) {
- printk(KERN_ERR "pci200syn: ioremap() failed\n");
+ pr_err("ioremap() failed\n");
pci200_pci_remove_one(pdev);
return -EFAULT;
}
@@ -357,12 +359,12 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
card->buff_offset = 2 * sizeof(pkt_desc) * (card->tx_ring_buffers +
card->rx_ring_buffers);
- printk(KERN_INFO "pci200syn: %u KB RAM at 0x%x, IRQ%u, using %u TX +"
- " %u RX packets rings\n", ramsize / 1024, ramphys,
- pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers);
+ pr_info("%u KB RAM at 0x%x, IRQ%u, using %u TX + %u RX packets rings\n",
+ ramsize / 1024, ramphys,
+ pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers);
if (card->tx_ring_buffers < 1) {
- printk(KERN_ERR "pci200syn: RAM test failed\n");
+ pr_err("RAM test failed\n");
pci200_pci_remove_one(pdev);
return -EFAULT;
}
@@ -373,8 +375,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
/* Allocate IRQ */
if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, "pci200syn", card)) {
- printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
- pdev->irq);
+ pr_warn("could not allocate IRQ%d\n", pdev->irq);
pci200_pci_remove_one(pdev);
return -EBUSY;
}
@@ -400,15 +401,13 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
port->card = card;
sca_init_port(port);
if (register_hdlc_device(dev)) {
- printk(KERN_ERR "pci200syn: unable to register hdlc "
- "device\n");
+ pr_err("unable to register hdlc device\n");
port->card = NULL;
pci200_pci_remove_one(pdev);
return -ENOBUFS;
}
- printk(KERN_INFO "%s: PCI200SYN channel %d\n",
- dev->name, port->chan);
+ netdev_info(dev, "PCI200SYN channel %d\n", port->chan);
}
sca_flush(card);
@@ -435,7 +434,7 @@ static struct pci_driver pci200_pci_driver = {
static int __init pci200_init_module(void)
{
if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
- printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n");
+ pr_err("Invalid PCI clock frequency\n");
return -EINVAL;
}
return pci_register_driver(&pci200_pci_driver);
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 4ea89fe..8d7aa43 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -13,6 +13,8 @@
* - wanXL100 will require minor driver modifications, no access to hw
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -102,9 +104,8 @@ static inline dma_addr_t pci_map_single_debug(struct pci_dev *pdev, void *ptr,
{
dma_addr_t addr = pci_map_single(pdev, ptr, size, direction);
if (addr + size > 0x100000000LL)
- printk(KERN_CRIT "wanXL %s: pci_map_single() returned memory"
- " at 0x%LX!\n", pci_name(pdev),
- (unsigned long long)addr);
+ pr_crit("%s: pci_map_single() returned memory at 0x%llx!\n",
+ pci_name(pdev), (unsigned long long)addr);
return addr;
}
@@ -147,8 +148,8 @@ static inline void wanxl_cable_intr(port_t *port)
}
dte = (value & STATUS_CABLE_DCE) ? " DCE" : " DTE";
}
- printk(KERN_INFO "%s: %s%s module, %s cable%s%s\n",
- port->dev->name, pm, dte, cable, dsr, dcd);
+ netdev_info(port->dev, "%s%s module, %s cable%s%s\n",
+ pm, dte, cable, dsr, dcd);
if (value & STATUS_CABLE_DCD)
netif_carrier_on(port->dev);
@@ -198,8 +199,8 @@ static inline void wanxl_rx_intr(card_t *card)
while (desc = &card->status->rx_descs[card->rx_in],
desc->stat != PACKET_EMPTY) {
if ((desc->stat & PACKET_PORT_MASK) > card->n_ports)
- printk(KERN_CRIT "wanXL %s: received packet for"
- " nonexistent port\n", pci_name(card->pdev));
+ pr_crit("%s: received packet for nonexistent port\n",
+ pci_name(card->pdev));
else {
struct sk_buff *skb = card->rx_skbs[card->rx_in];
port_t *port = &card->ports[desc->stat &
@@ -397,7 +398,7 @@ static int wanxl_open(struct net_device *dev)
int i;
if (get_status(port)->open) {
- printk(KERN_ERR "%s: port already open\n", dev->name);
+ netdev_err(dev, "port already open\n");
return -EIO;
}
if ((i = hdlc_open(dev)) != 0)
@@ -417,7 +418,7 @@ static int wanxl_open(struct net_device *dev)
}
} while (time_after(timeout, jiffies));
- printk(KERN_ERR "%s: unable to open port\n", dev->name);
+ netdev_err(dev, "unable to open port\n");
/* ask the card to close the port, should it be still alive */
writel(1 << (DOORBELL_TO_CARD_CLOSE_0 + port->node), dbr);
return -EFAULT;
@@ -443,7 +444,7 @@ static int wanxl_close(struct net_device *dev)
} while (time_after(timeout, jiffies));
if (get_status(port)->open)
- printk(KERN_ERR "%s: unable to close port\n", dev->name);
+ netdev_err(dev, "unable to close port\n");
netif_stop_queue(dev);
@@ -568,11 +569,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
int i, ports, alloc_size;
#ifndef MODULE
- static int printed_version;
- if (!printed_version) {
- printed_version++;
- printk(KERN_INFO "%s\n", version);
- }
+ pr_info_once("%s\n", version);
#endif
i = pci_enable_device(pdev);
@@ -588,7 +585,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
work on most platforms */
if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(28)) ||
pci_set_dma_mask(pdev, DMA_BIT_MASK(28))) {
- printk(KERN_ERR "wanXL: No usable DMA configuration\n");
+ pr_err("No usable DMA configuration\n");
return -EIO;
}
@@ -607,8 +604,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
alloc_size = sizeof(card_t) + ports * sizeof(port_t);
card = kzalloc(alloc_size, GFP_KERNEL);
if (card == NULL) {
- printk(KERN_ERR "wanXL %s: unable to allocate memory\n",
- pci_name(pdev));
+ pr_err("%s: unable to allocate memory\n", pci_name(pdev));
pci_release_regions(pdev);
pci_disable_device(pdev);
return -ENOBUFS;
@@ -635,7 +631,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
to indicate the card can do 32-bit DMA addressing */
if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) ||
pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
- printk(KERN_ERR "wanXL: No usable DMA configuration\n");
+ pr_err("No usable DMA configuration\n");
wanxl_pci_remove_one(pdev);
return -EIO;
}
@@ -645,7 +641,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
card->plx = ioremap_nocache(plx_phy, 0x70);
if (!card->plx) {
- printk(KERN_ERR "wanxl: ioremap() failed\n");
+ pr_err("ioremap() failed\n");
wanxl_pci_remove_one(pdev);
return -EFAULT;
}
@@ -657,8 +653,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
timeout = jiffies + 20 * HZ;
while ((stat = readl(card->plx + PLX_MAILBOX_0)) != 0) {
if (time_before(timeout, jiffies)) {
- printk(KERN_WARNING "wanXL %s: timeout waiting for"
- " PUTS to complete\n", pci_name(pdev));
+ pr_warn("%s: timeout waiting for PUTS to complete\n",
+ pci_name(pdev));
wanxl_pci_remove_one(pdev);
return -ENODEV;
}
@@ -669,8 +665,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
break;
default:
- printk(KERN_WARNING "wanXL %s: PUTS test 0x%X"
- " failed\n", pci_name(pdev), stat & 0x30);
+ pr_warn("%s: PUTS test 0x%X failed\n",
+ pci_name(pdev), stat & 0x30);
wanxl_pci_remove_one(pdev);
return -ENODEV;
}
@@ -688,17 +684,16 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
/* sanity check the board's reported memory size */
if (ramsize < BUFFERS_ADDR +
(TX_BUFFERS + RX_BUFFERS) * BUFFER_LENGTH * ports) {
- printk(KERN_WARNING "wanXL %s: no enough on-board RAM"
- " (%u bytes detected, %u bytes required)\n",
- pci_name(pdev), ramsize, BUFFERS_ADDR +
- (TX_BUFFERS + RX_BUFFERS) * BUFFER_LENGTH * ports);
+ pr_warn("%s: no enough on-board RAM (%u bytes detected, %u bytes required)\n",
+ pci_name(pdev), ramsize,
+ BUFFERS_ADDR +
+ (TX_BUFFERS + RX_BUFFERS) * BUFFER_LENGTH * ports);
wanxl_pci_remove_one(pdev);
return -ENODEV;
}
if (wanxl_puts_command(card, MBX1_CMD_BSWAP)) {
- printk(KERN_WARNING "wanXL %s: unable to Set Byte Swap"
- " Mode\n", pci_name(pdev));
+ pr_warn("%s: unable to Set Byte Swap Mode\n", pci_name(pdev));
wanxl_pci_remove_one(pdev);
return -ENODEV;
}
@@ -715,7 +710,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
mem = ioremap_nocache(mem_phy, PDM_OFFSET + sizeof(firmware));
if (!mem) {
- printk(KERN_ERR "wanxl: ioremap() failed\n");
+ pr_err("ioremap() failed\n");
wanxl_pci_remove_one(pdev);
return -EFAULT;
}
@@ -734,8 +729,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
writel(0, card->plx + PLX_MAILBOX_5);
if (wanxl_puts_command(card, MBX1_CMD_ABORTJ)) {
- printk(KERN_WARNING "wanXL %s: unable to Abort and Jump\n",
- pci_name(pdev));
+ pr_warn("%s: unable to Abort and Jump\n", pci_name(pdev));
wanxl_pci_remove_one(pdev);
return -ENODEV;
}
@@ -749,8 +743,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
}while (time_after(timeout, jiffies));
if (!stat) {
- printk(KERN_WARNING "wanXL %s: timeout while initializing card "
- "firmware\n", pci_name(pdev));
+ pr_warn("%s: timeout while initializing card firmware\n",
+ pci_name(pdev));
wanxl_pci_remove_one(pdev);
return -ENODEV;
}
@@ -759,13 +753,13 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
ramsize = stat;
#endif
- printk(KERN_INFO "wanXL %s: at 0x%X, %u KB of RAM at 0x%X, irq %u\n",
- pci_name(pdev), plx_phy, ramsize / 1024, mem_phy, pdev->irq);
+ pr_info("%s: at 0x%X, %u KB of RAM at 0x%X, irq %u\n",
+ pci_name(pdev), plx_phy, ramsize / 1024, mem_phy, pdev->irq);
/* Allocate IRQ */
if (request_irq(pdev->irq, wanxl_intr, IRQF_SHARED, "wanXL", card)) {
- printk(KERN_WARNING "wanXL %s: could not allocate IRQ%i.\n",
- pci_name(pdev), pdev->irq);
+ pr_warn("%s: could not allocate IRQ%i\n",
+ pci_name(pdev), pdev->irq);
wanxl_pci_remove_one(pdev);
return -EBUSY;
}
@@ -776,8 +770,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
port_t *port = &card->ports[i];
struct net_device *dev = alloc_hdlcdev(port);
if (!dev) {
- printk(KERN_ERR "wanXL %s: unable to allocate"
- " memory\n", pci_name(pdev));
+ pr_err("%s: unable to allocate memory\n",
+ pci_name(pdev));
wanxl_pci_remove_one(pdev);
return -ENOMEM;
}
@@ -793,8 +787,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
port->node = i;
get_status(port)->clocking = CLOCK_EXT;
if (register_hdlc_device(dev)) {
- printk(KERN_ERR "wanXL %s: unable to register hdlc"
- " device\n", pci_name(pdev));
+ pr_err("%s: unable to register hdlc device\n",
+ pci_name(pdev));
free_netdev(dev);
wanxl_pci_remove_one(pdev);
return -ENOBUFS;
@@ -802,11 +796,11 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
card->n_ports++;
}
- printk(KERN_INFO "wanXL %s: port", pci_name(pdev));
+ pr_info("%s: port", pci_name(pdev));
for (i = 0; i < ports; i++)
- printk("%s #%i: %s", i ? "," : "", i,
- card->ports[i].dev->name);
- printk("\n");
+ pr_cont("%s #%i: %s",
+ i ? "," : "", i, card->ports[i].dev->name);
+ pr_cont("\n");
for (i = 0; i < ports; i++)
wanxl_cable_intr(&card->ports[i]); /* get carrier status etc.*/
@@ -836,7 +830,7 @@ static struct pci_driver wanxl_pci_driver = {
static int __init wanxl_init_module(void)
{
#ifdef MODULE
- printk(KERN_INFO "%s\n", version);
+ pr_info("%s\n", version);
#endif
return pci_register_driver(&wanxl_pci_driver);
}
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 0/8] wan: Use current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Joe Perches (8):
generic_hdlc: Update to current logging forms
cosa: Update to current logging forms
cyclom: Update to current logging forms
frame relay dlci/frad: Update to current logging forms
dscc4: Update to current logging forms
farsync: Update to current logging forms
ixp4xx_hss: Update to current logging forms
wan: Update to current logging forms
drivers/net/wan/c101.c | 30 +++---
drivers/net/wan/cosa.c | 226 +++++++++++++++++++---------------------
drivers/net/wan/cycx_drv.c | 81 +++++++--------
drivers/net/wan/cycx_main.c | 31 +++---
drivers/net/wan/cycx_x25.c | 177 +++++++++++++++-----------------
drivers/net/wan/dlci.c | 22 +++--
drivers/net/wan/dscc4.c | 80 +++++++--------
drivers/net/wan/farsync.c | 7 +-
drivers/net/wan/hd64570.c | 8 +-
drivers/net/wan/hd64572.c | 8 +-
drivers/net/wan/hdlc.c | 16 ++--
drivers/net/wan/hdlc_cisco.c | 21 ++---
drivers/net/wan/hdlc_fr.c | 96 ++++++++----------
drivers/net/wan/hdlc_ppp.c | 9 +-
drivers/net/wan/hdlc_x25.c | 12 +--
drivers/net/wan/hostess_sv11.c | 11 +-
drivers/net/wan/ixp4xx_hss.c | 28 +++---
drivers/net/wan/lapbether.c | 18 ++--
drivers/net/wan/n2.c | 42 ++++----
drivers/net/wan/pc300_drv.c | 4 +-
drivers/net/wan/pc300too.c | 36 +++----
drivers/net/wan/pci200syn.c | 29 +++---
drivers/net/wan/sbni.c | 67 ++++++------
drivers/net/wan/sdla.c | 52 ++++++----
drivers/net/wan/sealevel.c | 11 +-
drivers/net/wan/wanxl.c | 90 ++++++++---------
drivers/net/wan/x25_asy.c | 47 ++++----
drivers/net/wan/z85230.c | 34 +++---
28 files changed, 620 insertions(+), 673 deletions(-)
--
1.7.6.rc1
^ permalink raw reply
* [PATCH 8/8] wan: Update to current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev, linux-kernel
In-Reply-To: <cover.1309150683.git.joe@perches.com>
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/hostess_sv11.c | 11 +++---
drivers/net/wan/lapbether.c | 18 +++++-----
drivers/net/wan/pc300_drv.c | 4 ++-
drivers/net/wan/sbni.c | 67 +++++++++++++++++++---------------------
drivers/net/wan/sealevel.c | 11 +++---
drivers/net/wan/x25_asy.c | 47 ++++++++++++++--------------
drivers/net/wan/z85230.c | 34 ++++++++++----------
7 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index e817583..3d80e42 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -20,6 +20,8 @@
* Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl>
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -192,8 +194,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
*/
if (!request_region(iobase, 8, "Comtrol SV11")) {
- printk(KERN_WARNING "hostess: I/O 0x%X already in use.\n",
- iobase);
+ pr_warn("I/O 0x%X already in use\n", iobase);
return NULL;
}
@@ -221,7 +222,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
"Hostess SV11", sv) < 0) {
- printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
+ pr_warn("IRQ %d already in use\n", irq);
goto err_irq;
}
@@ -255,7 +256,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
*/
if (z8530_init(sv)) {
- printk(KERN_ERR "Z8530 series device not found.\n");
+ pr_err("Z8530 series device not found\n");
enable_irq(irq);
goto free_dma;
}
@@ -282,7 +283,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
netdev->irq = irq;
if (register_hdlc_device(netdev)) {
- printk(KERN_ERR "hostess: unable to register HDLC device.\n");
+ pr_err("unable to register HDLC device\n");
free_netdev(netdev);
goto free_dma;
}
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index eec463f..a817081 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -20,6 +20,8 @@
* 2000-11-14 Henner Eisen dev_hold/put, NETDEV_GOING_DOWN support
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/socket.h>
@@ -165,13 +167,11 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
break;
case X25_IFACE_CONNECT:
if ((err = lapb_connect_request(dev)) != LAPB_OK)
- printk(KERN_ERR "lapbeth: lapb_connect_request "
- "error: %d\n", err);
+ pr_err("lapb_connect_request error: %d\n", err);
goto drop;
case X25_IFACE_DISCONNECT:
if ((err = lapb_disconnect_request(dev)) != LAPB_OK)
- printk(KERN_ERR "lapbeth: lapb_disconnect_request "
- "err: %d\n", err);
+ pr_err("lapb_disconnect_request err: %d\n", err);
/* Fall thru */
default:
goto drop;
@@ -180,7 +180,7 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
skb_pull(skb, 1);
if ((err = lapb_data_request(dev, skb)) != LAPB_OK) {
- printk(KERN_ERR "lapbeth: lapb_data_request error - %d\n", err);
+ pr_err("lapb_data_request error - %d\n", err);
goto drop;
}
out:
@@ -220,7 +220,7 @@ static void lapbeth_connected(struct net_device *dev, int reason)
struct sk_buff *skb = dev_alloc_skb(1);
if (!skb) {
- printk(KERN_ERR "lapbeth: out of memory\n");
+ pr_err("out of memory\n");
return;
}
@@ -237,7 +237,7 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
struct sk_buff *skb = dev_alloc_skb(1);
if (!skb) {
- printk(KERN_ERR "lapbeth: out of memory\n");
+ pr_err("out of memory\n");
return;
}
@@ -277,7 +277,7 @@ static int lapbeth_open(struct net_device *dev)
int err;
if ((err = lapb_register(dev, &lapbeth_callbacks)) != LAPB_OK) {
- printk(KERN_ERR "lapbeth: lapb_register error - %d\n", err);
+ pr_err("lapb_register error: %d\n", err);
return -ENODEV;
}
@@ -292,7 +292,7 @@ static int lapbeth_close(struct net_device *dev)
netif_stop_queue(dev);
if ((err = lapb_unregister(dev)) != LAPB_OK)
- printk(KERN_ERR "lapbeth: lapb_unregister error - %d\n", err);
+ pr_err("lapb_unregister error: %d\n", err);
return 0;
}
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 9617d3d..1eeedd6 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -212,6 +212,8 @@ static const char rcsid[] =
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -3242,7 +3244,7 @@ static inline void show_version(void)
rcsdate++;
tmp = strrchr(rcsdate, ' ');
*tmp = '\0';
- printk(KERN_INFO "Cyclades-PC300 driver %s %s\n", rcsvers, rcsdate);
+ pr_info("Cyclades-PC300 driver %s %s\n", rcsvers, rcsdate);
} /* show_version */
static const struct net_device_ops cpc_netdev_ops = {
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index cff13a9..40e95fa 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -37,6 +37,8 @@
* Known problem: this driver wasn't tested on multiprocessor machine.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/ptrace.h>
@@ -200,8 +202,8 @@ sbni_isa_probe( struct net_device *dev )
return 0;
else {
- printk( KERN_ERR "sbni: base address 0x%lx is busy, or adapter "
- "is malfunctional!\n", dev->base_addr );
+ pr_err("base address 0x%lx is busy, or adapter is malfunctional!\n",
+ dev->base_addr);
return -ENODEV;
}
}
@@ -226,7 +228,6 @@ static void __init sbni_devsetup(struct net_device *dev)
int __init sbni_probe(int unit)
{
struct net_device *dev;
- static unsigned version_printed __initdata = 0;
int err;
dev = alloc_netdev(sizeof(struct net_local), "sbni", sbni_devsetup);
@@ -250,8 +251,7 @@ int __init sbni_probe(int unit)
free_netdev(dev);
return err;
}
- if( version_printed++ == 0 )
- printk( KERN_INFO "%s", version );
+ pr_info_once("%s", version);
return 0;
}
@@ -326,9 +326,9 @@ sbni_pci_probe( struct net_device *dev )
}
if (pci_irq_line <= 0 || pci_irq_line >= nr_irqs)
- printk( KERN_WARNING
- " WARNING: The PCI BIOS assigned this PCI card to IRQ %d, which is unlikely to work!.\n"
- " You should use the PCI BIOS setup to assign a valid IRQ line.\n",
+ pr_warn(
+"WARNING: The PCI BIOS assigned this PCI card to IRQ %d, which is unlikely to work!.\n"
+"You should use the PCI BIOS setup to assign a valid IRQ line.\n",
pci_irq_line );
/* avoiding re-enable dual adapters */
@@ -372,8 +372,7 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq )
outb( 0, ioaddr + CSR0 );
if( !irq ) {
- printk( KERN_ERR "%s: can't detect device irq!\n",
- dev->name );
+ pr_err("%s: can't detect device irq!\n", dev->name);
release_region( ioaddr, SBNI_IO_EXTENT );
return NULL;
}
@@ -386,7 +385,7 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq )
/* Fill in sbni-specific dev fields. */
nl = netdev_priv(dev);
if( !nl ) {
- printk( KERN_ERR "%s: unable to get memory!\n", dev->name );
+ pr_err("%s: unable to get memory!\n", dev->name);
release_region( ioaddr, SBNI_IO_EXTENT );
return NULL;
}
@@ -415,21 +414,21 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq )
if( inb( ioaddr + CSR0 ) & 0x01 )
nl->state |= FL_SLOW_MODE;
- printk( KERN_NOTICE "%s: ioaddr %#lx, irq %d, "
- "MAC: 00:ff:01:%02x:%02x:%02x\n",
- dev->name, dev->base_addr, dev->irq,
- ((u8 *) dev->dev_addr) [3],
- ((u8 *) dev->dev_addr) [4],
- ((u8 *) dev->dev_addr) [5] );
+ pr_notice("%s: ioaddr %#lx, irq %d, MAC: 00:ff:01:%02x:%02x:%02x\n",
+ dev->name, dev->base_addr, dev->irq,
+ ((u8 *)dev->dev_addr)[3],
+ ((u8 *)dev->dev_addr)[4],
+ ((u8 *)dev->dev_addr)[5]);
- printk( KERN_NOTICE "%s: speed %d, receive level ", dev->name,
- ( (nl->state & FL_SLOW_MODE) ? 500000 : 2000000)
- / (1 << nl->csr1.rate) );
+ pr_notice("%s: speed %d",
+ dev->name,
+ ((nl->state & FL_SLOW_MODE) ? 500000 : 2000000)
+ / (1 << nl->csr1.rate));
if( nl->delta_rxl == 0 )
- printk( "0x%x (fixed)\n", nl->cur_rxl_index );
+ pr_cont(", receive level 0x%x (fixed)\n", nl->cur_rxl_index);
else
- printk( "(auto)\n");
+ pr_cont(", receive level (auto)\n");
#ifdef CONFIG_SBNI_MULTILINE
nl->master = dev;
@@ -568,7 +567,7 @@ handle_channel( struct net_device *dev )
*/
csr0 = inb( ioaddr + CSR0 );
if( !(csr0 & TR_RDY) || (csr0 & RC_RDY) )
- printk( KERN_ERR "%s: internal error!\n", dev->name );
+ netdev_err(dev, "internal error!\n");
/* if state & FL_NEED_RESEND != 0 then tx_frameno != 0 */
if( req_ans || nl->tx_frameno != 0 )
@@ -851,7 +850,7 @@ prepare_to_send( struct sk_buff *skb, struct net_device *dev )
/* nl->tx_buf_p == NULL here! */
if( nl->tx_buf_p )
- printk( KERN_ERR "%s: memory leak!\n", dev->name );
+ netdev_err(dev, "memory leak!\n");
nl->outpos = 0;
nl->state &= ~(FL_WAIT_ACK | FL_NEED_RESEND);
@@ -1179,16 +1178,15 @@ sbni_open( struct net_device *dev )
((struct net_local *) (netdev_priv(*p)))
->second = dev;
- printk( KERN_NOTICE "%s: using shared irq "
- "with %s\n", dev->name, (*p)->name );
+ netdev_notice(dev, "using shared irq with %s\n",
+ (*p)->name);
nl->state |= FL_SECONDARY;
goto handler_attached;
}
}
if( request_irq(dev->irq, sbni_interrupt, IRQF_SHARED, dev->name, dev) ) {
- printk( KERN_ERR "%s: unable to get IRQ %d.\n",
- dev->name, dev->irq );
+ netdev_err(dev, "unable to get IRQ %d\n", dev->irq);
return -EAGAIN;
}
@@ -1220,8 +1218,8 @@ sbni_close( struct net_device *dev )
struct net_local *nl = netdev_priv(dev);
if( nl->second && nl->second->flags & IFF_UP ) {
- printk( KERN_NOTICE "Secondary channel (%s) is active!\n",
- nl->second->name );
+ netdev_notice(dev, "Secondary channel (%s) is active!\n",
+ nl->second->name);
return -EBUSY;
}
@@ -1363,8 +1361,8 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd )
return -EFAULT;
slave_dev = dev_get_by_name(&init_net, slave_name );
if( !slave_dev || !(slave_dev->flags & IFF_UP) ) {
- printk( KERN_ERR "%s: trying to enslave non-active "
- "device %s\n", dev->name, slave_name );
+ netdev_err(dev, "trying to enslave non-active device %s\n",
+ slave_name);
return -EPERM;
}
@@ -1417,8 +1415,7 @@ enslave( struct net_device *dev, struct net_device *slave_dev )
spin_unlock( &snl->lock );
spin_unlock( &nl->lock );
- printk( KERN_NOTICE "%s: slave device (%s) attached.\n",
- dev->name, slave_dev->name );
+ netdev_notice(dev, "slave device (%s) attached\n", slave_dev->name);
return 0;
}
@@ -1547,7 +1544,7 @@ sbni_setup( char *p )
break;
}
bad_param:
- printk( KERN_ERR "Error in sbni kernel parameter!\n" );
+ pr_err("Error in sbni kernel parameter!\n");
return 0;
}
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index e91457d..0b4fd05 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -12,6 +12,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -190,7 +192,7 @@ static int slvl_setup(struct slvl_device *sv, int iobase, int irq)
dev->irq = irq;
if (register_hdlc_device(dev)) {
- printk(KERN_ERR "sealevel: unable to register HDLC device\n");
+ pr_err("unable to register HDLC device\n");
free_netdev(dev);
return -1;
}
@@ -215,8 +217,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
*/
if (!request_region(iobase, 8, "Sealevel 4021")) {
- printk(KERN_WARNING "sealevel: I/O 0x%X already in use.\n",
- iobase);
+ pr_warn("I/O 0x%X already in use\n", iobase);
return NULL;
}
@@ -267,7 +268,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
"SeaLevel", dev) < 0) {
- printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);
+ pr_warn("IRQ %d already in use\n", irq);
goto err_request_irq;
}
@@ -292,7 +293,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
*/
if (z8530_init(dev) != 0) {
- printk(KERN_ERR "Z8530 series device not found.\n");
+ pr_err("Z8530 series device not found\n");
enable_irq(irq);
goto free_hw;
}
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 24297b2..46ceb3a 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -14,6 +14,8 @@
* 2000-10-29 Henner Eisen lapb_data_indication() return status.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <asm/system.h>
@@ -96,7 +98,7 @@ static struct x25_asy *x25_asy_alloc(void)
x25_asy_devs[i] = dev;
return sl;
} else {
- printk(KERN_WARNING "x25_asy_alloc() - register_netdev() failure.\n");
+ pr_warn("%s(): register_netdev() failure\n", __func__);
free_netdev(dev);
}
}
@@ -114,8 +116,7 @@ static void x25_asy_free(struct x25_asy *sl)
sl->xbuff = NULL;
if (!test_and_clear_bit(SLF_INUSE, &sl->flags))
- printk(KERN_ERR "%s: x25_asy_free for already free unit.\n",
- sl->dev->name);
+ netdev_err(sl->dev, "x25_asy_free for already free unit\n");
}
static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
@@ -128,8 +129,7 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
rbuff = kmalloc(len + 4, GFP_ATOMIC);
if (xbuff == NULL || rbuff == NULL) {
- printk(KERN_WARNING "%s: unable to grow X.25 buffers, MTU change cancelled.\n",
- dev->name);
+ netdev_warn(dev, "unable to grow X.25 buffers, MTU change cancelled\n");
kfree(xbuff);
kfree(rbuff);
return -ENOMEM;
@@ -198,8 +198,7 @@ static void x25_asy_bump(struct x25_asy *sl)
skb = dev_alloc_skb(count+1);
if (skb == NULL) {
- printk(KERN_WARNING "%s: memory squeeze, dropping packet.\n",
- sl->dev->name);
+ netdev_warn(sl->dev, "memory squeeze, dropping packet\n");
dev->stats.rx_dropped++;
return;
}
@@ -287,9 +286,9 @@ static void x25_asy_timeout(struct net_device *dev)
/* May be we must check transmitter timeout here ?
* 14 Oct 1994 Dmitry Gorodchanin.
*/
- printk(KERN_WARNING "%s: transmit timed out, %s?\n", dev->name,
- (tty_chars_in_buffer(sl->tty) || sl->xleft) ?
- "bad line quality" : "driver error");
+ netdev_warn(dev, "transmit timed out, %s?\n",
+ (tty_chars_in_buffer(sl->tty) || sl->xleft) ?
+ "bad line quality" : "driver error");
sl->xleft = 0;
clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
x25_asy_unlock(sl);
@@ -306,8 +305,7 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
int err;
if (!netif_running(sl->dev)) {
- printk(KERN_ERR "%s: xmit call when iface is down\n",
- dev->name);
+ netdev_err(dev, "xmit call when iface is down\n");
kfree_skb(skb);
return NETDEV_TX_OK;
}
@@ -318,13 +316,15 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
case X25_IFACE_CONNECT: /* Connection request .. do nothing */
err = lapb_connect_request(dev);
if (err != LAPB_OK)
- printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err);
+ netdev_err(dev, "lapb_connect_request error: %d\n",
+ err);
kfree_skb(skb);
return NETDEV_TX_OK;
case X25_IFACE_DISCONNECT: /* do nothing - hang up ?? */
err = lapb_disconnect_request(dev);
if (err != LAPB_OK)
- printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err);
+ netdev_err(dev, "lapb_disconnect_request error: %d\n",
+ err);
default:
kfree_skb(skb);
return NETDEV_TX_OK;
@@ -343,7 +343,7 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
err = lapb_data_request(dev, skb);
if (err != LAPB_OK) {
- printk(KERN_ERR "x25_asy: lapb_data_request error - %d\n", err);
+ netdev_err(dev, "lapb_data_request error: %d\n", err);
kfree_skb(skb);
return NETDEV_TX_OK;
}
@@ -378,7 +378,7 @@ static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb)
spin_lock(&sl->lock);
if (netif_queue_stopped(sl->dev) || sl->tty == NULL) {
spin_unlock(&sl->lock);
- printk(KERN_ERR "x25_asy: tbusy drop\n");
+ netdev_err(dev, "tbusy drop\n");
kfree_skb(skb);
return;
}
@@ -404,7 +404,7 @@ static void x25_asy_connected(struct net_device *dev, int reason)
skb = dev_alloc_skb(1);
if (skb == NULL) {
- printk(KERN_ERR "x25_asy: out of memory\n");
+ netdev_err(dev, "out of memory\n");
return;
}
@@ -423,7 +423,7 @@ static void x25_asy_disconnected(struct net_device *dev, int reason)
skb = dev_alloc_skb(1);
if (skb == NULL) {
- printk(KERN_ERR "x25_asy: out of memory\n");
+ netdev_err(dev, "out of memory\n");
return;
}
@@ -603,8 +603,8 @@ static void x25_asy_close_tty(struct tty_struct *tty)
err = lapb_unregister(sl->dev);
if (err != LAPB_OK)
- printk(KERN_ERR "x25_asy_close: lapb_unregister error -%d\n",
- err);
+ pr_err("x25_asy_close: lapb_unregister error: %d\n",
+ err);
tty->disc_data = NULL;
sl->tty = NULL;
@@ -782,14 +782,13 @@ static int __init init_x25_asy(void)
if (x25_asy_maxdev < 4)
x25_asy_maxdev = 4; /* Sanity */
- printk(KERN_INFO "X.25 async: version 0.00 ALPHA "
- "(dynamic channels, max=%d).\n", x25_asy_maxdev);
+ pr_info("X.25 async: version 0.00 ALPHA (dynamic channels, max=%d)\n",
+ x25_asy_maxdev);
x25_asy_devs = kcalloc(x25_asy_maxdev, sizeof(struct net_device *),
GFP_KERNEL);
if (!x25_asy_devs) {
- printk(KERN_WARNING "X25 async: Can't allocate x25_asy_ctrls[] "
- "array! Uaargh! (-> No X.25 available)\n");
+ pr_warn("Can't allocate x25_asy_ctrls[] array! Uaargh! (-> No X.25 available)\n");
return -ENOMEM;
}
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 0806232..0e57690 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -36,6 +36,8 @@
* Synchronous mode without DMA is unlikely to pass about 2400 baud.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -365,7 +367,7 @@ static void z8530_rx(struct z8530_channel *c)
c->count=0;
if(stat&Rx_OVR)
{
- printk(KERN_WARNING "%s: overrun\n", c->dev->name);
+ pr_warn("%s: overrun\n", c->dev->name);
c->rx_overrun++;
}
if(stat&CRC_ERR)
@@ -464,12 +466,12 @@ static void z8530_status(struct z8530_channel *chan)
if (altered & chan->dcdcheck)
{
if (status & chan->dcdcheck) {
- printk(KERN_INFO "%s: DCD raised\n", chan->dev->name);
+ pr_info("%s: DCD raised\n", chan->dev->name);
write_zsreg(chan, R3, chan->regs[3] | RxENABLE);
if (chan->netdevice)
netif_carrier_on(chan->netdevice);
} else {
- printk(KERN_INFO "%s: DCD lost\n", chan->dev->name);
+ pr_info("%s: DCD lost\n", chan->dev->name);
write_zsreg(chan, R3, chan->regs[3] & ~RxENABLE);
z8530_flush_fifo(chan);
if (chan->netdevice)
@@ -538,12 +540,12 @@ static void z8530_dma_tx(struct z8530_channel *chan)
{
if(!chan->dma_tx)
{
- printk(KERN_WARNING "Hey who turned the DMA off?\n");
+ pr_warn("Hey who turned the DMA off?\n");
z8530_tx(chan);
return;
}
/* This shouldn't occur in DMA mode */
- printk(KERN_ERR "DMA tx - bogus event!\n");
+ pr_err("DMA tx - bogus event!\n");
z8530_tx(chan);
}
@@ -585,12 +587,12 @@ static void z8530_dma_status(struct z8530_channel *chan)
if (altered & chan->dcdcheck)
{
if (status & chan->dcdcheck) {
- printk(KERN_INFO "%s: DCD raised\n", chan->dev->name);
+ pr_info("%s: DCD raised\n", chan->dev->name);
write_zsreg(chan, R3, chan->regs[3] | RxENABLE);
if (chan->netdevice)
netif_carrier_on(chan->netdevice);
} else {
- printk(KERN_INFO "%s:DCD lost\n", chan->dev->name);
+ pr_info("%s: DCD lost\n", chan->dev->name);
write_zsreg(chan, R3, chan->regs[3] & ~RxENABLE);
z8530_flush_fifo(chan);
if (chan->netdevice)
@@ -712,7 +714,7 @@ irqreturn_t z8530_interrupt(int irq, void *dev_id)
if(locker)
{
- printk(KERN_ERR "IRQ re-enter\n");
+ pr_err("IRQ re-enter\n");
return IRQ_NONE;
}
locker=1;
@@ -758,7 +760,8 @@ irqreturn_t z8530_interrupt(int irq, void *dev_id)
}
spin_unlock(&dev->lock);
if(work==5000)
- printk(KERN_ERR "%s: interrupt jammed - abort(0x%X)!\n", dev->name, intr);
+ pr_err("%s: interrupt jammed - abort(0x%X)!\n",
+ dev->name, intr);
/* Ok all done */
locker=0;
return IRQ_HANDLED;
@@ -1225,7 +1228,7 @@ static const char *z8530_type_name[]={
void z8530_describe(struct z8530_dev *dev, char *mapping, unsigned long io)
{
- printk(KERN_INFO "%s: %s found at %s 0x%lX, IRQ %d.\n",
+ pr_info("%s: %s found at %s 0x%lX, IRQ %d\n",
dev->name,
z8530_type_name[dev->type],
mapping,
@@ -1621,8 +1624,7 @@ static void z8530_rx_done(struct z8530_channel *c)
else
/* Can't occur as we dont reenable the DMA irq until
after the flip is done */
- printk(KERN_WARNING "%s: DMA flip overrun!\n",
- c->netdevice->name);
+ netdev_warn(c->netdevice, "DMA flip overrun!\n");
release_dma_lock(flags);
@@ -1637,8 +1639,7 @@ static void z8530_rx_done(struct z8530_channel *c)
skb = dev_alloc_skb(ct);
if (skb == NULL) {
c->netdevice->stats.rx_dropped++;
- printk(KERN_WARNING "%s: Memory squeeze.\n",
- c->netdevice->name);
+ netdev_warn(c->netdevice, "Memory squeeze\n");
} else {
skb_put(skb, ct);
skb_copy_to_linear_data(skb, rxb, ct);
@@ -1678,8 +1679,7 @@ static void z8530_rx_done(struct z8530_channel *c)
c->skb2 = dev_alloc_skb(c->mtu);
if (c->skb2 == NULL)
- printk(KERN_WARNING "%s: memory squeeze.\n",
- c->netdevice->name);
+ netdev_warn(c->netdevice, "memory squeeze\n");
else
skb_put(c->skb2, c->mtu);
c->netdevice->stats.rx_packets++;
@@ -1693,7 +1693,7 @@ static void z8530_rx_done(struct z8530_channel *c)
c->rx_function(c, skb);
} else {
c->netdevice->stats.rx_dropped++;
- printk(KERN_ERR "%s: Lost a frame\n", c->netdevice->name);
+ netdev_err(c->netdevice, "Lost a frame\n");
}
}
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 5/8] dscc4: Update to current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev, Francois Romieu; +Cc: linux-kernel
In-Reply-To: <cover.1309150683.git.joe@perches.com>
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/dscc4.c | 80 ++++++++++++++++++++++------------------------
1 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 3590d58..058e169 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -80,6 +80,8 @@
* - misc crapectomy.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/types.h>
@@ -553,7 +555,7 @@ static int dscc4_wait_ack_cec(struct dscc4_dev_priv *dpriv,
schedule_timeout_uninterruptible(10);
rmb();
} while (++i > 0);
- printk(KERN_ERR "%s: %s timeout\n", dev->name, msg);
+ netdev_err(dev, "%s timeout\n", msg);
done:
return (i >= 0) ? i : -EAGAIN;
}
@@ -569,18 +571,18 @@ static int dscc4_do_action(struct net_device *dev, char *msg)
u32 state = readl(ioaddr);
if (state & ArAck) {
- printk(KERN_DEBUG "%s: %s ack\n", dev->name, msg);
+ netdev_dbg(dev, "%s ack\n", msg);
writel(ArAck, ioaddr);
goto done;
} else if (state & Arf) {
- printk(KERN_ERR "%s: %s failed\n", dev->name, msg);
+ netdev_err(dev, "%s failed\n", msg);
writel(Arf, ioaddr);
i = -1;
goto done;
}
rmb();
} while (++i > 0);
- printk(KERN_ERR "%s: %s timeout\n", dev->name, msg);
+ netdev_err(dev, "%s timeout\n", msg);
done:
return i;
}
@@ -636,7 +638,7 @@ static void dscc4_tx_reset(struct dscc4_dev_priv *dpriv, struct net_device *dev)
writel(MTFi|Rdt, dpriv->base_addr + dpriv->dev_id*0x0c + CH0CFG);
if (dscc4_do_action(dev, "Rdt") < 0)
- printk(KERN_ERR "%s: Tx reset failed\n", dev->name);
+ netdev_err(dev, "Tx reset failed\n");
}
#endif
@@ -722,22 +724,20 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
rc = pci_request_region(pdev, 0, "registers");
if (rc < 0) {
- printk(KERN_ERR "%s: can't reserve MMIO region (regs)\n",
- DRV_NAME);
+ pr_err("can't reserve MMIO region (regs)\n");
goto err_disable_0;
}
rc = pci_request_region(pdev, 1, "LBI interface");
if (rc < 0) {
- printk(KERN_ERR "%s: can't reserve MMIO region (lbi)\n",
- DRV_NAME);
+ pr_err("can't reserve MMIO region (lbi)\n");
goto err_free_mmio_region_1;
}
ioaddr = pci_ioremap_bar(pdev, 0);
if (!ioaddr) {
- printk(KERN_ERR "%s: cannot remap MMIO region %llx @ %llx\n",
- DRV_NAME, (unsigned long long)pci_resource_len(pdev, 0),
- (unsigned long long)pci_resource_start(pdev, 0));
+ pr_err("cannot remap MMIO region %llx @ %llx\n",
+ (unsigned long long)pci_resource_len(pdev, 0),
+ (unsigned long long)pci_resource_start(pdev, 0));
rc = -EIO;
goto err_free_mmio_regions_2;
}
@@ -757,7 +757,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
rc = request_irq(pdev->irq, dscc4_irq, IRQF_SHARED, DRV_NAME, priv->root);
if (rc < 0) {
- printk(KERN_WARNING "%s: IRQ %d busy\n", DRV_NAME, pdev->irq);
+ pr_warn("IRQ %d busy\n", pdev->irq);
goto err_release_4;
}
@@ -904,7 +904,7 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
root = kcalloc(dev_per_card, sizeof(*root), GFP_KERNEL);
if (!root) {
- printk(KERN_ERR "%s: can't allocate data\n", DRV_NAME);
+ pr_err("can't allocate data\n");
goto err_out;
}
@@ -916,7 +916,7 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
ppriv = kzalloc(sizeof(*ppriv), GFP_KERNEL);
if (!ppriv) {
- printk(KERN_ERR "%s: can't allocate private data\n", DRV_NAME);
+ pr_err("can't allocate private data\n");
goto err_free_dev;
}
@@ -952,7 +952,7 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
ret = register_hdlc_device(d);
if (ret < 0) {
- printk(KERN_ERR "%s: unable to register\n", DRV_NAME);
+ pr_err("unable to register\n");
dscc4_release_ring(dpriv);
goto err_unregister;
}
@@ -1005,7 +1005,7 @@ static int dscc4_loopback_check(struct dscc4_dev_priv *dpriv)
if (settings->loopback && (settings->clock_type != CLOCK_INT)) {
struct net_device *dev = dscc4_to_dev(dpriv);
- printk(KERN_INFO "%s: loopback requires clock\n", dev->name);
+ netdev_info(dev, "loopback requires clock\n");
return -1;
}
return 0;
@@ -1078,7 +1078,7 @@ static int dscc4_open(struct net_device *dev)
scc_patchl(0, PowerUp, dpriv, dev, CCR0);
scc_patchl(0, 0x00050000, dpriv, dev, CCR2);
scc_writel(EventsMask, dpriv, dev, IMR);
- printk(KERN_INFO "%s: up again.\n", dev->name);
+ netdev_info(dev, "up again\n");
goto done;
}
@@ -1095,11 +1095,11 @@ static int dscc4_open(struct net_device *dev)
* situations.
*/
if (scc_readl_star(dpriv, dev) & SccBusy) {
- printk(KERN_ERR "%s busy. Try later\n", dev->name);
+ netdev_err(dev, "busy - try later\n");
ret = -EAGAIN;
goto err_out;
} else
- printk(KERN_INFO "%s: available. Good\n", dev->name);
+ netdev_info(dev, "available - good\n");
scc_writel(EventsMask, dpriv, dev, IMR);
@@ -1117,7 +1117,7 @@ static int dscc4_open(struct net_device *dev)
* reset is needed. Suggestions anyone ?
*/
if ((ret = dscc4_xpr_ack(dpriv)) < 0) {
- printk(KERN_ERR "%s: %s timeout\n", DRV_NAME, "XPR");
+ pr_err("XPR timeout\n");
goto err_disable_scc_events;
}
@@ -1342,8 +1342,7 @@ static int dscc4_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return -EPERM;
if (dpriv->flags & FakeReset) {
- printk(KERN_INFO "%s: please reset the device"
- " before this command\n", dev->name);
+ netdev_info(dev, "please reset the device before this command\n");
return -EPERM;
}
if (copy_from_user(&dpriv->settings, line, size))
@@ -1506,8 +1505,7 @@ static irqreturn_t dscc4_irq(int irq, void *token)
writel(state, ioaddr + GSTAR);
if (state & Arf) {
- printk(KERN_ERR "%s: failure (Arf). Harass the maintener\n",
- dev->name);
+ netdev_err(dev, "failure (Arf). Harass the maintainer\n");
goto out;
}
state &= ~ArAck;
@@ -1515,7 +1513,7 @@ static irqreturn_t dscc4_irq(int irq, void *token)
if (debug > 0)
printk(KERN_DEBUG "%s: CfgIV\n", DRV_NAME);
if (priv->iqcfg[priv->cfg_cur++%IRQ_RING_SIZE] & cpu_to_le32(Arf))
- printk(KERN_ERR "%s: %s failed\n", dev->name, "CFG");
+ netdev_err(dev, "CFG failed\n");
if (!(state &= ~Cfg))
goto out;
}
@@ -1596,8 +1594,8 @@ try:
++dpriv->tx_dirty;
} else {
if (debug > 1)
- printk(KERN_ERR "%s Tx: NULL skb %d\n",
- dev->name, cur);
+ netdev_err(dev, "Tx: NULL skb %d\n",
+ cur);
}
/*
* If the driver ends sending crap on the wire, it
@@ -1616,7 +1614,7 @@ try:
* Transmit Data Underrun
*/
if (state & Xdu) {
- printk(KERN_ERR "%s: XDU. Ask maintainer\n", DRV_NAME);
+ netdev_err(dev, "Tx Data Underrun. Ask maintainer\n");
dpriv->flags = NeedIDT;
/* Tx reset */
writel(MTFi | Rdt,
@@ -1625,13 +1623,13 @@ try:
return;
}
if (state & Cts) {
- printk(KERN_INFO "%s: CTS transition\n", dev->name);
+ netdev_info(dev, "CTS transition\n");
if (!(state &= ~Cts)) /* DEBUG */
goto try;
}
if (state & Xmr) {
/* Frame needs to be sent again - FIXME */
- printk(KERN_ERR "%s: Xmr. Ask maintainer\n", DRV_NAME);
+ netdev_err(dev, "Tx ReTx. Ask maintainer\n");
if (!(state &= ~Xmr)) /* DEBUG */
goto try;
}
@@ -1649,7 +1647,7 @@ try:
break;
}
if (!i)
- printk(KERN_INFO "%s busy in irq\n", dev->name);
+ netdev_info(dev, "busy in irq\n");
scc_addr = dpriv->base_addr + 0x0c*dpriv->dev_id;
/* Keep this order: IDT before IDR */
@@ -1686,7 +1684,7 @@ try:
}
if (state & Cd) {
if (debug > 0)
- printk(KERN_INFO "%s: CD transition\n", dev->name);
+ netdev_info(dev, "CD transition\n");
if (!(state &= ~Cd)) /* DEBUG */
goto try;
}
@@ -1695,11 +1693,11 @@ try:
#ifdef DSCC4_POLLING
while (!dscc4_tx_poll(dpriv, dev));
#endif
- printk(KERN_INFO "%s: Tx Hi\n", dev->name);
+ netdev_info(dev, "Tx Hi\n");
state &= ~Hi;
}
if (state & Err) {
- printk(KERN_INFO "%s: Tx ERR\n", dev->name);
+ netdev_info(dev, "Tx ERR\n");
dev->stats.tx_errors++;
state &= ~Err;
}
@@ -1769,7 +1767,7 @@ try:
goto try;
}
if (state & Hi ) { /* HI bit */
- printk(KERN_INFO "%s: Rx Hi\n", dev->name);
+ netdev_info(dev, "Rx Hi\n");
state &= ~Hi;
goto try;
}
@@ -1800,7 +1798,7 @@ try:
goto try;
}
if (state & Cts) {
- printk(KERN_INFO "%s: CTS transition\n", dev->name);
+ netdev_info(dev, "CTS transition\n");
if (!(state &= ~Cts)) /* DEBUG */
goto try;
}
@@ -1859,14 +1857,12 @@ try:
sizeof(struct RxFD), scc_addr + CH0BRDA);
writel(MTFi|Rdr|Idr, scc_addr + CH0CFG);
if (dscc4_do_action(dev, "RDR") < 0) {
- printk(KERN_ERR "%s: RDO recovery failed(%s)\n",
- dev->name, "RDR");
+ netdev_err(dev, "RDO recovery failed(RDR)\n");
goto rdo_end;
}
writel(MTFi|Idr, scc_addr + CH0CFG);
if (dscc4_do_action(dev, "IDR") < 0) {
- printk(KERN_ERR "%s: RDO recovery failed(%s)\n",
- dev->name, "IDR");
+ netdev_err(dev, "RDO recovery failed(IDR)\n");
goto rdo_end;
}
rdo_end:
@@ -1875,7 +1871,7 @@ try:
goto try;
}
if (state & Cd) {
- printk(KERN_INFO "%s: CD transition\n", dev->name);
+ netdev_info(dev, "CD transition\n");
if (!(state &= ~Cd)) /* DEBUG */
goto try;
}
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 4/8] frame relay dlci/frad: Update to current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev, Mike McLagan; +Cc: linux-kernel
In-Reply-To: <cover.1309150683.git.joe@perches.com>
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/dlci.c | 22 +++++++++++++------
drivers/net/wan/sdla.c | 52 +++++++++++++++++++++++++++--------------------
2 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 21b104d..48ab38a 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -28,6 +28,8 @@
* 2 of the License, or (at your option) any later version.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@ -112,8 +114,7 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
dlp = netdev_priv(dev);
if (!pskb_may_pull(skb, sizeof(*hdr))) {
- printk(KERN_NOTICE "%s: invalid data no header\n",
- dev->name);
+ netdev_notice(dev, "invalid data no header\n");
dev->stats.rx_errors++;
kfree_skb(skb);
return;
@@ -126,7 +127,8 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
if (hdr->control != FRAD_I_UI)
{
- printk(KERN_NOTICE "%s: Invalid header flag 0x%02X.\n", dev->name, hdr->control);
+ netdev_notice(dev, "Invalid header flag 0x%02X\n",
+ hdr->control);
dev->stats.rx_errors++;
}
else
@@ -135,14 +137,18 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
case FRAD_P_PADDING:
if (hdr->NLPID != FRAD_P_SNAP)
{
- printk(KERN_NOTICE "%s: Unsupported NLPID 0x%02X.\n", dev->name, hdr->NLPID);
+ netdev_notice(dev, "Unsupported NLPID 0x%02X\n",
+ hdr->NLPID);
dev->stats.rx_errors++;
break;
}
if (hdr->OUI[0] + hdr->OUI[1] + hdr->OUI[2] != 0)
{
- printk(KERN_NOTICE "%s: Unsupported organizationally unique identifier 0x%02X-%02X-%02X.\n", dev->name, hdr->OUI[0], hdr->OUI[1], hdr->OUI[2]);
+ netdev_notice(dev, "Unsupported organizationally unique identifier 0x%02X-%02X-%02X\n",
+ hdr->OUI[0],
+ hdr->OUI[1],
+ hdr->OUI[2]);
dev->stats.rx_errors++;
break;
}
@@ -163,12 +169,14 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
case FRAD_P_SNAP:
case FRAD_P_Q933:
case FRAD_P_CLNP:
- printk(KERN_NOTICE "%s: Unsupported NLPID 0x%02X.\n", dev->name, hdr->pad);
+ netdev_notice(dev, "Unsupported NLPID 0x%02X\n",
+ hdr->pad);
dev->stats.rx_errors++;
break;
default:
- printk(KERN_NOTICE "%s: Invalid pad byte 0x%02X.\n", dev->name, hdr->pad);
+ netdev_notice(dev, "Invalid pad byte 0x%02X\n",
+ hdr->pad);
dev->stats.rx_errors++;
break;
}
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 3f4e2b5..c853161 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -32,6 +32,8 @@
* 2 of the License, or (at your option) any later version.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@ -350,24 +352,24 @@ static void sdla_errors(struct net_device *dev, int cmd, int dlci, int ret, int
case SDLA_RET_MODEM:
state = data;
if (*state & SDLA_MODEM_DCD_LOW)
- printk(KERN_INFO "%s: Modem DCD unexpectedly low!\n", dev->name);
+ netdev_info(dev, "Modem DCD unexpectedly low!\n");
if (*state & SDLA_MODEM_CTS_LOW)
- printk(KERN_INFO "%s: Modem CTS unexpectedly low!\n", dev->name);
+ netdev_info(dev, "Modem CTS unexpectedly low!\n");
/* I should probably do something about this! */
break;
case SDLA_RET_CHANNEL_OFF:
- printk(KERN_INFO "%s: Channel became inoperative!\n", dev->name);
+ netdev_info(dev, "Channel became inoperative!\n");
/* same here */
break;
case SDLA_RET_CHANNEL_ON:
- printk(KERN_INFO "%s: Channel became operative!\n", dev->name);
+ netdev_info(dev, "Channel became operative!\n");
/* same here */
break;
case SDLA_RET_DLCI_STATUS:
- printk(KERN_INFO "%s: Status change reported by Access Node.\n", dev->name);
+ netdev_info(dev, "Status change reported by Access Node\n");
len /= sizeof(struct _dlci_stat);
for(pstatus = data, i=0;i < len;i++,pstatus++)
{
@@ -382,29 +384,32 @@ static void sdla_errors(struct net_device *dev, int cmd, int dlci, int ret, int
sprintf(line, "unknown status: %02X", pstatus->flags);
state = line;
}
- printk(KERN_INFO "%s: DLCI %i: %s.\n", dev->name, pstatus->dlci, state);
+ netdev_info(dev, "DLCI %i: %s\n",
+ pstatus->dlci, state);
/* same here */
}
break;
case SDLA_RET_DLCI_UNKNOWN:
- printk(KERN_INFO "%s: Received unknown DLCIs:", dev->name);
+ netdev_info(dev, "Received unknown DLCIs:");
len /= sizeof(short);
for(pdlci = data,i=0;i < len;i++,pdlci++)
- printk(" %i", *pdlci);
- printk("\n");
+ pr_cont(" %i", *pdlci);
+ pr_cont("\n");
break;
case SDLA_RET_TIMEOUT:
- printk(KERN_ERR "%s: Command timed out!\n", dev->name);
+ netdev_err(dev, "Command timed out!\n");
break;
case SDLA_RET_BUF_OVERSIZE:
- printk(KERN_INFO "%s: Bc/CIR overflow, acceptable size is %i\n", dev->name, len);
+ netdev_info(dev, "Bc/CIR overflow, acceptable size is %i\n",
+ len);
break;
case SDLA_RET_BUF_TOO_BIG:
- printk(KERN_INFO "%s: Buffer size over specified max of %i\n", dev->name, len);
+ netdev_info(dev, "Buffer size over specified max of %i\n",
+ len);
break;
case SDLA_RET_CHANNEL_INACTIVE:
@@ -415,7 +420,8 @@ static void sdla_errors(struct net_device *dev, int cmd, int dlci, int ret, int
break;
default:
- printk(KERN_DEBUG "%s: Cmd 0x%2.2X generated return code 0x%2.2X\n", dev->name, cmd, ret);
+ netdev_dbg(dev, "Cmd 0x%02X generated return code 0x%02X\n",
+ cmd, ret);
/* Further processing could be done here */
break;
}
@@ -678,12 +684,14 @@ static netdev_tx_t sdla_transmit(struct sk_buff *skb,
case ARPHRD_FRAD:
if (skb->dev->type != ARPHRD_DLCI)
{
- printk(KERN_WARNING "%s: Non DLCI device, type %i, tried to send on FRAD module.\n", dev->name, skb->dev->type);
+ netdev_warn(dev, "Non DLCI device, type %i, tried to send on FRAD module\n",
+ skb->dev->type);
accept = 0;
}
break;
default:
- printk(KERN_WARNING "%s: unknown firmware type 0x%4.4X\n", dev->name, dev->type);
+ netdev_warn(dev, "unknown firmware type 0x%04X\n",
+ dev->type);
accept = 0;
break;
}
@@ -807,7 +815,8 @@ static void sdla_receive(struct net_device *dev)
if (i == CONFIG_DLCI_MAX)
{
- printk(KERN_NOTICE "%s: Received packet from invalid DLCI %i, ignoring.", dev->name, dlci);
+ netdev_notice(dev, "Received packet from invalid DLCI %i, ignoring\n",
+ dlci);
dev->stats.rx_errors++;
success = 0;
}
@@ -819,7 +828,7 @@ static void sdla_receive(struct net_device *dev)
skb = dev_alloc_skb(len + sizeof(struct frhdr));
if (skb == NULL)
{
- printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
+ netdev_notice(dev, "Memory squeeze, dropping packet\n");
dev->stats.rx_dropped++;
success = 0;
}
@@ -880,8 +889,7 @@ static irqreturn_t sdla_isr(int dummy, void *dev_id)
if (!flp->initialized)
{
- printk(KERN_WARNING "%s: irq %d for uninitialized device.\n",
- dev->name, dev->irq);
+ netdev_warn(dev, "irq %d for uninitialized device\n", dev->irq);
return IRQ_NONE;
}
@@ -901,7 +909,7 @@ static irqreturn_t sdla_isr(int dummy, void *dev_id)
case SDLA_INTR_TX:
case SDLA_INTR_COMPLETE:
case SDLA_INTR_TIMER:
- printk(KERN_WARNING "%s: invalid irq flag 0x%02X.\n", dev->name, byte);
+ netdev_warn(dev, "invalid irq flag 0x%02X\n", byte);
break;
}
@@ -1347,7 +1355,7 @@ static int sdla_set_config(struct net_device *dev, struct ifmap *map)
return -EINVAL;
if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){
- printk(KERN_WARNING "SDLA: io-port 0x%04lx in use\n", dev->base_addr);
+ pr_warn("io-port 0x%04lx in use\n", dev->base_addr);
return -EINVAL;
}
base = map->base_addr;
@@ -1412,7 +1420,7 @@ static int sdla_set_config(struct net_device *dev, struct ifmap *map)
}
}
- printk(KERN_NOTICE "%s: Unknown card type\n", dev->name);
+ netdev_notice(dev, "Unknown card type\n");
err = -ENODEV;
goto fail;
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 3/8] cyclom: Update to current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev, Arnaldo Carvalho de Melo; +Cc: linux-kernel
In-Reply-To: <cover.1309150683.git.joe@perches.com>
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/cycx_drv.c | 81 +++++++++-----------
drivers/net/wan/cycx_main.c | 31 ++++----
drivers/net/wan/cycx_x25.c | 177 ++++++++++++++++++++-----------------------
3 files changed, 133 insertions(+), 156 deletions(-)
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c
index 164c362..2a3ecae 100644
--- a/drivers/net/wan/cycx_drv.c
+++ b/drivers/net/wan/cycx_drv.c
@@ -48,6 +48,8 @@
* Aug 8, 1998 acme Initial version.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/init.h> /* __init */
#include <linux/module.h>
#include <linux/kernel.h> /* printk(), and other useful stuff */
@@ -81,10 +83,9 @@ static u16 checksum(u8 *buf, u32 len);
/* Global Data */
/* private data */
-static const char modname[] = "cycx_drv";
static const char fullname[] = "Cyclom 2X Support Module";
-static const char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
- "<acme@conectiva.com.br>";
+static const char copyright[] =
+ "(c) 1998-2003 Arnaldo Carvalho de Melo <acme@conectiva.com.br>";
/* Hardware configuration options.
* These are arrays of configuration options used by verification routines.
@@ -110,8 +111,8 @@ static const long cycx_2x_irq_options[] = { 7, 3, 5, 9, 10, 11, 12, 15 };
static int __init cycx_drv_init(void)
{
- printk(KERN_INFO "%s v%u.%u %s\n", fullname, MOD_VERSION, MOD_RELEASE,
- copyright);
+ pr_info("%s v%u.%u %s\n",
+ fullname, MOD_VERSION, MOD_RELEASE, copyright);
return 0;
}
@@ -139,18 +140,16 @@ int cycx_setup(struct cycx_hw *hw, void *cfm, u32 len, unsigned long dpmbase)
/* Verify IRQ configuration options */
if (!get_option_index(cycx_2x_irq_options, hw->irq)) {
- printk(KERN_ERR "%s: IRQ %d is invalid!\n", modname, hw->irq);
+ pr_err("IRQ %d is invalid!\n", hw->irq);
return -EINVAL;
}
/* Setup adapter dual-port memory window and test memory */
if (!dpmbase) {
- printk(KERN_ERR "%s: you must specify the dpm address!\n",
- modname);
+ pr_err("you must specify the dpm address!\n");
return -EINVAL;
} else if (!get_option_index(cyc2x_dpmbase_options, dpmbase)) {
- printk(KERN_ERR "%s: memory address 0x%lX is invalid!\n",
- modname, dpmbase);
+ pr_err("memory address 0x%lX is invalid!\n", dpmbase);
return -EINVAL;
}
@@ -158,13 +157,12 @@ int cycx_setup(struct cycx_hw *hw, void *cfm, u32 len, unsigned long dpmbase)
hw->dpmsize = CYCX_WINDOWSIZE;
if (!detect_cyc2x(hw->dpmbase)) {
- printk(KERN_ERR "%s: adapter Cyclom 2X not found at "
- "address 0x%lX!\n", modname, dpmbase);
+ pr_err("adapter Cyclom 2X not found at address 0x%lX!\n",
+ dpmbase);
return -EINVAL;
}
- printk(KERN_INFO "%s: found Cyclom 2X card at address 0x%lX.\n",
- modname, dpmbase);
+ pr_info("found Cyclom 2X card at address 0x%lX\n", dpmbase);
/* Load firmware. If loader fails then shut down adapter */
err = load_cyc2x(hw, cfm, len);
@@ -339,7 +337,7 @@ static int cycx_data_boot(void __iomem *addr, u8 *code, u32 len)
for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ)
if (buffer_load(addr, code + i,
min_t(u32, CFM_LOAD_BUFSZ, (len - i))) < 0) {
- printk(KERN_ERR "%s: Error !!\n", modname);
+ pr_err("Error !!\n");
return -1;
}
@@ -370,7 +368,7 @@ static int cycx_code_boot(void __iomem *addr, u8 *code, u32 len)
for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ)
if (buffer_load(addr, code + i,
min_t(u32, CFM_LOAD_BUFSZ, (len - i)))) {
- printk(KERN_ERR "%s: Error !!\n", modname);
+ pr_err("Error !!\n");
return -1;
}
@@ -391,23 +389,20 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len)
u16 cksum;
/* Announce */
- printk(KERN_INFO "%s: firmware signature=\"%s\"\n", modname,
- cfm->signature);
+ pr_info("firmware signature=\"%s\"\n", cfm->signature);
/* Verify firmware signature */
if (strcmp(cfm->signature, CFM_SIGNATURE)) {
- printk(KERN_ERR "%s:load_cyc2x: not Cyclom-2X firmware!\n",
- modname);
+ pr_err("load_cyc2x: not Cyclom-2X firmware!\n");
return -EINVAL;
}
- printk(KERN_INFO "%s: firmware version=%u\n", modname, cfm->version);
+ pr_info("firmware version=%u\n", cfm->version);
/* Verify firmware module format version */
if (cfm->version != CFM_VERSION) {
- printk(KERN_ERR "%s:%s: firmware format %u rejected! "
- "Expecting %u.\n",
- modname, __func__, cfm->version, CFM_VERSION);
+ pr_err("%s: firmware format %u rejected! Expecting %u.\n",
+ __func__, cfm->version, CFM_VERSION);
return -EINVAL;
}
@@ -419,23 +414,22 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len)
if (((len - sizeof(struct cycx_firmware) - 1) != cfm->info.codesize) ||
*/
if (cksum != cfm->checksum) {
- printk(KERN_ERR "%s:%s: firmware corrupted!\n",
- modname, __func__);
- printk(KERN_ERR " cdsize = 0x%x (expected 0x%lx)\n",
- len - (int)sizeof(struct cycx_firmware) - 1,
- cfm->info.codesize);
- printk(KERN_ERR " chksum = 0x%x (expected 0x%x)\n",
- cksum, cfm->checksum);
+ pr_err("%s: firmware corrupted!\n", __func__);
+ pr_err(" cdsize = 0x%x (expected 0x%lx)\n",
+ len - (int)sizeof(struct cycx_firmware) - 1,
+ cfm->info.codesize);
+ pr_err(" chksum = 0x%x (expected 0x%x)\n",
+ cksum, cfm->checksum);
return -EINVAL;
}
/* If everything is ok, set reset, data and code pointers */
img_hdr = (struct cycx_fw_header *)&cfm->image;
#ifdef FIRMWARE_DEBUG
- printk(KERN_INFO "%s:%s: image sizes\n", __func__, modname);
- printk(KERN_INFO " reset=%lu\n", img_hdr->reset_size);
- printk(KERN_INFO " data=%lu\n", img_hdr->data_size);
- printk(KERN_INFO " code=%lu\n", img_hdr->code_size);
+ pr_info("%s: image sizes\n", __func__);
+ pr_info(" reset=%lu\n", img_hdr->reset_size);
+ pr_info(" data=%lu\n", img_hdr->data_size);
+ pr_info(" code=%lu\n", img_hdr->code_size);
#endif
reset_image = ((u8 *)img_hdr) + sizeof(struct cycx_fw_header);
data_image = reset_image + img_hdr->reset_size;
@@ -443,15 +437,14 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len)
/*---- Start load ----*/
/* Announce */
- printk(KERN_INFO "%s: loading firmware %s (ID=%u)...\n", modname,
- cfm->descr[0] ? cfm->descr : "unknown firmware",
- cfm->info.codeid);
+ pr_info("loading firmware %s (ID=%u)...\n",
+ cfm->descr[0] ? cfm->descr : "unknown firmware",
+ cfm->info.codeid);
for (i = 0 ; i < 5 ; i++) {
/* Reset Cyclom hardware */
if (!reset_cyc2x(hw->dpmbase)) {
- printk(KERN_ERR "%s: dpm problem or board not found\n",
- modname);
+ pr_err("dpm problem or board not found\n");
return -EINVAL;
}
@@ -468,19 +461,19 @@ static int load_cyc2x(struct cycx_hw *hw, struct cycx_firmware *cfm, u32 len)
msleep_interruptible(1 * 1000);
}
- printk(KERN_ERR "%s: reset not started.\n", modname);
+ pr_err("reset not started\n");
return -EINVAL;
reset_loaded:
/* Load data.bin */
if (cycx_data_boot(hw->dpmbase, data_image, img_hdr->data_size)) {
- printk(KERN_ERR "%s: cannot load data file.\n", modname);
+ pr_err("cannot load data file\n");
return -EINVAL;
}
/* Load code.bin */
if (cycx_code_boot(hw->dpmbase, code_image, img_hdr->code_size)) {
- printk(KERN_ERR "%s: cannot load code file.\n", modname);
+ pr_err("cannot load code file\n");
return -EINVAL;
}
@@ -493,7 +486,7 @@ reset_loaded:
/* Arthur Ganzert's tip: wait a while after the firmware loading...
seg abr 26 17:17:12 EST 1999 - acme */
msleep_interruptible(7 * 1000);
- printk(KERN_INFO "%s: firmware loaded!\n", modname);
+ pr_info("firmware loaded!\n");
/* enable interrupts */
cycx_inten(hw);
diff --git a/drivers/net/wan/cycx_main.c b/drivers/net/wan/cycx_main.c
index a0976d1..81fbbad 100644
--- a/drivers/net/wan/cycx_main.c
+++ b/drivers/net/wan/cycx_main.c
@@ -40,6 +40,8 @@
* 1998/08/08 acme Initial version.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/stddef.h> /* offsetof(), etc. */
#include <linux/errno.h> /* return codes */
#include <linux/string.h> /* inline memset(), etc. */
@@ -107,7 +109,7 @@ static int __init cycx_init(void)
{
int cnt, err = -ENOMEM;
- printk(KERN_INFO "%s v%u.%u %s\n",
+ pr_info("%s v%u.%u %s\n",
cycx_fullname, CYCX_DRV_VERSION, CYCX_DRV_RELEASE,
cycx_copyright);
@@ -133,9 +135,8 @@ static int __init cycx_init(void)
err = register_wan_device(wandev);
if (err) {
- printk(KERN_ERR "%s: %s registration failed with "
- "error %d!\n",
- cycx_drvname, card->devname, err);
+ pr_err("%s registration failed with error %d!\n",
+ card->devname, err);
break;
}
}
@@ -198,14 +199,13 @@ static int cycx_wan_setup(struct wan_device *wandev, wandev_conf_t *conf)
rc = -EINVAL;
if (!conf->data_size || !conf->data) {
- printk(KERN_ERR "%s: firmware not found in configuration "
- "data!\n", wandev->name);
+ pr_err("%s: firmware not found in configuration data!\n",
+ wandev->name);
goto out;
}
if (conf->irq <= 0) {
- printk(KERN_ERR "%s: can't configure without IRQ!\n",
- wandev->name);
+ pr_err("%s: can't configure without IRQ!\n", wandev->name);
goto out;
}
@@ -213,8 +213,7 @@ static int cycx_wan_setup(struct wan_device *wandev, wandev_conf_t *conf)
irq = conf->irq == 2 ? 9 : conf->irq; /* IRQ2 -> IRQ9 */
if (request_irq(irq, cycx_isr, 0, wandev->name, card)) {
- printk(KERN_ERR "%s: can't reserve IRQ %d!\n",
- wandev->name, irq);
+ pr_err("%s: can't reserve IRQ %d!\n", wandev->name, irq);
goto out;
}
@@ -246,8 +245,7 @@ static int cycx_wan_setup(struct wan_device *wandev, wandev_conf_t *conf)
break;
#endif
default:
- printk(KERN_ERR "%s: this firmware is not supported!\n",
- wandev->name);
+ pr_err("%s: this firmware is not supported!\n", wandev->name);
rc = -EINVAL;
}
@@ -288,8 +286,7 @@ static int cycx_wan_shutdown(struct wan_device *wandev)
card = wandev->private;
wandev->state = WAN_UNCONFIGURED;
cycx_down(&card->hw);
- printk(KERN_INFO "%s: irq %d being freed!\n", wandev->name,
- wandev->irq);
+ pr_info("%s: irq %d being freed!\n", wandev->name, wandev->irq);
free_irq(wandev->irq, card);
out: return ret;
}
@@ -308,8 +305,8 @@ static irqreturn_t cycx_isr(int irq, void *dev_id)
goto out;
if (card->in_isr) {
- printk(KERN_WARNING "%s: interrupt re-entrancy on IRQ %d!\n",
- card->devname, card->wandev.irq);
+ pr_warn("%s: interrupt re-entrancy on IRQ %d!\n",
+ card->devname, card->wandev.irq);
goto out;
}
@@ -337,7 +334,7 @@ void cycx_set_state(struct cycx_device *card, int state)
string_state = "disconnected!";
break;
}
- printk(KERN_INFO "%s: link %s\n", card->devname, string_state);
+ pr_info("%s: link %s\n", card->devname, string_state);
card->wandev.state = state;
}
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index cf9e15f..06f3f63 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -76,6 +76,8 @@
* 1998/08/08 acme Initial version.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#define CYCLOMX_X25_DEBUG 1
#include <linux/ctype.h> /* isdigit() */
@@ -230,8 +232,8 @@ int cycx_x25_wan_init(struct cycx_device *card, wandev_conf_t *conf)
/* Verify configuration ID */
if (conf->config_id != WANCONFIG_X25) {
- printk(KERN_INFO "%s: invalid configuration ID %u!\n",
- card->devname, conf->config_id);
+ pr_info("%s: invalid configuration ID %u!\n",
+ card->devname, conf->config_id);
return -EINVAL;
}
@@ -374,8 +376,7 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev,
int err = 0;
if (!conf->name[0] || strlen(conf->name) > WAN_IFNAME_SZ) {
- printk(KERN_INFO "%s: invalid interface name!\n",
- card->devname);
+ pr_info("%s: invalid interface name!\n", card->devname);
return -EINVAL;
}
@@ -398,8 +399,8 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev,
if (len) {
if (len > WAN_ADDRESS_SZ) {
- printk(KERN_ERR "%s: %s local addr too long!\n",
- wandev->name, chan->name);
+ pr_err("%s: %s local addr too long!\n",
+ wandev->name, chan->name);
err = -EINVAL;
goto error;
} else {
@@ -429,15 +430,14 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev,
if (lcn >= card->u.x.lo_pvc && lcn <= card->u.x.hi_pvc)
chan->lcn = lcn;
else {
- printk(KERN_ERR
- "%s: PVC %u is out of range on interface %s!\n",
- wandev->name, lcn, chan->name);
+ pr_err("%s: PVC %u is out of range on interface %s!\n",
+ wandev->name, lcn, chan->name);
err = -EINVAL;
goto error;
}
} else {
- printk(KERN_ERR "%s: invalid media address on interface %s!\n",
- wandev->name, chan->name);
+ pr_err("%s: invalid media address on interface %s!\n",
+ wandev->name, chan->name);
err = -EINVAL;
goto error;
}
@@ -607,9 +607,8 @@ static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
++chan->ifstats.tx_dropped;
else if (chan->svc && chan->protocol &&
chan->protocol != ntohs(skb->protocol)) {
- printk(KERN_INFO
- "%s: unsupported Ethertype 0x%04X on interface %s!\n",
- card->devname, ntohs(skb->protocol), dev->name);
+ pr_info("%s: unsupported Ethertype 0x%04X on interface %s!\n",
+ card->devname, ntohs(skb->protocol), dev->name);
++chan->ifstats.tx_errors;
} else if (chan->protocol == ETH_P_IP) {
switch (chan->state) {
@@ -643,9 +642,8 @@ static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
cycx_x25_chan_disconnect(dev);
goto free_packet;
default:
- printk(KERN_INFO
- "%s: unknown %d x25-iface request on %s!\n",
- card->devname, skb->data[0], dev->name);
+ pr_info("%s: unknown %d x25-iface request on %s!\n",
+ card->devname, skb->data[0], dev->name);
++chan->ifstats.tx_errors;
goto free_packet;
}
@@ -746,8 +744,7 @@ static void cycx_x25_irq_tx(struct cycx_device *card, struct cycx_x25_cmd *cmd)
card->buff_int_mode_unbusy = 1;
netif_wake_queue(dev);
} else
- printk(KERN_ERR "%s:ackvc for inexistent lcn %d\n",
- card->devname, lcn);
+ pr_err("%s:ackvc for inexistent lcn %d\n", card->devname, lcn);
}
/* Receive interrupt handler.
@@ -780,8 +777,8 @@ static void cycx_x25_irq_rx(struct cycx_device *card, struct cycx_x25_cmd *cmd)
dev = cycx_x25_get_dev_by_lcn(wandev, lcn);
if (!dev) {
/* Invalid channel, discard packet */
- printk(KERN_INFO "%s: receiving on orphaned LCN %d!\n",
- card->devname, lcn);
+ pr_info("%s: receiving on orphaned LCN %d!\n",
+ card->devname, lcn);
return;
}
@@ -802,8 +799,8 @@ static void cycx_x25_irq_rx(struct cycx_device *card, struct cycx_x25_cmd *cmd)
if ((skb = dev_alloc_skb((chan->protocol == ETH_P_X25 ? 1 : 0) +
bufsize +
dev->hard_header_len)) == NULL) {
- printk(KERN_INFO "%s: no socket buffers available!\n",
- card->devname);
+ pr_info("%s: no socket buffers available!\n",
+ card->devname);
chan->drop_sequence = 1;
++chan->ifstats.rx_dropped;
return;
@@ -826,8 +823,8 @@ static void cycx_x25_irq_rx(struct cycx_device *card, struct cycx_x25_cmd *cmd)
if (bitm)
chan->drop_sequence = 1;
- printk(KERN_INFO "%s: unexpectedly long packet sequence "
- "on interface %s!\n", card->devname, dev->name);
+ pr_info("%s: unexpectedly long packet sequence on interface %s!\n",
+ card->devname, dev->name);
++chan->ifstats.rx_length_errors;
return;
}
@@ -880,8 +877,8 @@ static void cycx_x25_irq_connect(struct cycx_device *card,
dev = cycx_x25_get_dev_by_dte_addr(wandev, rem);
if (!dev) {
/* Invalid channel, discard packet */
- printk(KERN_INFO "%s: connect not expected: remote %s!\n",
- card->devname, rem);
+ pr_info("%s: connect not expected: remote %s!\n",
+ card->devname, rem);
return;
}
@@ -909,8 +906,8 @@ static void cycx_x25_irq_connect_confirm(struct cycx_device *card,
if (!dev) {
/* Invalid channel, discard packet */
clear_bit(--key, (void*)&card->u.x.connection_keys);
- printk(KERN_INFO "%s: connect confirm not expected: lcn %d, "
- "key=%d!\n", card->devname, lcn, key);
+ pr_info("%s: connect confirm not expected: lcn %d, key=%d!\n",
+ card->devname, lcn, key);
return;
}
@@ -934,8 +931,8 @@ static void cycx_x25_irq_disconnect_confirm(struct cycx_device *card,
dev = cycx_x25_get_dev_by_lcn(wandev, lcn);
if (!dev) {
/* Invalid channel, discard packet */
- printk(KERN_INFO "%s:disconnect confirm not expected!:lcn %d\n",
- card->devname, lcn);
+ pr_info("%s:disconnect confirm not expected!:lcn %d\n",
+ card->devname, lcn);
return;
}
@@ -980,13 +977,13 @@ static void cycx_x25_irq_log(struct cycx_device *card, struct cycx_x25_cmd *cmd)
cycx_peek(&card->hw, cmd->buf + 10 + toread, &code, 1);
cycx_peek(&card->hw, cmd->buf + 10 + toread + 1, &routine, 1);
- printk(KERN_INFO "cycx_x25_irq_handler: X25_LOG (0x4500) indic.:\n");
- printk(KERN_INFO "cmd->buf=0x%X\n", cmd->buf);
- printk(KERN_INFO "Log message code=0x%X\n", msg_code);
- printk(KERN_INFO "Link=%d\n", link);
- printk(KERN_INFO "log code=0x%X\n", code);
- printk(KERN_INFO "log routine=0x%X\n", routine);
- printk(KERN_INFO "Message size=%d\n", size);
+ pr_info("cycx_x25_irq_handler: X25_LOG (0x4500) indic.:\n");
+ pr_info("cmd->buf=0x%X\n", cmd->buf);
+ pr_info("Log message code=0x%X\n", msg_code);
+ pr_info("Link=%d\n", link);
+ pr_info("log code=0x%X\n", code);
+ pr_info("log routine=0x%X\n", routine);
+ pr_info("Message size=%d\n", size);
hex_dump("Message", bf, toread);
#endif
}
@@ -1009,24 +1006,14 @@ static void cycx_x25_irq_stat(struct cycx_device *card,
static void cycx_x25_irq_spurious(struct cycx_device *card,
struct cycx_x25_cmd *cmd)
{
- printk(KERN_INFO "%s: spurious interrupt (0x%X)!\n",
- card->devname, cmd->command);
+ pr_info("%s: spurious interrupt (0x%X)!\n",
+ card->devname, cmd->command);
}
#ifdef CYCLOMX_X25_DEBUG
static void hex_dump(char *msg, unsigned char *p, int len)
{
- unsigned char hex[1024],
- * phex = hex;
-
- if (len >= (sizeof(hex) / 2))
- len = (sizeof(hex) / 2) - 1;
-
- while (len--) {
- sprintf(phex, "%02x", *p++);
- phex += 2;
- }
-
- printk(KERN_INFO "%s: %s\n", msg, hex);
+ print_hex_dump(KERN_INFO, msg, DUMP_PREFIX_OFFSET, 16, 1,
+ p, len, true);
}
#endif
@@ -1203,8 +1190,8 @@ static int x25_place_call(struct cycx_device *card,
u8 key;
if (card->u.x.connection_keys == ~0U) {
- printk(KERN_INFO "%s: too many simultaneous connection "
- "requests!\n", card->devname);
+ pr_info("%s: too many simultaneous connection requests!\n",
+ card->devname);
return -EAGAIN;
}
@@ -1381,8 +1368,8 @@ static void cycx_x25_chan_timer(unsigned long d)
if (chan->state == WAN_CONNECTED)
cycx_x25_chan_disconnect(dev);
else
- printk(KERN_ERR "%s: %s for svc (%s) not connected!\n",
- chan->card->devname, __func__, dev->name);
+ pr_err("%s: %s for svc (%s) not connected!\n",
+ chan->card->devname, __func__, dev->name);
}
/* Set logical channel state. */
@@ -1433,8 +1420,8 @@ static void cycx_x25_set_chan_state(struct net_device *dev, u8 state)
break;
}
- printk(KERN_INFO "%s: interface %s %s\n", card->devname,
- dev->name, string_state);
+ pr_info("%s: interface %s %s\n",
+ card->devname, dev->name, string_state);
chan->state = state;
}
@@ -1488,7 +1475,7 @@ static void cycx_x25_chan_send_event(struct net_device *dev, u8 event)
unsigned char *ptr;
if ((skb = dev_alloc_skb(1)) == NULL) {
- printk(KERN_ERR "%s: out of memory\n", __func__);
+ pr_err("%s: out of memory\n", __func__);
return;
}
@@ -1557,56 +1544,56 @@ static void reset_timer(struct net_device *dev)
#ifdef CYCLOMX_X25_DEBUG
static void cycx_x25_dump_config(struct cycx_x25_config *conf)
{
- printk(KERN_INFO "X.25 configuration\n");
- printk(KERN_INFO "-----------------\n");
- printk(KERN_INFO "link number=%d\n", conf->link);
- printk(KERN_INFO "line speed=%d\n", conf->speed);
- printk(KERN_INFO "clock=%sternal\n", conf->clock == 8 ? "Ex" : "In");
- printk(KERN_INFO "# level 2 retransm.=%d\n", conf->n2);
- printk(KERN_INFO "level 2 window=%d\n", conf->n2win);
- printk(KERN_INFO "level 3 window=%d\n", conf->n3win);
- printk(KERN_INFO "# logical channels=%d\n", conf->nvc);
- printk(KERN_INFO "level 3 pkt len=%d\n", conf->pktlen);
- printk(KERN_INFO "my address=%d\n", conf->locaddr);
- printk(KERN_INFO "remote address=%d\n", conf->remaddr);
- printk(KERN_INFO "t1=%d seconds\n", conf->t1);
- printk(KERN_INFO "t2=%d seconds\n", conf->t2);
- printk(KERN_INFO "t21=%d seconds\n", conf->t21);
- printk(KERN_INFO "# PVCs=%d\n", conf->npvc);
- printk(KERN_INFO "t23=%d seconds\n", conf->t23);
- printk(KERN_INFO "flags=0x%x\n", conf->flags);
+ pr_info("X.25 configuration\n");
+ pr_info("-----------------\n");
+ pr_info("link number=%d\n", conf->link);
+ pr_info("line speed=%d\n", conf->speed);
+ pr_info("clock=%sternal\n", conf->clock == 8 ? "Ex" : "In");
+ pr_info("# level 2 retransm.=%d\n", conf->n2);
+ pr_info("level 2 window=%d\n", conf->n2win);
+ pr_info("level 3 window=%d\n", conf->n3win);
+ pr_info("# logical channels=%d\n", conf->nvc);
+ pr_info("level 3 pkt len=%d\n", conf->pktlen);
+ pr_info("my address=%d\n", conf->locaddr);
+ pr_info("remote address=%d\n", conf->remaddr);
+ pr_info("t1=%d seconds\n", conf->t1);
+ pr_info("t2=%d seconds\n", conf->t2);
+ pr_info("t21=%d seconds\n", conf->t21);
+ pr_info("# PVCs=%d\n", conf->npvc);
+ pr_info("t23=%d seconds\n", conf->t23);
+ pr_info("flags=0x%x\n", conf->flags);
}
static void cycx_x25_dump_stats(struct cycx_x25_stats *stats)
{
- printk(KERN_INFO "X.25 statistics\n");
- printk(KERN_INFO "--------------\n");
- printk(KERN_INFO "rx_crc_errors=%d\n", stats->rx_crc_errors);
- printk(KERN_INFO "rx_over_errors=%d\n", stats->rx_over_errors);
- printk(KERN_INFO "n2_tx_frames=%d\n", stats->n2_tx_frames);
- printk(KERN_INFO "n2_rx_frames=%d\n", stats->n2_rx_frames);
- printk(KERN_INFO "tx_timeouts=%d\n", stats->tx_timeouts);
- printk(KERN_INFO "rx_timeouts=%d\n", stats->rx_timeouts);
- printk(KERN_INFO "n3_tx_packets=%d\n", stats->n3_tx_packets);
- printk(KERN_INFO "n3_rx_packets=%d\n", stats->n3_rx_packets);
- printk(KERN_INFO "tx_aborts=%d\n", stats->tx_aborts);
- printk(KERN_INFO "rx_aborts=%d\n", stats->rx_aborts);
+ pr_info("X.25 statistics\n");
+ pr_info("--------------\n");
+ pr_info("rx_crc_errors=%d\n", stats->rx_crc_errors);
+ pr_info("rx_over_errors=%d\n", stats->rx_over_errors);
+ pr_info("n2_tx_frames=%d\n", stats->n2_tx_frames);
+ pr_info("n2_rx_frames=%d\n", stats->n2_rx_frames);
+ pr_info("tx_timeouts=%d\n", stats->tx_timeouts);
+ pr_info("rx_timeouts=%d\n", stats->rx_timeouts);
+ pr_info("n3_tx_packets=%d\n", stats->n3_tx_packets);
+ pr_info("n3_rx_packets=%d\n", stats->n3_rx_packets);
+ pr_info("tx_aborts=%d\n", stats->tx_aborts);
+ pr_info("rx_aborts=%d\n", stats->rx_aborts);
}
static void cycx_x25_dump_devs(struct wan_device *wandev)
{
struct net_device *dev = wandev->dev;
- printk(KERN_INFO "X.25 dev states\n");
- printk(KERN_INFO "name: addr: txoff: protocol:\n");
- printk(KERN_INFO "---------------------------------------\n");
+ pr_info("X.25 dev states\n");
+ pr_info("name: addr: txoff: protocol:\n");
+ pr_info("---------------------------------------\n");
while(dev) {
struct cycx_x25_channel *chan = netdev_priv(dev);
- printk(KERN_INFO "%-5.5s %-15.15s %d ETH_P_%s\n",
- chan->name, chan->addr, netif_queue_stopped(dev),
- chan->protocol == ETH_P_IP ? "IP" : "X25");
+ pr_info("%-5.5s %-15.15s %d ETH_P_%s\n",
+ chan->name, chan->addr, netif_queue_stopped(dev),
+ chan->protocol == ETH_P_IP ? "IP" : "X25");
dev = chan->slave;
}
}
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 2/8] cosa: Update to current logging forms
From: Joe Perches @ 2011-06-27 5:01 UTC (permalink / raw)
To: netdev, Jan "Yenya" Kasprzak; +Cc: linux-kernel
In-Reply-To: <cover.1309150683.git.joe@perches.com>
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/cosa.c | 226 ++++++++++++++++++++++-------------------------
1 files changed, 106 insertions(+), 120 deletions(-)
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 6fb6f8e..6aed238 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -74,6 +74,8 @@
* The Sync PPP/Cisco HDLC layer (syncppp.c) ported to Linux by Alan Cox
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
@@ -361,14 +363,13 @@ static int __init cosa_init(void)
if (cosa_major > 0) {
if (register_chrdev(cosa_major, "cosa", &cosa_fops)) {
- printk(KERN_WARNING "cosa: unable to get major %d\n",
- cosa_major);
+ pr_warn("unable to get major %d\n", cosa_major);
err = -EIO;
goto out;
}
} else {
if (!(cosa_major=register_chrdev(0, "cosa", &cosa_fops))) {
- printk(KERN_WARNING "cosa: unable to register chardev\n");
+ pr_warn("unable to register chardev\n");
err = -EIO;
goto out;
}
@@ -378,7 +379,7 @@ static int __init cosa_init(void)
for (i=0; io[i] != 0 && i < MAX_CARDS; i++)
cosa_probe(io[i], irq[i], dma[i]);
if (!nr_cards) {
- printk(KERN_WARNING "cosa: no devices found.\n");
+ pr_warn("no devices found\n");
unregister_chrdev(cosa_major, "cosa");
err = -ENODEV;
goto out;
@@ -447,26 +448,25 @@ static int cosa_probe(int base, int irq, int dma)
/* Checking validity of parameters: */
/* IRQ should be 2-7 or 10-15; negative IRQ means autoprobe */
if ((irq >= 0 && irq < 2) || irq > 15 || (irq < 10 && irq > 7)) {
- printk (KERN_INFO "cosa_probe: invalid IRQ %d\n", irq);
+ pr_info("invalid IRQ %d\n", irq);
return -1;
}
/* I/O address should be between 0x100 and 0x3ff and should be
* multiple of 8. */
if (base < 0x100 || base > 0x3ff || base & 0x7) {
- printk (KERN_INFO "cosa_probe: invalid I/O address 0x%x\n",
- base);
+ pr_info("invalid I/O address 0x%x\n", base);
return -1;
}
/* DMA should be 0,1 or 3-7 */
if (dma < 0 || dma == 4 || dma > 7) {
- printk (KERN_INFO "cosa_probe: invalid DMA %d\n", dma);
+ pr_info("invalid DMA %d\n", dma);
return -1;
}
/* and finally, on 16-bit COSA DMA should be 4-7 and
* I/O base should not be multiple of 0x10 */
if (((base & 0x8) && dma < 4) || (!(base & 0x8) && dma > 3)) {
- printk (KERN_INFO "cosa_probe: 8/16 bit base and DMA mismatch"
- " (base=0x%x, dma=%d)\n", base, dma);
+ pr_info("8/16 bit base and DMA mismatch (base=0x%x, dma=%d)\n",
+ base, dma);
return -1;
}
@@ -479,7 +479,7 @@ static int cosa_probe(int base, int irq, int dma)
return -1;
if (cosa_reset_and_read_id(cosa, cosa->id_string) < 0) {
- printk(KERN_DEBUG "cosa: probe at 0x%x failed.\n", base);
+ printk(KERN_DEBUG "probe at 0x%x failed.\n", base);
err = -1;
goto err_out;
}
@@ -492,8 +492,7 @@ static int cosa_probe(int base, int irq, int dma)
else {
/* Print a warning only if we are not autoprobing */
#ifndef COSA_ISA_AUTOPROBE
- printk(KERN_INFO "cosa: valid signature not found at 0x%x.\n",
- base);
+ pr_info("valid signature not found at 0x%x\n", base);
#endif
err = -1;
goto err_out;
@@ -501,14 +500,14 @@ static int cosa_probe(int base, int irq, int dma)
/* Update the name of the region now we know the type of card */
release_region(base, is_8bit(cosa)?2:4);
if (!request_region(base, is_8bit(cosa)?2:4, cosa->type)) {
- printk(KERN_DEBUG "cosa: changing name at 0x%x failed.\n", base);
+ printk(KERN_DEBUG "changing name at 0x%x failed.\n", base);
return -1;
}
/* Now do IRQ autoprobe */
if (irq < 0) {
unsigned long irqs;
-/* printk(KERN_INFO "IRQ autoprobe\n"); */
+/* pr_info("IRQ autoprobe\n"); */
irqs = probe_irq_on();
/*
* Enable interrupt on tx buffer empty (it sure is)
@@ -526,13 +525,13 @@ static int cosa_probe(int base, int irq, int dma)
cosa_getdata8(cosa);
if (irq < 0) {
- printk (KERN_INFO "cosa IRQ autoprobe: multiple interrupts obtained (%d, board at 0x%x)\n",
+ pr_info("multiple interrupts obtained (%d, board at 0x%x)\n",
irq, cosa->datareg);
err = -1;
goto err_out;
}
if (irq == 0) {
- printk (KERN_INFO "cosa IRQ autoprobe: no interrupt obtained (board at 0x%x)\n",
+ pr_info("no interrupt obtained (board at 0x%x)\n",
cosa->datareg);
/* return -1; */
}
@@ -579,8 +578,7 @@ static int cosa_probe(int base, int irq, int dma)
/* Register the network interface */
if (!(chan->netdev = alloc_hdlcdev(chan))) {
- printk(KERN_WARNING "%s: alloc_hdlcdev failed.\n",
- chan->name);
+ pr_warn("%s: alloc_hdlcdev failed\n", chan->name);
goto err_hdlcdev;
}
dev_to_hdlc(chan->netdev)->attach = cosa_net_attach;
@@ -591,14 +589,14 @@ static int cosa_probe(int base, int irq, int dma)
chan->netdev->irq = chan->cosa->irq;
chan->netdev->dma = chan->cosa->dma;
if (register_hdlc_device(chan->netdev)) {
- printk(KERN_WARNING "%s: register_hdlc_device()"
- " failed.\n", chan->netdev->name);
+ netdev_warn(chan->netdev,
+ "register_hdlc_device() failed\n");
free_netdev(chan->netdev);
goto err_hdlcdev;
}
}
- printk (KERN_INFO "cosa%d: %s (%s at 0x%x irq %d dma %d), %d channels\n",
+ pr_info("cosa%d: %s (%s at 0x%x irq %d dma %d), %d channels\n",
cosa->num, cosa->id_string, cosa->type,
cosa->datareg, cosa->irq, cosa->dma, cosa->nchannels);
@@ -618,8 +616,7 @@ err_out1:
free_irq(cosa->irq, cosa);
err_out:
release_region(cosa->datareg,is_8bit(cosa)?2:4);
- printk(KERN_NOTICE "cosa%d: allocating resources failed\n",
- cosa->num);
+ pr_notice("cosa%d: allocating resources failed\n", cosa->num);
return err;
}
@@ -641,14 +638,14 @@ static int cosa_net_open(struct net_device *dev)
unsigned long flags;
if (!(chan->cosa->firmware_status & COSA_FW_START)) {
- printk(KERN_NOTICE "%s: start the firmware first (status %d)\n",
- chan->cosa->name, chan->cosa->firmware_status);
+ pr_notice("%s: start the firmware first (status %d)\n",
+ chan->cosa->name, chan->cosa->firmware_status);
return -EPERM;
}
spin_lock_irqsave(&chan->cosa->lock, flags);
if (chan->usage != 0) {
- printk(KERN_WARNING "%s: cosa_net_open called with usage count"
- " %d\n", chan->name, chan->usage);
+ pr_warn("%s: cosa_net_open called with usage count %d\n",
+ chan->name, chan->usage);
spin_unlock_irqrestore(&chan->cosa->lock, flags);
return -EBUSY;
}
@@ -736,8 +733,7 @@ static char *cosa_net_setup_rx(struct channel_data *chan, int size)
kfree_skb(chan->rx_skb);
chan->rx_skb = dev_alloc_skb(size);
if (chan->rx_skb == NULL) {
- printk(KERN_NOTICE "%s: Memory squeeze, dropping packet\n",
- chan->name);
+ pr_notice("%s: Memory squeeze, dropping packet\n", chan->name);
chan->netdev->stats.rx_dropped++;
return NULL;
}
@@ -748,8 +744,7 @@ static char *cosa_net_setup_rx(struct channel_data *chan, int size)
static int cosa_net_rx_done(struct channel_data *chan)
{
if (!chan->rx_skb) {
- printk(KERN_WARNING "%s: rx_done with empty skb!\n",
- chan->name);
+ pr_warn("%s: rx_done with empty skb!\n", chan->name);
chan->netdev->stats.rx_errors++;
chan->netdev->stats.rx_frame_errors++;
return 0;
@@ -768,8 +763,7 @@ static int cosa_net_rx_done(struct channel_data *chan)
static int cosa_net_tx_done(struct channel_data *chan, int size)
{
if (!chan->tx_skb) {
- printk(KERN_WARNING "%s: tx_done with empty skb!\n",
- chan->name);
+ pr_warn("%s: tx_done with empty skb!\n", chan->name);
chan->netdev->stats.tx_errors++;
chan->netdev->stats.tx_aborted_errors++;
return 1;
@@ -794,15 +788,15 @@ static ssize_t cosa_read(struct file *file,
char *kbuf;
if (!(cosa->firmware_status & COSA_FW_START)) {
- printk(KERN_NOTICE "%s: start the firmware first (status %d)\n",
- cosa->name, cosa->firmware_status);
+ pr_notice("%s: start the firmware first (status %d)\n",
+ cosa->name, cosa->firmware_status);
return -EPERM;
}
if (mutex_lock_interruptible(&chan->rlock))
return -ERESTARTSYS;
if ((chan->rxdata = kmalloc(COSA_MTU, GFP_DMA|GFP_KERNEL)) == NULL) {
- printk(KERN_INFO "%s: cosa_read() - OOM\n", cosa->name);
+ pr_info("%s: cosa_read() - OOM\n", cosa->name);
mutex_unlock(&chan->rlock);
return -ENOMEM;
}
@@ -869,8 +863,8 @@ static ssize_t cosa_write(struct file *file,
char *kbuf;
if (!(cosa->firmware_status & COSA_FW_START)) {
- printk(KERN_NOTICE "%s: start the firmware first (status %d)\n",
- cosa->name, cosa->firmware_status);
+ pr_notice("%s: start the firmware first (status %d)\n",
+ cosa->name, cosa->firmware_status);
return -EPERM;
}
if (down_interruptible(&chan->wsem))
@@ -881,8 +875,8 @@ static ssize_t cosa_write(struct file *file,
/* Allocate the buffer */
if ((kbuf = kmalloc(count, GFP_KERNEL|GFP_DMA)) == NULL) {
- printk(KERN_NOTICE "%s: cosa_write() OOM - dropping packet\n",
- cosa->name);
+ pr_notice("%s: cosa_write() OOM - dropping packet\n",
+ cosa->name);
up(&chan->wsem);
return -ENOMEM;
}
@@ -932,7 +926,7 @@ static int chrdev_tx_done(struct channel_data *chan, int size)
static unsigned int cosa_poll(struct file *file, poll_table *poll)
{
- printk(KERN_INFO "cosa_poll is here\n");
+ pr_info("cosa_poll is here\n");
return 0;
}
@@ -1017,15 +1011,14 @@ static inline int cosa_reset(struct cosa_data *cosa)
{
char idstring[COSA_MAX_ID_STRING];
if (cosa->usage > 1)
- printk(KERN_INFO "cosa%d: WARNING: reset requested with cosa->usage > 1 (%d). Odd things may happen.\n",
+ pr_info("cosa%d: WARNING: reset requested with cosa->usage > 1 (%d). Odd things may happen.\n",
cosa->num, cosa->usage);
cosa->firmware_status &= ~(COSA_FW_RESET|COSA_FW_START);
if (cosa_reset_and_read_id(cosa, idstring) < 0) {
- printk(KERN_NOTICE "cosa%d: reset failed\n", cosa->num);
+ pr_notice("cosa%d: reset failed\n", cosa->num);
return -EIO;
}
- printk(KERN_INFO "cosa%d: resetting device: %s\n", cosa->num,
- idstring);
+ pr_info("cosa%d: resetting device: %s\n", cosa->num, idstring);
cosa->firmware_status |= COSA_FW_RESET;
return 0;
}
@@ -1037,11 +1030,11 @@ static inline int cosa_download(struct cosa_data *cosa, void __user *arg)
int i;
if (cosa->usage > 1)
- printk(KERN_INFO "%s: WARNING: download of microcode requested with cosa->usage > 1 (%d). Odd things may happen.\n",
+ pr_info("%s: WARNING: download of microcode requested with cosa->usage > 1 (%d). Odd things may happen.\n",
cosa->name, cosa->usage);
if (!(cosa->firmware_status & COSA_FW_RESET)) {
- printk(KERN_NOTICE "%s: reset the card first (status %d).\n",
- cosa->name, cosa->firmware_status);
+ pr_notice("%s: reset the card first (status %d)\n",
+ cosa->name, cosa->firmware_status);
return -EPERM;
}
@@ -1059,11 +1052,11 @@ static inline int cosa_download(struct cosa_data *cosa, void __user *arg)
i = download(cosa, d.code, d.len, d.addr);
if (i < 0) {
- printk(KERN_NOTICE "cosa%d: microcode download failed: %d\n",
- cosa->num, i);
+ pr_notice("cosa%d: microcode download failed: %d\n",
+ cosa->num, i);
return -EIO;
}
- printk(KERN_INFO "cosa%d: downloading microcode - 0x%04x bytes at 0x%04x\n",
+ pr_info("cosa%d: downloading microcode - 0x%04x bytes at 0x%04x\n",
cosa->num, d.len, d.addr);
cosa->firmware_status |= COSA_FW_RESET|COSA_FW_DOWNLOAD;
return 0;
@@ -1076,12 +1069,11 @@ static inline int cosa_readmem(struct cosa_data *cosa, void __user *arg)
int i;
if (cosa->usage > 1)
- printk(KERN_INFO "cosa%d: WARNING: readmem requested with "
- "cosa->usage > 1 (%d). Odd things may happen.\n",
+ pr_info("cosa%d: WARNING: readmem requested with cosa->usage > 1 (%d). Odd things may happen.\n",
cosa->num, cosa->usage);
if (!(cosa->firmware_status & COSA_FW_RESET)) {
- printk(KERN_NOTICE "%s: reset the card first (status %d).\n",
- cosa->name, cosa->firmware_status);
+ pr_notice("%s: reset the card first (status %d)\n",
+ cosa->name, cosa->firmware_status);
return -EPERM;
}
@@ -1093,11 +1085,10 @@ static inline int cosa_readmem(struct cosa_data *cosa, void __user *arg)
i = readmem(cosa, d.code, d.len, d.addr);
if (i < 0) {
- printk(KERN_NOTICE "cosa%d: reading memory failed: %d\n",
- cosa->num, i);
+ pr_notice("cosa%d: reading memory failed: %d\n", cosa->num, i);
return -EIO;
}
- printk(KERN_INFO "cosa%d: reading card memory - 0x%04x bytes at 0x%04x\n",
+ pr_info("cosa%d: reading card memory - 0x%04x bytes at 0x%04x\n",
cosa->num, d.len, d.addr);
cosa->firmware_status |= COSA_FW_RESET;
return 0;
@@ -1109,23 +1100,22 @@ static inline int cosa_start(struct cosa_data *cosa, int address)
int i;
if (cosa->usage > 1)
- printk(KERN_INFO "cosa%d: WARNING: start microcode requested with cosa->usage > 1 (%d). Odd things may happen.\n",
+ pr_info("cosa%d: WARNING: start microcode requested with cosa->usage > 1 (%d). Odd things may happen.\n",
cosa->num, cosa->usage);
if ((cosa->firmware_status & (COSA_FW_RESET|COSA_FW_DOWNLOAD))
!= (COSA_FW_RESET|COSA_FW_DOWNLOAD)) {
- printk(KERN_NOTICE "%s: download the microcode and/or reset the card first (status %d).\n",
- cosa->name, cosa->firmware_status);
+ pr_notice("%s: download the microcode and/or reset the card first (status %d)\n",
+ cosa->name, cosa->firmware_status);
return -EPERM;
}
cosa->firmware_status &= ~COSA_FW_RESET;
if ((i=startmicrocode(cosa, address)) < 0) {
- printk(KERN_NOTICE "cosa%d: start microcode at 0x%04x failed: %d\n",
- cosa->num, address, i);
+ pr_notice("cosa%d: start microcode at 0x%04x failed: %d\n",
+ cosa->num, address, i);
return -EIO;
}
- printk(KERN_INFO "cosa%d: starting microcode at 0x%04x\n",
- cosa->num, address);
+ pr_info("cosa%d: starting microcode at 0x%04x\n", cosa->num, address);
cosa->startaddr = address;
cosa->firmware_status |= COSA_FW_START;
return 0;
@@ -1255,11 +1245,11 @@ static int cosa_start_tx(struct channel_data *chan, char *buf, int len)
#ifdef DEBUG_DATA
int i;
- printk(KERN_INFO "cosa%dc%d: starting tx(0x%x)", chan->cosa->num,
- chan->num, len);
+ pr_info("cosa%dc%d: starting tx(0x%x)",
+ chan->cosa->num, chan->num, len);
for (i=0; i<len; i++)
- printk(" %02x", buf[i]&0xff);
- printk("\n");
+ pr_cont(" %02x", buf[i]&0xff);
+ pr_cont("\n");
#endif
spin_lock_irqsave(&cosa->lock, flags);
chan->txbuf = buf;
@@ -1353,7 +1343,7 @@ static void cosa_kick(struct cosa_data *cosa)
if (test_bit(TXBIT, &cosa->rxtx))
s = "TX DMA";
- printk(KERN_INFO "%s: %s timeout - restarting.\n", cosa->name, s);
+ pr_info("%s: %s timeout - restarting\n", cosa->name, s);
spin_lock_irqsave(&cosa->lock, flags);
cosa->rxtx = 0;
@@ -1387,7 +1377,7 @@ static int cosa_dma_able(struct channel_data *chan, char *buf, int len)
return 0;
if ((b^ (b+len)) & 0x10000) {
if (count++ < 5)
- printk(KERN_INFO "%s: packet spanning a 64k boundary\n",
+ pr_info("%s: packet spanning a 64k boundary\n",
chan->name);
return 0;
}
@@ -1498,8 +1488,7 @@ static int readmem(struct cosa_data *cosa, char __user *microcode, int length, i
char c;
int i;
if ((i=get_wait_data(cosa)) == -1) {
- printk (KERN_INFO "cosa: 0x%04x bytes remaining\n",
- length);
+ pr_info("0x%04x bytes remaining\n", length);
return -11;
}
c=i;
@@ -1582,14 +1571,15 @@ static int get_wait_data(struct cosa_data *cosa)
short r;
r = cosa_getdata8(cosa);
#if 0
- printk(KERN_INFO "cosa: get_wait_data returning after %d retries\n", 999-retries);
+ pr_info("get_wait_data returning after %d retries\n",
+ 999-retries);
#endif
return r;
}
/* sleep if not ready to read */
schedule_timeout_interruptible(1);
}
- printk(KERN_INFO "cosa: timeout in get_wait_data (status 0x%x)\n",
+ pr_info("timeout in get_wait_data (status 0x%x)\n",
cosa_getstatus(cosa));
return -1;
}
@@ -1607,7 +1597,7 @@ static int put_wait_data(struct cosa_data *cosa, int data)
if (cosa_getstatus(cosa) & SR_TX_RDY) {
cosa_putdata8(cosa, data);
#if 0
- printk(KERN_INFO "Putdata: %d retries\n", 999-retries);
+ pr_info("Putdata: %d retries\n", 999-retries);
#endif
return 0;
}
@@ -1616,7 +1606,7 @@ static int put_wait_data(struct cosa_data *cosa, int data)
schedule_timeout_interruptible(1);
#endif
}
- printk(KERN_INFO "cosa%d: timeout in put_wait_data (status 0x%x)\n",
+ pr_info("cosa%d: timeout in put_wait_data (status 0x%x)\n",
cosa->num, cosa_getstatus(cosa));
return -1;
}
@@ -1636,13 +1626,13 @@ static int puthexnumber(struct cosa_data *cosa, int number)
sprintf(temp, "%04X", number);
for (i=0; i<4; i++) {
if (put_wait_data(cosa, temp[i]) == -1) {
- printk(KERN_NOTICE "cosa%d: puthexnumber failed to write byte %d\n",
- cosa->num, i);
+ pr_notice("cosa%d: puthexnumber failed to write byte %d\n",
+ cosa->num, i);
return -1-2*i;
}
if (get_wait_data(cosa) != temp[i]) {
- printk(KERN_NOTICE "cosa%d: puthexhumber failed to read echo of byte %d\n",
- cosa->num, i);
+ pr_notice("cosa%d: puthexhumber failed to read echo of byte %d\n",
+ cosa->num, i);
return -2-2*i;
}
}
@@ -1687,8 +1677,7 @@ static inline void tx_interrupt(struct cosa_data *cosa, int status)
{
unsigned long flags, flags1;
#ifdef DEBUG_IRQS
- printk(KERN_INFO "cosa%d: SR_DOWN_REQUEST status=0x%04x\n",
- cosa->num, status);
+ pr_info("cosa%d: SR_DOWN_REQUEST status=0x%04x\n", cosa->num, status);
#endif
spin_lock_irqsave(&cosa->lock, flags);
set_bit(TXBIT, &cosa->rxtx);
@@ -1696,8 +1685,7 @@ static inline void tx_interrupt(struct cosa_data *cosa, int status)
/* flow control, see the comment above */
int i=0;
if (!cosa->txbitmap) {
- printk(KERN_WARNING "%s: No channel wants data "
- "in TX IRQ. Expect DMA timeout.",
+ pr_warn("%s: No channel wants data in TX IRQ. Expect DMA timeout.\n",
cosa->name);
put_driver_status_nolock(cosa);
clear_bit(TXBIT, &cosa->rxtx);
@@ -1780,14 +1768,14 @@ static inline void tx_interrupt(struct cosa_data *cosa, int status)
if (cosa->busmaster) {
unsigned long addr = virt_to_bus(cosa->txbuf);
int count=0;
- printk(KERN_INFO "busmaster IRQ\n");
+ pr_info("busmaster IRQ\n");
while (!(cosa_getstatus(cosa)&SR_TX_RDY)) {
count++;
udelay(10);
if (count > 1000) break;
}
- printk(KERN_INFO "status %x\n", cosa_getstatus(cosa));
- printk(KERN_INFO "ready after %d loops\n", count);
+ pr_info("status %x\n", cosa_getstatus(cosa));
+ pr_info("ready after %d loops\n", count);
cosa_putdata16(cosa, (addr >> 16)&0xffff);
count = 0;
@@ -1796,7 +1784,7 @@ static inline void tx_interrupt(struct cosa_data *cosa, int status)
if (count > 1000) break;
udelay(10);
}
- printk(KERN_INFO "ready after %d loops\n", count);
+ pr_info("ready after %d loops\n", count);
cosa_putdata16(cosa, addr &0xffff);
flags1 = claim_dma_lock();
set_dma_mode(cosa->dma, DMA_MODE_CASCADE);
@@ -1824,7 +1812,7 @@ static inline void rx_interrupt(struct cosa_data *cosa, int status)
{
unsigned long flags;
#ifdef DEBUG_IRQS
- printk(KERN_INFO "cosa%d: SR_UP_REQUEST\n", cosa->num);
+ pr_info("cosa%d: SR_UP_REQUEST\n", cosa->num);
#endif
spin_lock_irqsave(&cosa->lock, flags);
@@ -1847,7 +1835,7 @@ static inline void rx_interrupt(struct cosa_data *cosa, int status)
debug_data_in(cosa, cosa->rxsize & 0xff);
#endif
#if 0
- printk(KERN_INFO "cosa%d: receive rxsize = (0x%04x).\n",
+ pr_info("cosa%d: receive rxsize = (0x%04x)\n",
cosa->num, cosa->rxsize);
#endif
}
@@ -1857,12 +1845,12 @@ static inline void rx_interrupt(struct cosa_data *cosa, int status)
debug_data_in(cosa, cosa->rxsize);
#endif
#if 0
- printk(KERN_INFO "cosa%d: receive rxsize = (0x%04x).\n",
+ pr_info("cosa%d: receive rxsize = (0x%04x)\n",
cosa->num, cosa->rxsize);
#endif
}
if (((cosa->rxsize & 0xe000) >> 13) >= cosa->nchannels) {
- printk(KERN_WARNING "%s: rx for unknown channel (0x%04x)\n",
+ pr_warn("%s: rx for unknown channel (0x%04x)\n",
cosa->name, cosa->rxsize);
spin_unlock_irqrestore(&cosa->lock, flags);
goto reject;
@@ -1877,7 +1865,7 @@ static inline void rx_interrupt(struct cosa_data *cosa, int status)
if (!cosa->rxbuf) {
reject: /* Reject the packet */
- printk(KERN_INFO "cosa%d: rejecting packet on channel %d\n",
+ pr_info("cosa%d: rejecting packet on channel %d\n",
cosa->num, cosa->rxchan->num);
cosa->rxbuf = cosa->bouncebuf;
}
@@ -1924,11 +1912,11 @@ static inline void eot_interrupt(struct cosa_data *cosa, int status)
#ifdef DEBUG_DATA
{
int i;
- printk(KERN_INFO "cosa%dc%d: done rx(0x%x)", cosa->num,
- cosa->rxchan->num, cosa->rxsize);
+ pr_info("cosa%dc%d: done rx(0x%x)",
+ cosa->num, cosa->rxchan->num, cosa->rxsize);
for (i=0; i<cosa->rxsize; i++)
- printk (" %02x", cosa->rxbuf[i]&0xff);
- printk("\n");
+ pr_cont(" %02x", cosa->rxbuf[i]&0xff);
+ pr_cont("\n");
}
#endif
/* Packet for unknown channel? */
@@ -1940,8 +1928,7 @@ static inline void eot_interrupt(struct cosa_data *cosa, int status)
if (cosa->rxchan->rx_done(cosa->rxchan))
clear_bit(cosa->rxchan->num, &cosa->rxbitmap);
} else {
- printk(KERN_NOTICE "cosa%d: unexpected EOT interrupt\n",
- cosa->num);
+ pr_notice("cosa%d: unexpected EOT interrupt\n", cosa->num);
}
/*
* Clear the RXBIT, TXBIT and IRQBIT (the latest should be
@@ -1963,8 +1950,7 @@ static irqreturn_t cosa_interrupt(int irq, void *cosa_)
again:
status = cosa_getstatus(cosa);
#ifdef DEBUG_IRQS
- printk(KERN_INFO "cosa%d: got IRQ, status 0x%02x\n", cosa->num,
- status & 0xff);
+ pr_info("cosa%d: got IRQ, status 0x%02x\n", cosa->num, status & 0xff);
#endif
#ifdef DEBUG_IO
debug_status_in(cosa, status);
@@ -1985,15 +1971,15 @@ again:
udelay(100);
goto again;
}
- printk(KERN_INFO "cosa%d: unknown status 0x%02x in IRQ after %d retries\n",
+ pr_info("cosa%d: unknown status 0x%02x in IRQ after %d retries\n",
cosa->num, status & 0xff, count);
}
#ifdef DEBUG_IRQS
if (count)
- printk(KERN_INFO "%s: %d-times got unknown status in IRQ\n",
+ pr_info("%s: %d-times got unknown status in IRQ\n",
cosa->name, count);
else
- printk(KERN_INFO "%s: returning from IRQ\n", cosa->name);
+ pr_info("%s: returning from IRQ\n", cosa->name);
#endif
return IRQ_HANDLED;
}
@@ -2024,41 +2010,41 @@ static void debug_status_in(struct cosa_data *cosa, int status)
s = "NO_REQ";
break;
}
- printk(KERN_INFO "%s: IO: status -> 0x%02x (%s%s%s%s)\n",
+ pr_info("%s: IO: status -> 0x%02x (%s%s%s%s)\n",
cosa->name,
status,
- status & SR_USR_RQ ? "USR_RQ|":"",
- status & SR_TX_RDY ? "TX_RDY|":"",
- status & SR_RX_RDY ? "RX_RDY|":"",
+ status & SR_USR_RQ ? "USR_RQ|" : "",
+ status & SR_TX_RDY ? "TX_RDY|" : "",
+ status & SR_RX_RDY ? "RX_RDY|" : "",
s);
}
static void debug_status_out(struct cosa_data *cosa, int status)
{
- printk(KERN_INFO "%s: IO: status <- 0x%02x (%s%s%s%s%s%s)\n",
+ pr_info("%s: IO: status <- 0x%02x (%s%s%s%s%s%s)\n",
cosa->name,
status,
- status & SR_RX_DMA_ENA ? "RXDMA|":"!rxdma|",
- status & SR_TX_DMA_ENA ? "TXDMA|":"!txdma|",
- status & SR_RST ? "RESET|":"",
- status & SR_USR_INT_ENA ? "USRINT|":"!usrint|",
- status & SR_TX_INT_ENA ? "TXINT|":"!txint|",
- status & SR_RX_INT_ENA ? "RXINT":"!rxint");
+ status & SR_RX_DMA_ENA ? "RXDMA|" : "!rxdma|",
+ status & SR_TX_DMA_ENA ? "TXDMA|" : "!txdma|",
+ status & SR_RST ? "RESET|" : "",
+ status & SR_USR_INT_ENA ? "USRINT|" : "!usrint|",
+ status & SR_TX_INT_ENA ? "TXINT|" : "!txint|",
+ status & SR_RX_INT_ENA ? "RXINT" : "!rxint");
}
static void debug_data_in(struct cosa_data *cosa, int data)
{
- printk(KERN_INFO "%s: IO: data -> 0x%04x\n", cosa->name, data);
+ pr_info("%s: IO: data -> 0x%04x\n", cosa->name, data);
}
static void debug_data_out(struct cosa_data *cosa, int data)
{
- printk(KERN_INFO "%s: IO: data <- 0x%04x\n", cosa->name, data);
+ pr_info("%s: IO: data <- 0x%04x\n", cosa->name, data);
}
static void debug_data_cmd(struct cosa_data *cosa, int data)
{
- printk(KERN_INFO "%s: IO: data <- 0x%04x (%s|%s)\n",
+ pr_info("%s: IO: data <- 0x%04x (%s|%s)\n",
cosa->name, data,
data & SR_RDY_RCV ? "RX_RDY" : "!rx_rdy",
data & SR_RDY_SND ? "TX_RDY" : "!tx_rdy");
--
1.7.6.rc1
^ permalink raw reply related
* RE: [RFC 26/72] arm: Move the ARM/ACORN drivers
From: Gole, Anant @ 2011-06-27 3:10 UTC (permalink / raw)
To: Arnd Bergmann, Jeff Kirsher, Russell King
Cc: davem@davemloft.net, netdev@vger.kernel.org,
Govindarajan, Sriramakrishnan, Hegde, Vinay, Chemparathy, Cyril,
Wan ZongShun, Lennert Buytenhek, Krzysztof Halasa, Chaithrika U S
In-Reply-To: <201106251648.03574.arnd@arndb.de>
>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
* Re: [RFC 33/72] pch_gbe: Move the OKI driver
From: Toshiharu Okada @ 2011-06-27 1:53 UTC (permalink / raw)
To: davem, Jeff Kirsher; +Cc: Tomoya, netdev, Jeff Kirsher
In-Reply-To: <1309010363-22750-34-git-send-email-jeffrey.t.kirsher@intel.com>
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
* Re: [RFC 27/72] ftgmac100/ftmac100: Move the Faraday drivers
From: Po-Yu Chuang @ 2011-06-27 1:51 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, Po-Yu Chuang
In-Reply-To: <1309010363-22750-28-git-send-email-jeffrey.t.kirsher@intel.com>
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
* Re: [RFC 08/72] qlogic: Move the QLogic drivers
From: Anirban Chakraborty @ 2011-06-27 1:30 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: David Miller, netdev, Ron Mercer, Amit Salecha
In-Reply-To: <1309010363-22750-9-git-send-email-jeffrey.t.kirsher@intel.com>
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
* 3.0-rc4: Reported regressions 2.6.38 -> 2.6.39
From: Rafael J. Wysocki @ 2011-06-26 22:26 UTC (permalink / raw)
To: Linux Kernel Mailing List
Cc: Linux SCSI List, Linux ACPI, Network Development,
Linux Wireless List, DRI, Florian Mickler, Andrew Morton,
Kernel Testers List, Linus Torvalds, Linux PM List,
Maciej Rutecki
This message contains a list of some post-2.6.38 regressions introduced before
2.6.39, for which there are no fixes in the mainline known to the tracking team.
If any of them have been fixed already, please let us know.
If you know of any other unresolved post-2.6.38 regressions, please let us know
either and we'll add them to the list. Also, please let us know if any
of the entries below are invalid.
Each entry from the list will be sent additionally in an automatic reply to
this message with CCs to the people involved in reporting and handling the
issue.
Listed regressions statistics:
Date Total Pending Unresolved
----------------------------------------
2011-06-27 94 25 23
2011-06-12 81 21 18
2011-05-15 50 12 11
2011-04-30 38 17 16
2011-04-17 17 11 10
Unresolved regressions
----------------------
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=38132
Subject : [OOPS] 2.6.39.x latencytop
Submitter : Andrew Watts <akwatts@ymail.com>
Date : 2011-06-14 17:07 (13 days old)
Message-ID : <80098.5633.qm@web111013.mail.gq1.yahoo.com>
References : http://marc.info/?l=linux-kernel&m=130807128506490&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37772
Subject : Sometimes, sound disappears and doesn't want to idle.
Submitter : <merkil@savhon.org>
Date : 2011-06-17 22:06 (10 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37752
Subject : Kernel Panic in drm_vblank_put+0x13/0x50 on P4 HT machine with 82915G/GV/910GL Integrated Graphics Controller
Submitter : Martin Rogge <marogge@onlinehome.de>
Date : 2011-06-17 13:02 (10 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37712
Subject : reboot / "shutdown -r now" hangs ; works fine on 2.6.38.7-1
Submitter : Dave Hooper <dave@beermex.com>
Date : 2011-06-16 20:50 (11 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37692
Subject : Linux 2.6.39.x fails to boot - unable to mount root fs
Submitter : Dan Dart <dandart@googlemail.com>
Date : 2011-06-16 18:55 (11 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37622
Subject : Poor wireless performance with Intel 4965AGN with iwl-legacy/iwl4965
Submitter : <MDstr_1@hotmail.com>
Date : 2011-06-16 11:22 (11 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37472
Subject : Lenovo U160 (i915 black screen)
Submitter : Robse <rob-se@live.de>
Date : 2011-06-14 15:17 (13 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37322
Subject : high load, unresponsive system spinning in rcu_kthread
Submitter : Ferenc Wágner <wferi@niif.hu>
Date : 2011-06-12 14:53 (15 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37312
Subject : Intel 5100 wifi stopped working with 2.6.39.1
Submitter : Thibault Dory <dory.thibault@gmail.com>
Date : 2011-06-12 12:43 (15 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37292
Subject : kernel BUG at fs/ecryptfs/read_write.c:47!
Submitter : <rems14@lestoutous.com>
Date : 2011-06-12 10:25 (15 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37042
Subject : linux 3.0.0-rc2 libata-eh.c:4018 ata_scsi_port_error_handler+0x80/0x53d on s2disk
Submitter : Alex Zhavnerchik <alex.vizor@gmail.com>
Date : 2011-06-09 08:22 (18 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36952
Subject : [2.6.39] CIFS write failures where 2.6.38 works
Submitter : Helge Hafting <helge.hafting@hist.no>
Date : 2011-06-01 10:11 (26 days old)
Message-ID : <4DE6103E.6010100@hist.no>
References : http://marc.info/?l=linux-kernel&m=130692387613423&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36702
Subject : 2.6.39 kernel panic w/screenshots & kernel cfg link provided
Submitter : Justin Piszcz <jpiszcz@lucidpixels.com>
Date : 2011-05-28 12:01 (30 days old)
Message-ID : <alpine.DEB.2.02.1105280755050.4345@p34.internal.lan>
References : http://marc.info/?l=linux-kernel&m=130658411008127&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36662
Subject : Intel GM45: Low resolution on external screen.
Submitter : Alex Ferrando <alferpal@gmail.com>
Date : 2011-06-04 17:37 (23 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36392
Subject : 2.6.39, 3.0-rc2 Intel DRI Regression: Black Screen after trying to play video
Submitter : Dennis Jansen <dennis.jansen@web.de>
Date : 2011-06-01 04:41 (26 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36332
Subject : Intel gpu turns external monitor off when X starts
Submitter : rocko <rockorequin@hotmail.com>
Date : 2011-05-31 02:53 (27 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36182
Subject : Erroneous package power limit notification since kernel 2.6.39
Submitter : Olaf Freyer <aaron667@gmx.net>
Date : 2011-05-22 13:01 (36 days old)
Message-ID : <4DD9092A.4080507@gmx.net>
References : http://marc.info/?l=linux-kernel&m=130606930631131&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36092
Subject : Filesystem lockup on USB HDD plug-in
Submitter : Arno Wagner <arno@wagner.name>
Date : 2011-05-28 12:34 (30 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=35922
Subject : SND_USB_AUDIO recording device not initializing correctly
Submitter : <bjoern.online@gmail.com>
Date : 2011-05-26 10:30 (32 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=35662
Subject : softlockup with kernel 2.6.39
Submitter : Hussam Al-Tayeb <ht990332@gmail.com>
Date : 2011-05-23 08:13 (35 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=35242
Subject : NULL pointer dereference in intel_sdvo_write_cmd (was Black screen after boot)
Submitter : Ko Mi <chaostya.test@hotmail.com>
Date : 2011-05-17 10:27 (41 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=35142
Subject : 2.6.39-rc7-git1 boot error message (no crash)
Submitter : werner <w.landgraf@ru.ru>
Date : 2011-05-11 4:58 (47 days old)
Message-ID : <web-520830057@zbackend1.aha.ru>
References : http://marc.info/?l=linux-kernel&m=130512952706444&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=34942
Subject : [Bug] Kdump does not work when panic triggered due to MCE
Submitter : K.Prasad <prasad@linux.vnet.ibm.com>
Date : 2011-05-06 16:54 (52 days old)
Message-ID : <20110506165412.GB2719@in.ibm.com>
References : http://marc.info/?l=linux-kernel&m=130470087226270&w=2
Regressions with patches
------------------------
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=35642
Subject : On resume, I sometimes get a kernel oops with led_trigger_unregister_simple
Submitter : Sven-Hendrik Haase <sh@lutzhaase.com>
Date : 2011-05-23 00:15 (35 days old)
Patch : https://bugzilla.kernel.org/attachment.cgi?id=63022
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=33242
Subject : Lockdep splat in autofs with 2.6.39-rc2
Submitter : Nick Bowler <nbowler@elliptictech.com>
Date : 2011-04-07 19:44 (81 days old)
Message-ID : <20110407194403.GA29404@elliptictech.com>
References : http://marc.info/?l=linux-kernel&m=130220545614682&w=2
Patch : http://marc.info/?l=linux-kernel&m=130342115008659&w=2
For details, please visit the bug entries and follow the links given in
references.
As you can see, there is a Bugzilla entry for each of the listed regressions.
There also is a Bugzilla entry used for tracking the regressions introduced
between 2.6.38 and 2.6.39, unresolved as well as resolved, at:
http://bugzilla.kernel.org/show_bug.cgi?id=32012
Please let the tracking team know if there are any Bugzilla entries that
should be added to the list in there.
Thanks!
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* Re: [PATCH] net_sched: fix dequeuer fairness
From: Ben Hutchings @ 2011-06-26 21:18 UTC (permalink / raw)
To: jhs; +Cc: Eric Dumazet, David Miller, Herbert Xu, netdev
In-Reply-To: <1309105745.5134.54.camel@mojatatu>
On Sun, 2011-06-26 at 12:29 -0400, jamal wrote:
> On Sun, 2011-06-26 at 18:26 +0200, Eric Dumazet wrote:
>
> > Difficult to discuss about your patch because you didnt inline it :-(
>
> Evolution messes up with the whitespaces when i do that.
[...]
It works for me. Compose as plain text, and select 'Preformatted'
before inserting the file. Or use 'git imap-send' to put the message in
your drafts folder and then edit that.
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* 3.0-rc4: Reported regressions from 2.6.39
From: Rafael J. Wysocki @ 2011-06-26 21:18 UTC (permalink / raw)
To: Linux Kernel Mailing List
Cc: Linux SCSI List, Linux ACPI, Network Development,
Linux Wireless List, DRI, Florian Mickler, Andrew Morton,
Kernel Testers List, Linus Torvalds, Linux PM List,
Maciej Rutecki
This message contains a list of some regressions from 2.6.39,
for which there are no fixes in the mainline known to the tracking team.
If any of them have been fixed already, please let us know.
If you know of any other unresolved regressions from 2.6.39, please let us
know either and we'll add them to the list. Also, please let us know
if any of the entries below are invalid.
Each entry from the list will be sent additionally in an automatic reply
to this message with CCs to the people involved in reporting and handling
the issue.
Listed regressions statistics:
Date Total Pending Unresolved
----------------------------------------
2011-06-26 22 14 12
2011-06-12 8 7 7
Unresolved regressions
----------------------
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=38302
Subject : NFS crash in un-modified 3.0.0-rc3+, list corruption.
Submitter : Ben Greear <greearb@candelatech.com>
Date : 2011-06-20 22:42 (7 days old)
Message-ID : <4DFFCCDC.2070106@candelatech.com>
References : http://marc.info/?l=linux-kernel&m=130860979610651&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=38292
Subject : slab vs lockdep vs debugobjects
Submitter : Peter Zijlstra <peterz@infradead.org>
Date : 2011-06-20 17:48 (7 days old)
Message-ID : <1308592080.26237.114.camel@twins>
References : http://marc.info/?l=linux-kernel&m=130859214215636&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=38152
Subject : acpi_power_off lockdep splat
Submitter : Borislav Petkov <bp@alien8.de>
Date : 2011-06-19 13:30 (8 days old)
Message-ID : <20110619133049.GA18168@liondog.tnic>
References : http://marc.info/?l=linux-kernel&m=130849028317365&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=38142
Subject : i915, framebuffer: wrong xoffset?
Submitter : Lucas De Marchi <lucas.de.marchi@gmail.com>
Date : 2011-06-18 16:29 (9 days old)
Message-ID : <BANLkTikAJEma_NNi0NYnjBEB6RkFJK3Dpg@mail.gmail.com>
References : http://marc.info/?l=linux-kernel&m=130841462202826&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=38122
Subject : 3.0-rc3 WARNING: at drivers/gpu/drm/i915/i915_drv.c:340 gen6_gt_force_wake_put+0x29/0x52 [i915]()
Submitter : Jens Axboe <jaxboe@fusionio.com>
Date : 2011-06-14 12:12 (13 days old)
Message-ID : <<4DE3E2C9.6060207@fusionio.com>>
References : http://marc.info/?l=linux-kernel&m=130805412314680&w=2
https://lkml.org/lkml/2011/5/30/261
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37562
Subject : /scripts/depmod.sh ends up -rw-r--r-- 1 depmod.sh
Submitter : Andrew <atswartz@gmail.com>
Date : 2011-06-15 23:49 (12 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37482
Subject : Driver: i915 - Starting with kernel 3.0.0-rc3, dual monitor freezes a Dell Latitude E6410 when a second monitor is connected at boot time
Submitter : David Hill <hilld@binarystorm.net>
Date : 2011-06-14 18:42 (13 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37432
Subject : sdhci-pci fails on 3.0.0-rc1 on Dell E6510
Submitter : Oliver Hartkopp <socketcan@hartkopp.net>
Date : 2011-06-07 20:06 (20 days old)
First-Bad-Commit: http://git.kernel.org/linus/da7822e5ad71ec9b745b412639f1e5e0ba795a20
References : http://article.gmane.org/gmane.linux.kernel.mmc/8442
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37232
Subject : [3.0-rc1][NMI/DMAR][iwlagn] errors - PCI system error (SERR) for reason a1 on CPU 0
Submitter : Shawn Starr <shawn.starr@rogers.com>
Date : 2011-06-03 4:56 (24 days old)
Message-ID : <4478124.OuFNgaPiHS@segfault.sh0n.net>
References : http://marc.info/?l=linux-kernel&m=130707737616116&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36972
Subject : 3.0-rc1: DMAR errors from iwlagn
Submitter : Jeremy Fitzhardinge <jeremy@goop.org>
Date : 2011-05-31 21:14 (27 days old)
Message-ID : <4DE55A26.6040702@goop.org>
References : http://marc.info/?l=linux-kernel&m=130687723213857&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36452
Subject : Artifacts with 3.0-rc1 on SandyBridge
Submitter : Alex Zhavnerchik <alex.vizor@gmail.com>
Date : 2011-06-01 13:55 (26 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=36302
Subject : SandyBridge can't do s2disk with linux 3.0-rc1
Submitter : Alex Zhavnerchik <alex.vizor@gmail.com>
Date : 2011-05-30 23:10 (28 days old)
Regressions with patches
------------------------
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=38012
Subject : Missing code to load firmware
Submitter : Larry Finger <Larry.Finger@lwfinger.net>
Date : 2011-06-20 21:44 (7 days old)
Handled-By : Larry Finger <Larry.Finger@lwfinger.net>
Patch : https://bugzilla.kernel.org/attachment.cgi?id=63002
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=37542
Subject : [OOPS] 3.0-rc1 cifs
Submitter : Martijn Uffing <mp3project@sarijopen.student.utwente.nl>
Date : 2011-06-09 20:15 (18 days old)
Message-ID : <Pine.LNX.4.64.1106092211500.19687@sarijopen.student.utwente.nl>
References : http://marc.info/?l=linux-kernel&m=130765235926144&w=2
Handled-By : Jeff Layton <jlayton@redhat.com>
Patch : https://bugzilla.kernel.org/attachment.cgi?id=63202
For details, please visit the bug entries and follow the links given in
references.
As you can see, there is a Bugzilla entry for each of the listed regressions.
There also is a Bugzilla entry used for tracking the regressions from 2.6.39,
unresolved as well as resolved, at:
http://bugzilla.kernel.org/show_bug.cgi?id=36912
Please let the tracking team know if there are any Bugzilla entries that
should be added to the list in there.
Thanks!
^ permalink raw reply
* Re: ppp_deflate + kmalloc
From: Martin Jackson @ 2011-06-26 21:17 UTC (permalink / raw)
To: James Carlson; +Cc: paulus, linux-ppp, netdev
In-Reply-To: <4E049900.4080402@workingcode.com>
On Fri, Jun 24, 2011 at 4:02 PM, James Carlson <carlsonj@workingcode.com> wrote:
> Martin Jackson wrote:
>> In our android froyo-based system (omap3 hardware), we are getting the
>> following problem where the ppp driver cannot kmalloc enough memory
>> for the decomp buffer in the ppp driver.
>>
>> Trying to make a 4th-order kmalloc (I think that amounts to 64kB)
>> seems ambitious. I do not understand why vmalloc is not being used
>> here, like it is for the compression buffer. Is using vmalloc here an
>> acceptable solution?
>
> The code here shouldn't need contiguous pages, so vmalloc (even if
> "slower") shouldn't be a problem.
>
> But a higher-level question might be why you're bothering with RFC 1979
> Deflate compression at all on this platform. I'd expect that you're
> most likely going to end up talking to commercially-produced PPP servers
> (possibly 3GPP or similar) at the other end, and very, very few of them
> offer data compression with either RFC 1977 (BSD Compression) or RFC
> 1979. ("Very, very few" is probably being generous ...)
>
> If it's always going to be negotiated away in practice, and if you're
> having trouble with memory constraints, why not just ditch the baggage?
>
> --
> James Carlson 42.703N 71.076W <carlsonj@workingcode.com>
>
Thanks for the advice. Hopefully we can indeed remove these obscure
PPP options from our configuration - I'll look into that.
However, the point still stands that a 4th order kmalloc is likely to
fail (even our "embedded" device has 256MB RAM and slub allocator,
after all), and the page allocation code regards anything above order
3 as unrealistic and doesn't invoke the OOM to try to satisfy it, so
my view remains that this should be changed to vmalloc.
Best regards,
Martin Jackson
^ permalink raw reply
* Re: [PATCH] net_sched: fix dequeuer fairness
From: jamal @ 2011-06-26 18:13 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David Miller, Herbert Xu, netdev, adi, Joe Perches
In-Reply-To: <1309106317.5134.56.camel@mojatatu>
Sigh. One more change (should have heeded the compile warning)
thanks to adi <adi@postpi.com> for pointing it out.
Thanks to Joe Perches <joe@perches.com> for the tip on
inlining with Evolution (seems to work when i sent to myself).
----
commit a4e964941428bdf58741702e2808d2f813dac1fd
Author: Jamal Hadi Salim <jhs@mojatatu.com>
Date: Sun Jun 26 14:06:29 2011 -0400
[PATCH] net_sched: fix dequeuer fairness
Results on dummy device can be seen in my netconf 2011
slides. These results are for a 10Gige IXGBE intel
nic - on another i5 machine, very similar specs to
the one used in the netconf2011 results.
It turns out - this is a hell lot worse than dummy
and so this patch is even more beneficial for 10G.
Test setup:
----------
System under test sending packets out.
Additional box connected directly dropping packets.
Installed prio qdisc on the eth device and default
netdev default length of 1000 used as is.
The 3 prio bands each were set to 100 (didnt factor in
the results).
5 packet runs were made and the middle 3 picked.
results
-------
The "cpu" column indicates the which cpu the sample
was taken on,
The "Pkt runx" carries the number of packets a cpu
dequeued when forced to be in the "dequeuer" role.
The "avg" for each run is the number of times each
cpu should be a "dequeuer" if the system was fair.
3.0-rc4 (plain)
cpu Pkt run1 Pkt run2 Pkt run3
================================================
cpu0 21853354 21598183 22199900
cpu1 431058 473476 393159
cpu2 481975 477529 458466
cpu3 23261406 23412299 22894315
avg 11506948 11490372 11486460
3.0-rc4 with patch and default weight 64
cpu Pkt run1 Pkt run2 Pkt run3
================================================
cpu0 13205312 13109359 13132333
cpu1 10189914 10159127 10122270
cpu2 10213871 10124367 10168722
cpu3 13165760 13164767 13096705
avg 11693714 11639405 11630008
As you can see the system is still not perfect but
is a lot better than what it was before...
At the moment we use the old backlog weight, weight_p
which is 64 packets. It seems to be reasonably fine
with that value.
The system could be made more fair if we reduce the
weight_p (as per my presentation), but we are going
to affect the shared backlog weight. Unless deemed
necessary, I think the default value is fine. If not
we could add yet another knob.
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index b4c6809..d253c16 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -189,15 +189,17 @@ static inline int qdisc_restart(struct Qdisc *q)
void __qdisc_run(struct Qdisc *q)
{
- unsigned long start_time = jiffies;
+ int quota = weight_p;
+ int work = 0;
while (qdisc_restart(q)) {
+ work++;
/*
- * Postpone processing if
- * 1. another process needs the CPU;
- * 2. we've been doing it for too long.
+ * Ordered by possible occurrence: Postpone processing if
+ * 1. we've exceeded packet quota
+ * 2. another process needs the CPU;
*/
- if (need_resched() || jiffies != start_time) {
+ if (work >= quota || need_resched()) {
__netif_schedule(q);
break;
}
^ permalink raw reply related
* Re: [PATCH] net_sched: fix dequeuer fairness
From: jamal @ 2011-06-26 16:38 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David Miller, Herbert Xu, netdev
In-Reply-To: <1309105599.2532.50.camel@edumazet-laptop>
[-- Attachment #1: Type: text/plain, Size: 63 bytes --]
Updated version with latest comment from Eric.
cheers,
jamal
[-- Attachment #2: pns-4 --]
[-- Type: text/plain, Size: 3423 bytes --]
commit bd01154eff66964f516ba0914473b1ef49edcc33
Author: Jamal Hadi Salim <jhs@mojatatu.com>
Date: Sun Jun 26 12:36:33 2011 -0400
[PATCH] net_sched: fix dequeuer fairness
Results on dummy device can be seen in my netconf 2011
slides. These results are for a 10Gige IXGBE intel
nic - on another i5 machine, very similar specs to
the one used in the netconf2011 results.
It turns out - this is a hell lot worse than dummy
and so this patch is even more beneficial for 10G.
Test setup:
----------
System under test sending packets out.
Additional box connected directly dropping packets.
Installed prio qdisc on the eth device and default
netdev default length of 1000 used as is.
The 3 prio bands each were set to 100 (didnt factor in
the results).
5 packet runs were made and the middle 3 picked.
results
-------
The "cpu" column indicates the which cpu the sample
was taken on,
The "Pkt runx" carries the number of packets a cpu
dequeued when forced to be in the "dequeuer" role.
The "avg" for each run is the number of times each
cpu should be a "dequeuer" if the system was fair.
3.0-rc4 (plain)
cpu Pkt run1 Pkt run2 Pkt run3
================================================
cpu0 21853354 21598183 22199900
cpu1 431058 473476 393159
cpu2 481975 477529 458466
cpu3 23261406 23412299 22894315
avg 11506948 11490372 11486460
3.0-rc4 with patch and default weight 64
cpu Pkt run1 Pkt run2 Pkt run3
================================================
cpu0 13205312 13109359 13132333
cpu1 10189914 10159127 10122270
cpu2 10213871 10124367 10168722
cpu3 13165760 13164767 13096705
avg 11693714 11639405 11630008
As you can see the system is still not perfect but
is a lot better than what it was before...
At the moment we use the old backlog weight, weight_p
which is 64 packets. It seems to be reasonably fine
with that value.
The system could be made more fair if we reduce the
weight_p (as per my presentation), but we are going
to affect the shared backlog weight. Unless deemed
necessary, I think the default value is fine. If not
we could add yet another knob.
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index b4c6809..1006450 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -190,14 +190,17 @@ static inline int qdisc_restart(struct Qdisc *q)
void __qdisc_run(struct Qdisc *q)
{
unsigned long start_time = jiffies;
+ int quota = weight_p;
+ int work = 0;
while (qdisc_restart(q)) {
+ work++;
/*
- * Postpone processing if
- * 1. another process needs the CPU;
- * 2. we've been doing it for too long.
+ * Ordered by possible occurrence: Postpone processing if
+ * 1. we've exceeded packet quota
+ * 2. another process needs the CPU;
*/
- if (need_resched() || jiffies != start_time) {
+ if (work >= quota || need_resched()) {
__netif_schedule(q);
break;
}
^ permalink raw reply related
* Re: [PATCH] net_sched: fix dequeuer fairness
From: jamal @ 2011-06-26 16:29 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David Miller, Herbert Xu, netdev
In-Reply-To: <1309105599.2532.50.camel@edumazet-laptop>
On Sun, 2011-06-26 at 18:26 +0200, Eric Dumazet wrote:
> Difficult to discuss about your patch because you didnt inline it :-(
Evolution messes up with the whitespaces when i do that.
> You should remove this line in the comment
>
> + * 3. we've been doing it for too long.
yikes, yes.
cheers,
jamal
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox