This allows incrementing the correct timeout statistic without any mess. Down the road, devices can learn to reset just the specific queue. The patch was generated with the following script: use strict; use warnings; our $^I = '.bak'; my @work = ( ["arch/m68k/emu/nfeth.c", "nfeth_tx_timeout"], ["arch/um/drivers/net_kern.c", "uml_net_tx_timeout"], ["arch/um/drivers/vector_kern.c", "vector_net_tx_timeout"], ["arch/xtensa/platforms/iss/network.c", "iss_net_tx_timeout"], ["drivers/char/pcmcia/synclink_cs.c", "hdlcdev_tx_timeout"], ["drivers/infiniband/ulp/ipoib/ipoib_main.c", "ipoib_timeout"], ["drivers/infiniband/ulp/ipoib/ipoib_main.c", "ipoib_timeout"], ["drivers/message/fusion/mptlan.c", "mpt_lan_tx_timeout"], ["drivers/misc/sgi-xp/xpnet.c", "xpnet_dev_tx_timeout"], ["drivers/net/appletalk/cops.c", "cops_timeout"], ["drivers/net/arcnet/arcdevice.h", "arcnet_timeout"], ["drivers/net/arcnet/arcnet.c", "arcnet_timeout"], ["drivers/net/arcnet/com20020.c", "arcnet_timeout"], ["drivers/net/ethernet/3com/3c509.c", "el3_tx_timeout"], ["drivers/net/ethernet/3com/3c515.c", "corkscrew_timeout"], ["drivers/net/ethernet/3com/3c574_cs.c", "el3_tx_timeout"], ["drivers/net/ethernet/3com/3c589_cs.c", "el3_tx_timeout"], ["drivers/net/ethernet/3com/3c59x.c", "vortex_tx_timeout"], ["drivers/net/ethernet/3com/3c59x.c", "vortex_tx_timeout"], ["drivers/net/ethernet/3com/typhoon.c", "typhoon_tx_timeout"], ["drivers/net/ethernet/8390/8390.h", "ei_tx_timeout"], ["drivers/net/ethernet/8390/8390.h", "eip_tx_timeout"], ["drivers/net/ethernet/8390/8390.c", "ei_tx_timeout"], ["drivers/net/ethernet/8390/8390p.c", "eip_tx_timeout"], ["drivers/net/ethernet/8390/ax88796.c", "ax_ei_tx_timeout"], ["drivers/net/ethernet/8390/axnet_cs.c", "axnet_tx_timeout"], ["drivers/net/ethernet/8390/etherh.c", "__ei_tx_timeout"], ["drivers/net/ethernet/8390/hydra.c", "__ei_tx_timeout"], ["drivers/net/ethernet/8390/mac8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/8390/mcf8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/8390/lib8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/8390/ne2k-pci.c", "ei_tx_timeout"], ["drivers/net/ethernet/8390/pcnet_cs.c", "ei_tx_timeout"], ["drivers/net/ethernet/8390/smc-ultra.c", "ei_tx_timeout"], ["drivers/net/ethernet/8390/wd.c", "ei_tx_timeout"], ["drivers/net/ethernet/8390/zorro8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/adaptec/starfire.c", "tx_timeout"], ["drivers/net/ethernet/agere/et131x.c", "et131x_tx_timeout"], ["drivers/net/ethernet/allwinner/sun4i-emac.c", "emac_timeout"], ["drivers/net/ethernet/alteon/acenic.c", "ace_watchdog"], ["drivers/net/ethernet/amazon/ena/ena_netdev.c", "ena_tx_timeout"], ["drivers/net/ethernet/amd/7990.h", "lance_tx_timeout"], ["drivers/net/ethernet/amd/7990.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/a2065.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/am79c961a.c", "am79c961_timeout"], ["drivers/net/ethernet/amd/amd8111e.c", "amd8111e_tx_timeout"], ["drivers/net/ethernet/amd/ariadne.c", "ariadne_tx_timeout"], ["drivers/net/ethernet/amd/atarilance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/au1000_eth.c", "au1000_tx_timeout"], ["drivers/net/ethernet/amd/declance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/lance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/mvme147.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/ni65.c", "ni65_timeout"], ["drivers/net/ethernet/amd/nmclan_cs.c", "mace_tx_timeout"], ["drivers/net/ethernet/amd/pcnet32.c", "pcnet32_tx_timeout"], ["drivers/net/ethernet/amd/sunlance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/xgbe/xgbe-drv.c", "xgbe_tx_timeout"], ["drivers/net/ethernet/apm/xgene-v2/main.c", "xge_timeout"], ["drivers/net/ethernet/apm/xgene/xgene_enet_main.c", "xgene_enet_timeout"], ["drivers/net/ethernet/apple/macmace.c", "mace_tx_timeout"], ["drivers/net/ethernet/atheros/ag71xx.c", "ag71xx_tx_timeout"], ["drivers/net/ethernet/atheros/alx/main.c", "alx_tx_timeout"], ["drivers/net/ethernet/atheros/atl1c/atl1c_main.c", "atl1c_tx_timeout"], ["drivers/net/ethernet/atheros/atl1e/atl1e_main.c", "atl1e_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl.c", "atlx_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl1.c", "atlx_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl2.c", "atl2_tx_timeout"], ["drivers/net/ethernet/broadcom/b44.c", "b44_tx_timeout"], ["drivers/net/ethernet/broadcom/bcmsysport.c", "bcm_sysport_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2.c", "bnx2_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h", "bnx2x_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c", "bnx2x_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c", "bnx2x_tx_timeout"], ["drivers/net/ethernet/broadcom/bnxt/bnxt.c", "bnxt_tx_timeout"], ["drivers/net/ethernet/broadcom/genet/bcmgenet.c", "bcmgenet_timeout"], ["drivers/net/ethernet/broadcom/sb1250-mac.c", "sbmac_tx_timeout"], ["drivers/net/ethernet/broadcom/tg3.c", "tg3_tx_timeout"], ["drivers/net/ethernet/calxeda/xgmac.c", "xgmac_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_main.c", "liquidio_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_vf_main.c", "liquidio_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c", "lio_vf_rep_tx_timeout"], ["drivers/net/ethernet/cavium/thunder/nicvf_main.c", "nicvf_tx_timeout"], ["drivers/net/ethernet/cirrus/cs89x0.c", "net_timeout"], ["drivers/net/ethernet/cisco/enic/enic_main.c", "enic_tx_timeout"], ["drivers/net/ethernet/cisco/enic/enic_main.c", "enic_tx_timeout"], ["drivers/net/ethernet/cortina/gemini.c", "gmac_tx_timeout"], ["drivers/net/ethernet/davicom/dm9000.c", "dm9000_timeout"], ["drivers/net/ethernet/dec/tulip/de2104x.c", "de_tx_timeout"], ["drivers/net/ethernet/dec/tulip/tulip_core.c", "tulip_tx_timeout"], ["drivers/net/ethernet/dec/tulip/winbond-840.c", "tx_timeout"], ["drivers/net/ethernet/dlink/dl2k.c", "rio_tx_timeout"], ["drivers/net/ethernet/dlink/sundance.c", "tx_timeout"], ["drivers/net/ethernet/emulex/benet/be_main.c", "be_tx_timeout"], ["drivers/net/ethernet/ethoc.c", "ethoc_tx_timeout"], ["drivers/net/ethernet/faraday/ftgmac100.c", "ftgmac100_tx_timeout"], ["drivers/net/ethernet/fealnx.c", "fealnx_tx_timeout"], ["drivers/net/ethernet/freescale/dpaa/dpaa_eth.c", "dpaa_tx_timeout"], ["drivers/net/ethernet/freescale/fec_main.c", "fec_timeout"], ["drivers/net/ethernet/freescale/fec_mpc52xx.c", "mpc52xx_fec_tx_timeout"], ["drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c", "fs_timeout"], ["drivers/net/ethernet/freescale/gianfar.c", "gfar_timeout"], ["drivers/net/ethernet/freescale/ucc_geth.c", "ucc_geth_timeout"], ["drivers/net/ethernet/fujitsu/fmvj18x_cs.c", "fjn_tx_timeout"], ["drivers/net/ethernet/google/gve/gve_main.c", "gve_tx_timeout"], ["drivers/net/ethernet/hisilicon/hip04_eth.c", "hip04_timeout"], ["drivers/net/ethernet/hisilicon/hix5hd2_gmac.c", "hix5hd2_net_timeout"], ["drivers/net/ethernet/hisilicon/hns/hns_enet.c", "hns_nic_net_timeout"], ["drivers/net/ethernet/hisilicon/hns3/hns3_enet.c", "hns3_nic_net_timeout"], ["drivers/net/ethernet/huawei/hinic/hinic_main.c", "hinic_tx_timeout"], ["drivers/net/ethernet/i825xx/82596.c", "i596_tx_timeout"], ["drivers/net/ethernet/i825xx/ether1.c", "ether1_timeout"], ["drivers/net/ethernet/i825xx/lib82596.c", "i596_tx_timeout"], ["drivers/net/ethernet/i825xx/sun3_82586.c", "sun3_82586_timeout"], ["drivers/net/ethernet/ibm/ehea/ehea_main.c", "ehea_tx_watchdog"], ["drivers/net/ethernet/ibm/emac/core.c", "emac_tx_timeout"], ["drivers/net/ethernet/ibm/emac/core.c", "emac_tx_timeout"], ["drivers/net/ethernet/ibm/ibmvnic.c", "ibmvnic_tx_timeout"], ["drivers/net/ethernet/intel/e100.c", "e100_tx_timeout"], ["drivers/net/ethernet/intel/e1000/e1000_main.c", "e1000_tx_timeout"], ["drivers/net/ethernet/intel/e1000e/netdev.c", "e1000_tx_timeout"], ["drivers/net/ethernet/intel/fm10k/fm10k_netdev.c", "fm10k_tx_timeout"], ["drivers/net/ethernet/intel/i40e/i40e_main.c", "i40e_tx_timeout"], ["drivers/net/ethernet/intel/iavf/iavf_main.c", "iavf_tx_timeout"], ["drivers/net/ethernet/intel/ice/ice_main.c", "ice_tx_timeout"], ["drivers/net/ethernet/intel/ice/ice_main.c", "ice_tx_timeout"], ["drivers/net/ethernet/intel/igb/igb_main.c", "igb_tx_timeout"], ["drivers/net/ethernet/intel/igbvf/netdev.c", "igbvf_tx_timeout"], ["drivers/net/ethernet/intel/ixgb/ixgb_main.c", "ixgb_tx_timeout"], ["drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c", "adapter->netdev->netdev_ops->ndo_tx_timeout(adapter->netdev);"], ["drivers/net/ethernet/intel/ixgbe/ixgbe_main.c", "ixgbe_tx_timeout"], ["drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c", "ixgbevf_tx_timeout"], ["drivers/net/ethernet/jme.c", "jme_tx_timeout"], ["drivers/net/ethernet/korina.c", "korina_tx_timeout"], ["drivers/net/ethernet/lantiq_etop.c", "ltq_etop_tx_timeout"], ["drivers/net/ethernet/marvell/mv643xx_eth.c", "mv643xx_eth_tx_timeout"], ["drivers/net/ethernet/marvell/pxa168_eth.c", "pxa168_eth_tx_timeout"], ["drivers/net/ethernet/marvell/skge.c", "skge_tx_timeout"], ["drivers/net/ethernet/marvell/sky2.c", "sky2_tx_timeout"], ["drivers/net/ethernet/marvell/sky2.c", "sky2_tx_timeout"], ["drivers/net/ethernet/mediatek/mtk_eth_soc.c", "mtk_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx4/en_netdev.c", "mlx4_en_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx4/en_netdev.c", "mlx4_en_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx5/core/en_main.c", "mlx5e_tx_timeout"], ["drivers/net/ethernet/micrel/ks8842.c", "ks8842_tx_timeout"], ["drivers/net/ethernet/micrel/ksz884x.c", "netdev_tx_timeout"], ["drivers/net/ethernet/microchip/enc28j60.c", "enc28j60_tx_timeout"], ["drivers/net/ethernet/microchip/encx24j600.c", "encx24j600_tx_timeout"], ["drivers/net/ethernet/natsemi/sonic.h", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/sonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/jazzsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/macsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/natsemi.c", "ns_tx_timeout"], ["drivers/net/ethernet/natsemi/ns83820.c", "ns83820_tx_timeout"], ["drivers/net/ethernet/natsemi/xtsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/neterion/s2io.h", "s2io_tx_watchdog"], ["drivers/net/ethernet/neterion/s2io.c", "s2io_tx_watchdog"], ["drivers/net/ethernet/neterion/vxge/vxge-main.c", "vxge_tx_watchdog"], ["drivers/net/ethernet/netronome/nfp/nfp_net_common.c", "nfp_net_tx_timeout"], ["drivers/net/ethernet/nvidia/forcedeth.c", "nv_tx_timeout"], ["drivers/net/ethernet/nvidia/forcedeth.c", "nv_tx_timeout"], ["drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c", "pch_gbe_tx_timeout"], ["drivers/net/ethernet/packetengines/hamachi.c", "hamachi_tx_timeout"], ["drivers/net/ethernet/packetengines/yellowfin.c", "yellowfin_tx_timeout"], ["drivers/net/ethernet/pensando/ionic/ionic_lif.c", "ionic_tx_timeout"], ["drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c", "netxen_tx_timeout"], ["drivers/net/ethernet/qlogic/qla3xxx.c", "ql3xxx_tx_timeout"], ["drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c", "qlcnic_tx_timeout"], ["drivers/net/ethernet/qualcomm/emac/emac.c", "emac_tx_timeout"], ["drivers/net/ethernet/qualcomm/qca_spi.c", "qcaspi_netdev_tx_timeout"], ["drivers/net/ethernet/qualcomm/qca_uart.c", "qcauart_netdev_tx_timeout"], ["drivers/net/ethernet/rdc/r6040.c", "r6040_tx_timeout"], ["drivers/net/ethernet/realtek/8139cp.c", "cp_tx_timeout"], ["drivers/net/ethernet/realtek/8139too.c", "rtl8139_tx_timeout"], ["drivers/net/ethernet/realtek/atp.c", "tx_timeout"], ["drivers/net/ethernet/realtek/r8169_main.c", "rtl8169_tx_timeout"], ["drivers/net/ethernet/renesas/ravb_main.c", "ravb_tx_timeout"], ["drivers/net/ethernet/renesas/sh_eth.c", "sh_eth_tx_timeout"], ["drivers/net/ethernet/renesas/sh_eth.c", "sh_eth_tx_timeout"], ["drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c", "sxgbe_tx_timeout"], ["drivers/net/ethernet/seeq/ether3.c", "ether3_timeout"], ["drivers/net/ethernet/seeq/sgiseeq.c", "timeout"], ["drivers/net/ethernet/sfc/efx.c", "efx_watchdog"], ["drivers/net/ethernet/sfc/falcon/efx.c", "ef4_watchdog"], ["drivers/net/ethernet/sgi/ioc3-eth.c", "ioc3_timeout"], ["drivers/net/ethernet/sgi/meth.c", "meth_tx_timeout"], ["drivers/net/ethernet/silan/sc92031.c", "sc92031_tx_timeout"], ["drivers/net/ethernet/sis/sis190.c", "sis190_tx_timeout"], ["drivers/net/ethernet/sis/sis900.c", "sis900_tx_timeout"], ["drivers/net/ethernet/smsc/epic100.c", "epic_tx_timeout"], ["drivers/net/ethernet/smsc/smc911x.c", "smc911x_timeout"], ["drivers/net/ethernet/smsc/smc9194.c", "smc_timeout"], ["drivers/net/ethernet/smsc/smc91c92_cs.c", "smc_tx_timeout"], ["drivers/net/ethernet/smsc/smc91x.c", "smc_timeout"], ["drivers/net/ethernet/stmicro/stmmac/stmmac_main.c", "stmmac_tx_timeout"], ["drivers/net/ethernet/sun/cassini.c", "cas_tx_timeout"], ["drivers/net/ethernet/sun/ldmvsw.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/sun/niu.c", "niu_tx_timeout"], ["drivers/net/ethernet/sun/sunbmac.c", "bigmac_tx_timeout"], ["drivers/net/ethernet/sun/sungem.c", "gem_tx_timeout"], ["drivers/net/ethernet/sun/sunhme.c", "happy_meal_tx_timeout"], ["drivers/net/ethernet/sun/sunqe.c", "qe_tx_timeout"], ["drivers/net/ethernet/sun/sunvnet.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/sun/sunvnet_common.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/sun/sunvnet_common.h", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/synopsys/dwc-xlgmac-net.c", "xlgmac_tx_timeout"], ["drivers/net/ethernet/ti/cpmac.c", "cpmac_tx_timeout"], ["drivers/net/ethernet/ti/cpsw.c", "cpsw_ndo_tx_timeout"], ["drivers/net/ethernet/ti/cpsw_priv.c", "cpsw_ndo_tx_timeout"], ["drivers/net/ethernet/ti/cpsw_priv.h", "cpsw_ndo_tx_timeout"], ["drivers/net/ethernet/ti/davinci_emac.c", "emac_dev_tx_timeout"], ["drivers/net/ethernet/ti/netcp_core.c", "netcp_ndo_tx_timeout"], ["drivers/net/ethernet/ti/tlan.c", "tlan_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_net.h", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_net.c", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_wireless.c", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/spider_net.c", "spider_net_tx_timeout"], ["drivers/net/ethernet/toshiba/tc35815.c", "tc35815_tx_timeout"], ["drivers/net/ethernet/via/via-rhine.c", "rhine_tx_timeout"], ["drivers/net/ethernet/wiznet/w5100.c", "w5100_tx_timeout"], ["drivers/net/ethernet/wiznet/w5300.c", "w5300_tx_timeout"], ["drivers/net/ethernet/xilinx/xilinx_emaclite.c", "xemaclite_tx_timeout"], ["drivers/net/ethernet/xircom/xirc2ps_cs.c", "xirc_tx_timeout"], ["drivers/net/fjes/fjes_main.c", "fjes_tx_retry"], ["drivers/net/slip/slip.c", "sl_tx_timeout"], ["include/linux/usb/usbnet.h", "usbnet_tx_timeout"], ["drivers/net/usb/aqc111.c", "usbnet_tx_timeout"], ["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"], ["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"], ["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"], ["drivers/net/usb/ax88172a.c", "usbnet_tx_timeout"], ["drivers/net/usb/ax88179_178a.c", "usbnet_tx_timeout"], ["drivers/net/usb/catc.c", "catc_tx_timeout"], ["drivers/net/usb/cdc_mbim.c", "usbnet_tx_timeout"], ["drivers/net/usb/cdc_ncm.c", "usbnet_tx_timeout"], ["drivers/net/usb/dm9601.c", "usbnet_tx_timeout"], ["drivers/net/usb/hso.c", "hso_net_tx_timeout"], ["drivers/net/usb/int51x1.c", "usbnet_tx_timeout"], ["drivers/net/usb/ipheth.c", "ipheth_tx_timeout"], ["drivers/net/usb/kaweth.c", "kaweth_tx_timeout"], ["drivers/net/usb/lan78xx.c", "lan78xx_tx_timeout"], ["drivers/net/usb/mcs7830.c", "usbnet_tx_timeout"], ["drivers/net/usb/pegasus.c", "pegasus_tx_timeout"], ["drivers/net/usb/qmi_wwan.c", "usbnet_tx_timeout"], ["drivers/net/usb/r8152.c", "rtl8152_tx_timeout"], ["drivers/net/usb/rndis_host.c", "usbnet_tx_timeout"], ["drivers/net/usb/rtl8150.c", "rtl8150_tx_timeout"], ["drivers/net/usb/sierra_net.c", "usbnet_tx_timeout"], ["drivers/net/usb/smsc75xx.c", "usbnet_tx_timeout"], ["drivers/net/usb/smsc95xx.c", "usbnet_tx_timeout"], ["drivers/net/usb/sr9700.c", "usbnet_tx_timeout"], ["drivers/net/usb/sr9800.c", "usbnet_tx_timeout"], ["drivers/net/usb/usbnet.c", "usbnet_tx_timeout"], ["drivers/net/vmxnet3/vmxnet3_drv.c", "vmxnet3_tx_timeout"], ["drivers/net/wan/cosa.c", "cosa_net_timeout"], ["drivers/net/wan/farsync.c", "fst_tx_timeout"], ["drivers/net/wan/fsl_ucc_hdlc.c", "uhdlc_tx_timeout"], ["drivers/net/wan/lmc/lmc_main.c", "lmc_driver_timeout"], ["drivers/net/wan/x25_asy.c", "x25_asy_timeout"], ["drivers/net/wimax/i2400m/netdev.c", "i2400m_tx_timeout"], ["drivers/net/wireless/intel/ipw2x00/ipw2100.c", "ipw2100_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/main.c", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/orinoco_usb.c", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/orinoco.h", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/prism54/islpci_dev.c", "islpci_eth_tx_timeout"], ["drivers/net/wireless/intersil/prism54/islpci_eth.c", "islpci_eth_tx_timeout"], ["drivers/net/wireless/intersil/prism54/islpci_eth.h", "islpci_eth_tx_timeout"], ["drivers/net/wireless/marvell/mwifiex/main.c", "mwifiex_tx_timeout"], ["drivers/net/wireless/quantenna/qtnfmac/core.c", "qtnf_netdev_tx_timeout"], ["drivers/net/wireless/quantenna/qtnfmac/core.h", "qtnf_netdev_tx_timeout"], ["drivers/net/wireless/rndis_wlan.c", "usbnet_tx_timeout"], ["drivers/net/wireless/wl3501_cs.c", "wl3501_tx_timeout"], ["drivers/net/wireless/zydas/zd1201.c", "zd1201_tx_timeout"], ["drivers/s390/net/qeth_core.h", "qeth_tx_timeout"], ["drivers/s390/net/qeth_core_main.c", "qeth_tx_timeout"], ["drivers/s390/net/qeth_l2_main.c", "qeth_tx_timeout"], ["drivers/s390/net/qeth_l2_main.c", "qeth_tx_timeout"], ["drivers/s390/net/qeth_l3_main.c", "qeth_tx_timeout"], ["drivers/s390/net/qeth_l3_main.c", "qeth_tx_timeout"], ["drivers/staging/ks7010/ks_wlan_net.c", "ks_wlan_tx_timeout"], ["drivers/staging/qlge/qlge_main.c", "qlge_tx_timeout"], ["drivers/staging/rtl8192e/rtl8192e/rtl_core.c", "_rtl92e_tx_timeout"], ["drivers/staging/rtl8192u/r8192U_core.c", "tx_timeout"], ["drivers/staging/unisys/visornic/visornic_main.c", "visornic_xmit_timeout"], ["drivers/staging/wlan-ng/p80211netdev.c", "p80211knetdev_tx_timeout"], ["drivers/tty/n_gsm.c", "gsm_mux_net_tx_timeout"], ["drivers/tty/synclink.c", "hdlcdev_tx_timeout"], ["drivers/tty/synclink_gt.c", "hdlcdev_tx_timeout"], ["drivers/tty/synclinkmp.c", "hdlcdev_tx_timeout"], ["net/atm/lec.c", "lec_tx_timeout"], ["net/bluetooth/bnep/netdev.c", "bnep_net_timeout"] ); for my $p (@work) { my @pair = @$p; my $file = $pair[0]; my $func = $pair[1]; print STDERR $file , ": ", $func,"\n"; our @ARGV = ($file); while (<ARGV>) { if (m/($func\s*\(struct\s+net_device\s+\*[A-Za-z_]?[A-Za-z-0-9_]*)(\))/) { print STDERR "found $1+$2 in $file\n"; } if (s/($func\s*\(struct\s+net_device\s+\*[A-Za-z_]?[A-Za-z-0-9_]*)(\))/$1, unsigned int txqueue$2/) { print STDERR "$func found in $file\n"; } print; } } where the list of files and functions is simply from: git grep ndo_tx_timeout, with manual addition of headers in the rare cases where the function is from a header, then manually changing the few places which actually call ndo_tx_timeout. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Heiner Kallweit <hkallweit1@gmail.com> Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Shannon Nelson <snelson@pensando.io> Reviewed-by: Martin Habets <mhabets@solarflare.com> changes from v9: fixup a forward declaration changes from v9: more leftovers from v3 change changes from v8: fix up a missing direct call to timeout rebased on net-next changes from v7: fixup leftovers from v3 change changes from v6: fix typo in rtl driver changes from v5: add missing files (allow any net device argument name) changes from v4: add a missing driver header changes from v3: change queue # to unsigned Changes from v2: added headers Changes from v1: Fix errors found by kbuild: generalize the pattern a bit, to pick up a couple of instances missed by the previous version. Signed-off-by: David S. Miller <davem@davemloft.net>
905 lines
20 KiB
C
905 lines
20 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
|
|
* James Leu (jleu@mindspring.net).
|
|
* Copyright (C) 2001 by various other people who didn't put their name here.
|
|
*/
|
|
|
|
#include <linux/memblock.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/ethtool.h>
|
|
#include <linux/inetdevice.h>
|
|
#include <linux/init.h>
|
|
#include <linux/list.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
#include <init.h>
|
|
#include <irq_kern.h>
|
|
#include <irq_user.h>
|
|
#include "mconsole_kern.h"
|
|
#include <net_kern.h>
|
|
#include <net_user.h>
|
|
|
|
#define DRIVER_NAME "uml-netdev"
|
|
|
|
static DEFINE_SPINLOCK(opened_lock);
|
|
static LIST_HEAD(opened);
|
|
|
|
/*
|
|
* The drop_skb is used when we can't allocate an skb. The
|
|
* packet is read into drop_skb in order to get the data off the
|
|
* connection to the host.
|
|
* It is reallocated whenever a maximum packet size is seen which is
|
|
* larger than any seen before. update_drop_skb is called from
|
|
* eth_configure when a new interface is added.
|
|
*/
|
|
static DEFINE_SPINLOCK(drop_lock);
|
|
static struct sk_buff *drop_skb;
|
|
static int drop_max;
|
|
|
|
static int update_drop_skb(int max)
|
|
{
|
|
struct sk_buff *new;
|
|
unsigned long flags;
|
|
int err = 0;
|
|
|
|
spin_lock_irqsave(&drop_lock, flags);
|
|
|
|
if (max <= drop_max)
|
|
goto out;
|
|
|
|
err = -ENOMEM;
|
|
new = dev_alloc_skb(max);
|
|
if (new == NULL)
|
|
goto out;
|
|
|
|
skb_put(new, max);
|
|
|
|
kfree_skb(drop_skb);
|
|
drop_skb = new;
|
|
drop_max = max;
|
|
err = 0;
|
|
out:
|
|
spin_unlock_irqrestore(&drop_lock, flags);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int uml_net_rx(struct net_device *dev)
|
|
{
|
|
struct uml_net_private *lp = netdev_priv(dev);
|
|
int pkt_len;
|
|
struct sk_buff *skb;
|
|
|
|
/* If we can't allocate memory, try again next round. */
|
|
skb = dev_alloc_skb(lp->max_packet);
|
|
if (skb == NULL) {
|
|
drop_skb->dev = dev;
|
|
/* Read a packet into drop_skb and don't do anything with it. */
|
|
(*lp->read)(lp->fd, drop_skb, lp);
|
|
dev->stats.rx_dropped++;
|
|
return 0;
|
|
}
|
|
|
|
skb->dev = dev;
|
|
skb_put(skb, lp->max_packet);
|
|
skb_reset_mac_header(skb);
|
|
pkt_len = (*lp->read)(lp->fd, skb, lp);
|
|
|
|
if (pkt_len > 0) {
|
|
skb_trim(skb, pkt_len);
|
|
skb->protocol = (*lp->protocol)(skb);
|
|
|
|
dev->stats.rx_bytes += skb->len;
|
|
dev->stats.rx_packets++;
|
|
netif_rx(skb);
|
|
return pkt_len;
|
|
}
|
|
|
|
kfree_skb(skb);
|
|
return pkt_len;
|
|
}
|
|
|
|
static void uml_dev_close(struct work_struct *work)
|
|
{
|
|
struct uml_net_private *lp =
|
|
container_of(work, struct uml_net_private, work);
|
|
dev_close(lp->dev);
|
|
}
|
|
|
|
static irqreturn_t uml_net_interrupt(int irq, void *dev_id)
|
|
{
|
|
struct net_device *dev = dev_id;
|
|
struct uml_net_private *lp = netdev_priv(dev);
|
|
int err;
|
|
|
|
if (!netif_running(dev))
|
|
return IRQ_NONE;
|
|
|
|
spin_lock(&lp->lock);
|
|
while ((err = uml_net_rx(dev)) > 0) ;
|
|
if (err < 0) {
|
|
printk(KERN_ERR
|
|
"Device '%s' read returned %d, shutting it down\n",
|
|
dev->name, err);
|
|
/* dev_close can't be called in interrupt context, and takes
|
|
* again lp->lock.
|
|
* And dev_close() can be safely called multiple times on the
|
|
* same device, since it tests for (dev->flags & IFF_UP). So
|
|
* there's no harm in delaying the device shutdown.
|
|
* Furthermore, the workqueue will not re-enqueue an already
|
|
* enqueued work item. */
|
|
schedule_work(&lp->work);
|
|
goto out;
|
|
}
|
|
out:
|
|
spin_unlock(&lp->lock);
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int uml_net_open(struct net_device *dev)
|
|
{
|
|
struct uml_net_private *lp = netdev_priv(dev);
|
|
int err;
|
|
|
|
if (lp->fd >= 0) {
|
|
err = -ENXIO;
|
|
goto out;
|
|
}
|
|
|
|
lp->fd = (*lp->open)(&lp->user);
|
|
if (lp->fd < 0) {
|
|
err = lp->fd;
|
|
goto out;
|
|
}
|
|
|
|
err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
|
|
IRQF_SHARED, dev->name, dev);
|
|
if (err != 0) {
|
|
printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
|
|
err = -ENETUNREACH;
|
|
goto out_close;
|
|
}
|
|
|
|
netif_start_queue(dev);
|
|
|
|
/* clear buffer - it can happen that the host side of the interface
|
|
* is full when we get here. In this case, new data is never queued,
|
|
* SIGIOs never arrive, and the net never works.
|
|
*/
|
|
while ((err = uml_net_rx(dev)) > 0) ;
|
|
|
|
spin_lock(&opened_lock);
|
|
list_add(&lp->list, &opened);
|
|
spin_unlock(&opened_lock);
|
|
|
|
return 0;
|
|
out_close:
|
|
if (lp->close != NULL) (*lp->close)(lp->fd, &lp->user);
|
|
lp->fd = -1;
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
static int uml_net_close(struct net_device *dev)
|
|
{
|
|
struct uml_net_private *lp = netdev_priv(dev);
|
|
|
|
netif_stop_queue(dev);
|
|
|
|
um_free_irq(dev->irq, dev);
|
|
if (lp->close != NULL)
|
|
(*lp->close)(lp->fd, &lp->user);
|
|
lp->fd = -1;
|
|
|
|
spin_lock(&opened_lock);
|
|
list_del(&lp->list);
|
|
spin_unlock(&opened_lock);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
struct uml_net_private *lp = netdev_priv(dev);
|
|
unsigned long flags;
|
|
int len;
|
|
|
|
netif_stop_queue(dev);
|
|
|
|
spin_lock_irqsave(&lp->lock, flags);
|
|
|
|
len = (*lp->write)(lp->fd, skb, lp);
|
|
skb_tx_timestamp(skb);
|
|
|
|
if (len == skb->len) {
|
|
dev->stats.tx_packets++;
|
|
dev->stats.tx_bytes += skb->len;
|
|
netif_trans_update(dev);
|
|
netif_start_queue(dev);
|
|
|
|
/* this is normally done in the interrupt when tx finishes */
|
|
netif_wake_queue(dev);
|
|
}
|
|
else if (len == 0) {
|
|
netif_start_queue(dev);
|
|
dev->stats.tx_dropped++;
|
|
}
|
|
else {
|
|
netif_start_queue(dev);
|
|
printk(KERN_ERR "uml_net_start_xmit: failed(%d)\n", len);
|
|
}
|
|
|
|
spin_unlock_irqrestore(&lp->lock, flags);
|
|
|
|
dev_consume_skb_any(skb);
|
|
|
|
return NETDEV_TX_OK;
|
|
}
|
|
|
|
static void uml_net_set_multicast_list(struct net_device *dev)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static void uml_net_tx_timeout(struct net_device *dev, unsigned int txqueue)
|
|
{
|
|
netif_trans_update(dev);
|
|
netif_wake_queue(dev);
|
|
}
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
static void uml_net_poll_controller(struct net_device *dev)
|
|
{
|
|
disable_irq(dev->irq);
|
|
uml_net_interrupt(dev->irq, dev);
|
|
enable_irq(dev->irq);
|
|
}
|
|
#endif
|
|
|
|
static void uml_net_get_drvinfo(struct net_device *dev,
|
|
struct ethtool_drvinfo *info)
|
|
{
|
|
strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
|
|
strlcpy(info->version, "42", sizeof(info->version));
|
|
}
|
|
|
|
static const struct ethtool_ops uml_net_ethtool_ops = {
|
|
.get_drvinfo = uml_net_get_drvinfo,
|
|
.get_link = ethtool_op_get_link,
|
|
.get_ts_info = ethtool_op_get_ts_info,
|
|
};
|
|
|
|
static void uml_net_user_timer_expire(struct timer_list *t)
|
|
{
|
|
#ifdef undef
|
|
struct uml_net_private *lp = from_timer(lp, t, tl);
|
|
struct connection *conn = &lp->user;
|
|
|
|
dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn);
|
|
do_connect(conn);
|
|
#endif
|
|
}
|
|
|
|
void uml_net_setup_etheraddr(struct net_device *dev, char *str)
|
|
{
|
|
unsigned char *addr = dev->dev_addr;
|
|
char *end;
|
|
int i;
|
|
|
|
if (str == NULL)
|
|
goto random;
|
|
|
|
for (i = 0; i < 6; i++) {
|
|
addr[i] = simple_strtoul(str, &end, 16);
|
|
if ((end == str) ||
|
|
((*end != ':') && (*end != ',') && (*end != '\0'))) {
|
|
printk(KERN_ERR
|
|
"setup_etheraddr: failed to parse '%s' "
|
|
"as an ethernet address\n", str);
|
|
goto random;
|
|
}
|
|
str = end + 1;
|
|
}
|
|
if (is_multicast_ether_addr(addr)) {
|
|
printk(KERN_ERR
|
|
"Attempt to assign a multicast ethernet address to a "
|
|
"device disallowed\n");
|
|
goto random;
|
|
}
|
|
if (!is_valid_ether_addr(addr)) {
|
|
printk(KERN_ERR
|
|
"Attempt to assign an invalid ethernet address to a "
|
|
"device disallowed\n");
|
|
goto random;
|
|
}
|
|
if (!is_local_ether_addr(addr)) {
|
|
printk(KERN_WARNING
|
|
"Warning: Assigning a globally valid ethernet "
|
|
"address to a device\n");
|
|
printk(KERN_WARNING "You should set the 2nd rightmost bit in "
|
|
"the first byte of the MAC,\n");
|
|
printk(KERN_WARNING "i.e. %02x:%02x:%02x:%02x:%02x:%02x\n",
|
|
addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4],
|
|
addr[5]);
|
|
}
|
|
return;
|
|
|
|
random:
|
|
printk(KERN_INFO
|
|
"Choosing a random ethernet address for device %s\n", dev->name);
|
|
eth_hw_addr_random(dev);
|
|
}
|
|
|
|
static DEFINE_SPINLOCK(devices_lock);
|
|
static LIST_HEAD(devices);
|
|
|
|
static struct platform_driver uml_net_driver = {
|
|
.driver = {
|
|
.name = DRIVER_NAME,
|
|
},
|
|
};
|
|
|
|
static void net_device_release(struct device *dev)
|
|
{
|
|
struct uml_net *device = dev_get_drvdata(dev);
|
|
struct net_device *netdev = device->dev;
|
|
struct uml_net_private *lp = netdev_priv(netdev);
|
|
|
|
if (lp->remove != NULL)
|
|
(*lp->remove)(&lp->user);
|
|
list_del(&device->list);
|
|
kfree(device);
|
|
free_netdev(netdev);
|
|
}
|
|
|
|
static const struct net_device_ops uml_netdev_ops = {
|
|
.ndo_open = uml_net_open,
|
|
.ndo_stop = uml_net_close,
|
|
.ndo_start_xmit = uml_net_start_xmit,
|
|
.ndo_set_rx_mode = uml_net_set_multicast_list,
|
|
.ndo_tx_timeout = uml_net_tx_timeout,
|
|
.ndo_set_mac_address = eth_mac_addr,
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
.ndo_poll_controller = uml_net_poll_controller,
|
|
#endif
|
|
};
|
|
|
|
/*
|
|
* Ensures that platform_driver_register is called only once by
|
|
* eth_configure. Will be set in an initcall.
|
|
*/
|
|
static int driver_registered;
|
|
|
|
static void eth_configure(int n, void *init, char *mac,
|
|
struct transport *transport, gfp_t gfp_mask)
|
|
{
|
|
struct uml_net *device;
|
|
struct net_device *dev;
|
|
struct uml_net_private *lp;
|
|
int err, size;
|
|
|
|
size = transport->private_size + sizeof(struct uml_net_private);
|
|
|
|
device = kzalloc(sizeof(*device), gfp_mask);
|
|
if (device == NULL) {
|
|
printk(KERN_ERR "eth_configure failed to allocate struct "
|
|
"uml_net\n");
|
|
return;
|
|
}
|
|
|
|
dev = alloc_etherdev(size);
|
|
if (dev == NULL) {
|
|
printk(KERN_ERR "eth_configure: failed to allocate struct "
|
|
"net_device for eth%d\n", n);
|
|
goto out_free_device;
|
|
}
|
|
|
|
INIT_LIST_HEAD(&device->list);
|
|
device->index = n;
|
|
|
|
/* If this name ends up conflicting with an existing registered
|
|
* netdevice, that is OK, register_netdev{,ice}() will notice this
|
|
* and fail.
|
|
*/
|
|
snprintf(dev->name, sizeof(dev->name), "eth%d", n);
|
|
|
|
uml_net_setup_etheraddr(dev, mac);
|
|
|
|
printk(KERN_INFO "Netdevice %d (%pM) : ", n, dev->dev_addr);
|
|
|
|
lp = netdev_priv(dev);
|
|
/* This points to the transport private data. It's still clear, but we
|
|
* must memset it to 0 *now*. Let's help the drivers. */
|
|
memset(lp, 0, size);
|
|
INIT_WORK(&lp->work, uml_dev_close);
|
|
|
|
/* sysfs register */
|
|
if (!driver_registered) {
|
|
platform_driver_register(¨_net_driver);
|
|
driver_registered = 1;
|
|
}
|
|
device->pdev.id = n;
|
|
device->pdev.name = DRIVER_NAME;
|
|
device->pdev.dev.release = net_device_release;
|
|
dev_set_drvdata(&device->pdev.dev, device);
|
|
if (platform_device_register(&device->pdev))
|
|
goto out_free_netdev;
|
|
SET_NETDEV_DEV(dev,&device->pdev.dev);
|
|
|
|
device->dev = dev;
|
|
|
|
/*
|
|
* These just fill in a data structure, so there's no failure
|
|
* to be worried about.
|
|
*/
|
|
(*transport->kern->init)(dev, init);
|
|
|
|
*lp = ((struct uml_net_private)
|
|
{ .list = LIST_HEAD_INIT(lp->list),
|
|
.dev = dev,
|
|
.fd = -1,
|
|
.mac = { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0},
|
|
.max_packet = transport->user->max_packet,
|
|
.protocol = transport->kern->protocol,
|
|
.open = transport->user->open,
|
|
.close = transport->user->close,
|
|
.remove = transport->user->remove,
|
|
.read = transport->kern->read,
|
|
.write = transport->kern->write,
|
|
.add_address = transport->user->add_address,
|
|
.delete_address = transport->user->delete_address });
|
|
|
|
timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
|
|
spin_lock_init(&lp->lock);
|
|
memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
|
|
|
|
if ((transport->user->init != NULL) &&
|
|
((*transport->user->init)(&lp->user, dev) != 0))
|
|
goto out_unregister;
|
|
|
|
dev->mtu = transport->user->mtu;
|
|
dev->netdev_ops = ¨_netdev_ops;
|
|
dev->ethtool_ops = ¨_net_ethtool_ops;
|
|
dev->watchdog_timeo = (HZ >> 1);
|
|
dev->irq = UM_ETH_IRQ;
|
|
|
|
err = update_drop_skb(lp->max_packet);
|
|
if (err)
|
|
goto out_undo_user_init;
|
|
|
|
rtnl_lock();
|
|
err = register_netdevice(dev);
|
|
rtnl_unlock();
|
|
if (err)
|
|
goto out_undo_user_init;
|
|
|
|
spin_lock(&devices_lock);
|
|
list_add(&device->list, &devices);
|
|
spin_unlock(&devices_lock);
|
|
|
|
return;
|
|
|
|
out_undo_user_init:
|
|
if (transport->user->remove != NULL)
|
|
(*transport->user->remove)(&lp->user);
|
|
out_unregister:
|
|
platform_device_unregister(&device->pdev);
|
|
return; /* platform_device_unregister frees dev and device */
|
|
out_free_netdev:
|
|
free_netdev(dev);
|
|
out_free_device:
|
|
kfree(device);
|
|
}
|
|
|
|
static struct uml_net *find_device(int n)
|
|
{
|
|
struct uml_net *device;
|
|
struct list_head *ele;
|
|
|
|
spin_lock(&devices_lock);
|
|
list_for_each(ele, &devices) {
|
|
device = list_entry(ele, struct uml_net, list);
|
|
if (device->index == n)
|
|
goto out;
|
|
}
|
|
device = NULL;
|
|
out:
|
|
spin_unlock(&devices_lock);
|
|
return device;
|
|
}
|
|
|
|
static int eth_parse(char *str, int *index_out, char **str_out,
|
|
char **error_out)
|
|
{
|
|
char *end;
|
|
int n, err = -EINVAL;
|
|
|
|
n = simple_strtoul(str, &end, 0);
|
|
if (end == str) {
|
|
*error_out = "Bad device number";
|
|
return err;
|
|
}
|
|
|
|
str = end;
|
|
if (*str != '=') {
|
|
*error_out = "Expected '=' after device number";
|
|
return err;
|
|
}
|
|
|
|
str++;
|
|
if (find_device(n)) {
|
|
*error_out = "Device already configured";
|
|
return err;
|
|
}
|
|
|
|
*index_out = n;
|
|
*str_out = str;
|
|
return 0;
|
|
}
|
|
|
|
struct eth_init {
|
|
struct list_head list;
|
|
char *init;
|
|
int index;
|
|
};
|
|
|
|
static DEFINE_SPINLOCK(transports_lock);
|
|
static LIST_HEAD(transports);
|
|
|
|
/* Filled in during early boot */
|
|
static LIST_HEAD(eth_cmd_line);
|
|
|
|
static int check_transport(struct transport *transport, char *eth, int n,
|
|
void **init_out, char **mac_out, gfp_t gfp_mask)
|
|
{
|
|
int len;
|
|
|
|
len = strlen(transport->name);
|
|
if (strncmp(eth, transport->name, len))
|
|
return 0;
|
|
|
|
eth += len;
|
|
if (*eth == ',')
|
|
eth++;
|
|
else if (*eth != '\0')
|
|
return 0;
|
|
|
|
*init_out = kmalloc(transport->setup_size, gfp_mask);
|
|
if (*init_out == NULL)
|
|
return 1;
|
|
|
|
if (!transport->setup(eth, mac_out, *init_out)) {
|
|
kfree(*init_out);
|
|
*init_out = NULL;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
void register_transport(struct transport *new)
|
|
{
|
|
struct list_head *ele, *next;
|
|
struct eth_init *eth;
|
|
void *init;
|
|
char *mac = NULL;
|
|
int match;
|
|
|
|
spin_lock(&transports_lock);
|
|
BUG_ON(!list_empty(&new->list));
|
|
list_add(&new->list, &transports);
|
|
spin_unlock(&transports_lock);
|
|
|
|
list_for_each_safe(ele, next, ð_cmd_line) {
|
|
eth = list_entry(ele, struct eth_init, list);
|
|
match = check_transport(new, eth->init, eth->index, &init,
|
|
&mac, GFP_KERNEL);
|
|
if (!match)
|
|
continue;
|
|
else if (init != NULL) {
|
|
eth_configure(eth->index, init, mac, new, GFP_KERNEL);
|
|
kfree(init);
|
|
}
|
|
list_del(ð->list);
|
|
}
|
|
}
|
|
|
|
static int eth_setup_common(char *str, int index)
|
|
{
|
|
struct list_head *ele;
|
|
struct transport *transport;
|
|
void *init;
|
|
char *mac = NULL;
|
|
int found = 0;
|
|
|
|
spin_lock(&transports_lock);
|
|
list_for_each(ele, &transports) {
|
|
transport = list_entry(ele, struct transport, list);
|
|
if (!check_transport(transport, str, index, &init,
|
|
&mac, GFP_ATOMIC))
|
|
continue;
|
|
if (init != NULL) {
|
|
eth_configure(index, init, mac, transport, GFP_ATOMIC);
|
|
kfree(init);
|
|
}
|
|
found = 1;
|
|
break;
|
|
}
|
|
|
|
spin_unlock(&transports_lock);
|
|
return found;
|
|
}
|
|
|
|
static int __init eth_setup(char *str)
|
|
{
|
|
struct eth_init *new;
|
|
char *error;
|
|
int n, err;
|
|
|
|
err = eth_parse(str, &n, &str, &error);
|
|
if (err) {
|
|
printk(KERN_ERR "eth_setup - Couldn't parse '%s' : %s\n",
|
|
str, error);
|
|
return 1;
|
|
}
|
|
|
|
new = memblock_alloc(sizeof(*new), SMP_CACHE_BYTES);
|
|
if (!new)
|
|
panic("%s: Failed to allocate %zu bytes\n", __func__,
|
|
sizeof(*new));
|
|
|
|
INIT_LIST_HEAD(&new->list);
|
|
new->index = n;
|
|
new->init = str;
|
|
|
|
list_add_tail(&new->list, ð_cmd_line);
|
|
return 1;
|
|
}
|
|
|
|
__setup("eth", eth_setup);
|
|
__uml_help(eth_setup,
|
|
"eth[0-9]+=<transport>,<options>\n"
|
|
" Configure a network device.\n\n"
|
|
);
|
|
|
|
static int net_config(char *str, char **error_out)
|
|
{
|
|
int n, err;
|
|
|
|
err = eth_parse(str, &n, &str, error_out);
|
|
if (err)
|
|
return err;
|
|
|
|
/* This string is broken up and the pieces used by the underlying
|
|
* driver. So, it is freed only if eth_setup_common fails.
|
|
*/
|
|
str = kstrdup(str, GFP_KERNEL);
|
|
if (str == NULL) {
|
|
*error_out = "net_config failed to strdup string";
|
|
return -ENOMEM;
|
|
}
|
|
err = !eth_setup_common(str, n);
|
|
if (err)
|
|
kfree(str);
|
|
return err;
|
|
}
|
|
|
|
static int net_id(char **str, int *start_out, int *end_out)
|
|
{
|
|
char *end;
|
|
int n;
|
|
|
|
n = simple_strtoul(*str, &end, 0);
|
|
if ((*end != '\0') || (end == *str))
|
|
return -1;
|
|
|
|
*start_out = n;
|
|
*end_out = n;
|
|
*str = end;
|
|
return n;
|
|
}
|
|
|
|
static int net_remove(int n, char **error_out)
|
|
{
|
|
struct uml_net *device;
|
|
struct net_device *dev;
|
|
struct uml_net_private *lp;
|
|
|
|
device = find_device(n);
|
|
if (device == NULL)
|
|
return -ENODEV;
|
|
|
|
dev = device->dev;
|
|
lp = netdev_priv(dev);
|
|
if (lp->fd > 0)
|
|
return -EBUSY;
|
|
unregister_netdev(dev);
|
|
platform_device_unregister(&device->pdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct mc_device net_mc = {
|
|
.list = LIST_HEAD_INIT(net_mc.list),
|
|
.name = "eth",
|
|
.config = net_config,
|
|
.get_config = NULL,
|
|
.id = net_id,
|
|
.remove = net_remove,
|
|
};
|
|
|
|
#ifdef CONFIG_INET
|
|
static int uml_inetaddr_event(struct notifier_block *this, unsigned long event,
|
|
void *ptr)
|
|
{
|
|
struct in_ifaddr *ifa = ptr;
|
|
struct net_device *dev = ifa->ifa_dev->dev;
|
|
struct uml_net_private *lp;
|
|
void (*proc)(unsigned char *, unsigned char *, void *);
|
|
unsigned char addr_buf[4], netmask_buf[4];
|
|
|
|
if (dev->netdev_ops->ndo_open != uml_net_open)
|
|
return NOTIFY_DONE;
|
|
|
|
lp = netdev_priv(dev);
|
|
|
|
proc = NULL;
|
|
switch (event) {
|
|
case NETDEV_UP:
|
|
proc = lp->add_address;
|
|
break;
|
|
case NETDEV_DOWN:
|
|
proc = lp->delete_address;
|
|
break;
|
|
}
|
|
if (proc != NULL) {
|
|
memcpy(addr_buf, &ifa->ifa_address, sizeof(addr_buf));
|
|
memcpy(netmask_buf, &ifa->ifa_mask, sizeof(netmask_buf));
|
|
(*proc)(addr_buf, netmask_buf, &lp->user);
|
|
}
|
|
return NOTIFY_DONE;
|
|
}
|
|
|
|
/* uml_net_init shouldn't be called twice on two CPUs at the same time */
|
|
static struct notifier_block uml_inetaddr_notifier = {
|
|
.notifier_call = uml_inetaddr_event,
|
|
};
|
|
|
|
static void inet_register(void)
|
|
{
|
|
struct list_head *ele;
|
|
struct uml_net_private *lp;
|
|
struct in_device *ip;
|
|
struct in_ifaddr *in;
|
|
|
|
register_inetaddr_notifier(¨_inetaddr_notifier);
|
|
|
|
/* Devices may have been opened already, so the uml_inetaddr_notifier
|
|
* didn't get a chance to run for them. This fakes it so that
|
|
* addresses which have already been set up get handled properly.
|
|
*/
|
|
spin_lock(&opened_lock);
|
|
list_for_each(ele, &opened) {
|
|
lp = list_entry(ele, struct uml_net_private, list);
|
|
ip = lp->dev->ip_ptr;
|
|
if (ip == NULL)
|
|
continue;
|
|
in = ip->ifa_list;
|
|
while (in != NULL) {
|
|
uml_inetaddr_event(NULL, NETDEV_UP, in);
|
|
in = in->ifa_next;
|
|
}
|
|
}
|
|
spin_unlock(&opened_lock);
|
|
}
|
|
#else
|
|
static inline void inet_register(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
static int uml_net_init(void)
|
|
{
|
|
mconsole_register_dev(&net_mc);
|
|
inet_register();
|
|
return 0;
|
|
}
|
|
|
|
__initcall(uml_net_init);
|
|
|
|
static void close_devices(void)
|
|
{
|
|
struct list_head *ele;
|
|
struct uml_net_private *lp;
|
|
|
|
spin_lock(&opened_lock);
|
|
list_for_each(ele, &opened) {
|
|
lp = list_entry(ele, struct uml_net_private, list);
|
|
um_free_irq(lp->dev->irq, lp->dev);
|
|
if ((lp->close != NULL) && (lp->fd >= 0))
|
|
(*lp->close)(lp->fd, &lp->user);
|
|
if (lp->remove != NULL)
|
|
(*lp->remove)(&lp->user);
|
|
}
|
|
spin_unlock(&opened_lock);
|
|
}
|
|
|
|
__uml_exitcall(close_devices);
|
|
|
|
void iter_addresses(void *d, void (*cb)(unsigned char *, unsigned char *,
|
|
void *),
|
|
void *arg)
|
|
{
|
|
struct net_device *dev = d;
|
|
struct in_device *ip = dev->ip_ptr;
|
|
struct in_ifaddr *in;
|
|
unsigned char address[4], netmask[4];
|
|
|
|
if (ip == NULL) return;
|
|
in = ip->ifa_list;
|
|
while (in != NULL) {
|
|
memcpy(address, &in->ifa_address, sizeof(address));
|
|
memcpy(netmask, &in->ifa_mask, sizeof(netmask));
|
|
(*cb)(address, netmask, arg);
|
|
in = in->ifa_next;
|
|
}
|
|
}
|
|
|
|
int dev_netmask(void *d, void *m)
|
|
{
|
|
struct net_device *dev = d;
|
|
struct in_device *ip = dev->ip_ptr;
|
|
struct in_ifaddr *in;
|
|
__be32 *mask_out = m;
|
|
|
|
if (ip == NULL)
|
|
return 1;
|
|
|
|
in = ip->ifa_list;
|
|
if (in == NULL)
|
|
return 1;
|
|
|
|
*mask_out = in->ifa_mask;
|
|
return 0;
|
|
}
|
|
|
|
void *get_output_buffer(int *len_out)
|
|
{
|
|
void *ret;
|
|
|
|
ret = (void *) __get_free_pages(GFP_KERNEL, 0);
|
|
if (ret) *len_out = PAGE_SIZE;
|
|
else *len_out = 0;
|
|
return ret;
|
|
}
|
|
|
|
void free_output_buffer(void *buffer)
|
|
{
|
|
free_pages((unsigned long) buffer, 0);
|
|
}
|
|
|
|
int tap_setup_common(char *str, char *type, char **dev_name, char **mac_out,
|
|
char **gate_addr)
|
|
{
|
|
char *remain;
|
|
|
|
remain = split_if_spec(str, dev_name, mac_out, gate_addr, NULL);
|
|
if (remain != NULL) {
|
|
printk(KERN_ERR "tap_setup_common - Extra garbage on "
|
|
"specification : '%s'\n", remain);
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
unsigned short eth_protocol(struct sk_buff *skb)
|
|
{
|
|
return eth_type_trans(skb, skb->dev);
|
|
}
|