mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 23:51:46 +00:00
0290bd291c
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>
810 lines
18 KiB
C
810 lines
18 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Things to sort out:
|
|
*
|
|
* o tbusy handling
|
|
* o allow users to set the parameters
|
|
* o sync/async switching ?
|
|
*
|
|
* Note: This does _not_ implement CCITT X.25 asynchronous framing
|
|
* recommendations. Its primarily for testing purposes. If you wanted
|
|
* to do CCITT then in theory all you need is to nick the HDLC async
|
|
* checksum routines from ppp.c
|
|
* Changes:
|
|
*
|
|
* 2000-10-29 Henner Eisen lapb_data_indication() return status.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/uaccess.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/string.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/in.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/if_arp.h>
|
|
#include <linux/lapb.h>
|
|
#include <linux/init.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/slab.h>
|
|
#include <net/x25device.h>
|
|
#include "x25_asy.h"
|
|
|
|
static struct net_device **x25_asy_devs;
|
|
static int x25_asy_maxdev = SL_NRUNIT;
|
|
|
|
module_param(x25_asy_maxdev, int, 0);
|
|
MODULE_LICENSE("GPL");
|
|
|
|
static int x25_asy_esc(unsigned char *p, unsigned char *d, int len);
|
|
static void x25_asy_unesc(struct x25_asy *sl, unsigned char c);
|
|
static void x25_asy_setup(struct net_device *dev);
|
|
|
|
/* Find a free X.25 channel, and link in this `tty' line. */
|
|
static struct x25_asy *x25_asy_alloc(void)
|
|
{
|
|
struct net_device *dev = NULL;
|
|
struct x25_asy *sl;
|
|
int i;
|
|
|
|
if (x25_asy_devs == NULL)
|
|
return NULL; /* Master array missing ! */
|
|
|
|
for (i = 0; i < x25_asy_maxdev; i++) {
|
|
dev = x25_asy_devs[i];
|
|
|
|
/* Not allocated ? */
|
|
if (dev == NULL)
|
|
break;
|
|
|
|
sl = netdev_priv(dev);
|
|
/* Not in use ? */
|
|
if (!test_and_set_bit(SLF_INUSE, &sl->flags))
|
|
return sl;
|
|
}
|
|
|
|
|
|
/* Sorry, too many, all slots in use */
|
|
if (i >= x25_asy_maxdev)
|
|
return NULL;
|
|
|
|
/* If no channels are available, allocate one */
|
|
if (!dev) {
|
|
char name[IFNAMSIZ];
|
|
sprintf(name, "x25asy%d", i);
|
|
|
|
dev = alloc_netdev(sizeof(struct x25_asy), name,
|
|
NET_NAME_UNKNOWN, x25_asy_setup);
|
|
if (!dev)
|
|
return NULL;
|
|
|
|
/* Initialize channel control data */
|
|
sl = netdev_priv(dev);
|
|
dev->base_addr = i;
|
|
|
|
/* register device so that it can be ifconfig'ed */
|
|
if (register_netdev(dev) == 0) {
|
|
/* (Re-)Set the INUSE bit. Very Important! */
|
|
set_bit(SLF_INUSE, &sl->flags);
|
|
x25_asy_devs[i] = dev;
|
|
return sl;
|
|
} else {
|
|
pr_warn("%s(): register_netdev() failure\n", __func__);
|
|
free_netdev(dev);
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* Free an X.25 channel. */
|
|
static void x25_asy_free(struct x25_asy *sl)
|
|
{
|
|
/* Free all X.25 frame buffers. */
|
|
kfree(sl->rbuff);
|
|
sl->rbuff = NULL;
|
|
kfree(sl->xbuff);
|
|
sl->xbuff = NULL;
|
|
|
|
if (!test_and_clear_bit(SLF_INUSE, &sl->flags))
|
|
netdev_err(sl->dev, "x25_asy_free for already free unit\n");
|
|
}
|
|
|
|
static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
unsigned char *xbuff, *rbuff;
|
|
int len;
|
|
|
|
len = 2 * newmtu;
|
|
xbuff = kmalloc(len + 4, GFP_ATOMIC);
|
|
rbuff = kmalloc(len + 4, GFP_ATOMIC);
|
|
|
|
if (xbuff == NULL || rbuff == NULL) {
|
|
kfree(xbuff);
|
|
kfree(rbuff);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
spin_lock_bh(&sl->lock);
|
|
xbuff = xchg(&sl->xbuff, xbuff);
|
|
if (sl->xleft) {
|
|
if (sl->xleft <= len) {
|
|
memcpy(sl->xbuff, sl->xhead, sl->xleft);
|
|
} else {
|
|
sl->xleft = 0;
|
|
dev->stats.tx_dropped++;
|
|
}
|
|
}
|
|
sl->xhead = sl->xbuff;
|
|
|
|
rbuff = xchg(&sl->rbuff, rbuff);
|
|
if (sl->rcount) {
|
|
if (sl->rcount <= len) {
|
|
memcpy(sl->rbuff, rbuff, sl->rcount);
|
|
} else {
|
|
sl->rcount = 0;
|
|
dev->stats.rx_over_errors++;
|
|
set_bit(SLF_ERROR, &sl->flags);
|
|
}
|
|
}
|
|
|
|
dev->mtu = newmtu;
|
|
sl->buffsize = len;
|
|
|
|
spin_unlock_bh(&sl->lock);
|
|
|
|
kfree(xbuff);
|
|
kfree(rbuff);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Set the "sending" flag. This must be atomic, hence the ASM. */
|
|
|
|
static inline void x25_asy_lock(struct x25_asy *sl)
|
|
{
|
|
netif_stop_queue(sl->dev);
|
|
}
|
|
|
|
|
|
/* Clear the "sending" flag. This must be atomic, hence the ASM. */
|
|
|
|
static inline void x25_asy_unlock(struct x25_asy *sl)
|
|
{
|
|
netif_wake_queue(sl->dev);
|
|
}
|
|
|
|
/* Send one completely decapsulated IP datagram to the IP layer. */
|
|
|
|
static void x25_asy_bump(struct x25_asy *sl)
|
|
{
|
|
struct net_device *dev = sl->dev;
|
|
struct sk_buff *skb;
|
|
int count;
|
|
int err;
|
|
|
|
count = sl->rcount;
|
|
dev->stats.rx_bytes += count;
|
|
|
|
skb = dev_alloc_skb(count+1);
|
|
if (skb == NULL) {
|
|
netdev_warn(sl->dev, "memory squeeze, dropping packet\n");
|
|
dev->stats.rx_dropped++;
|
|
return;
|
|
}
|
|
skb_push(skb, 1); /* LAPB internal control */
|
|
skb_put_data(skb, sl->rbuff, count);
|
|
skb->protocol = x25_type_trans(skb, sl->dev);
|
|
err = lapb_data_received(skb->dev, skb);
|
|
if (err != LAPB_OK) {
|
|
kfree_skb(skb);
|
|
printk(KERN_DEBUG "x25_asy: data received err - %d\n", err);
|
|
} else {
|
|
netif_rx(skb);
|
|
dev->stats.rx_packets++;
|
|
}
|
|
}
|
|
|
|
/* Encapsulate one IP datagram and stuff into a TTY queue. */
|
|
static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len)
|
|
{
|
|
unsigned char *p;
|
|
int actual, count, mtu = sl->dev->mtu;
|
|
|
|
if (len > mtu) {
|
|
/* Sigh, shouldn't occur BUT ... */
|
|
len = mtu;
|
|
printk(KERN_DEBUG "%s: truncating oversized transmit packet!\n",
|
|
sl->dev->name);
|
|
sl->dev->stats.tx_dropped++;
|
|
x25_asy_unlock(sl);
|
|
return;
|
|
}
|
|
|
|
p = icp;
|
|
count = x25_asy_esc(p, sl->xbuff, len);
|
|
|
|
/* Order of next two lines is *very* important.
|
|
* When we are sending a little amount of data,
|
|
* the transfer may be completed inside driver.write()
|
|
* routine, because it's running with interrupts enabled.
|
|
* In this case we *never* got WRITE_WAKEUP event,
|
|
* if we did not request it before write operation.
|
|
* 14 Oct 1994 Dmitry Gorodchanin.
|
|
*/
|
|
set_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
|
|
actual = sl->tty->ops->write(sl->tty, sl->xbuff, count);
|
|
sl->xleft = count - actual;
|
|
sl->xhead = sl->xbuff + actual;
|
|
/* VSV */
|
|
clear_bit(SLF_OUTWAIT, &sl->flags); /* reset outfill flag */
|
|
}
|
|
|
|
/*
|
|
* Called by the driver when there's room for more data. If we have
|
|
* more packets to send, we send them here.
|
|
*/
|
|
static void x25_asy_write_wakeup(struct tty_struct *tty)
|
|
{
|
|
int actual;
|
|
struct x25_asy *sl = tty->disc_data;
|
|
|
|
/* First make sure we're connected. */
|
|
if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev))
|
|
return;
|
|
|
|
if (sl->xleft <= 0) {
|
|
/* Now serial buffer is almost free & we can start
|
|
* transmission of another packet */
|
|
sl->dev->stats.tx_packets++;
|
|
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
|
|
x25_asy_unlock(sl);
|
|
return;
|
|
}
|
|
|
|
actual = tty->ops->write(tty, sl->xhead, sl->xleft);
|
|
sl->xleft -= actual;
|
|
sl->xhead += actual;
|
|
}
|
|
|
|
static void x25_asy_timeout(struct net_device *dev, unsigned int txqueue)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
|
|
spin_lock(&sl->lock);
|
|
if (netif_queue_stopped(dev)) {
|
|
/* May be we must check transmitter timeout here ?
|
|
* 14 Oct 1994 Dmitry Gorodchanin.
|
|
*/
|
|
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);
|
|
}
|
|
spin_unlock(&sl->lock);
|
|
}
|
|
|
|
/* Encapsulate an IP datagram and kick it into a TTY queue. */
|
|
|
|
static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
|
|
struct net_device *dev)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
int err;
|
|
|
|
if (!netif_running(sl->dev)) {
|
|
netdev_err(dev, "xmit call when iface is down\n");
|
|
kfree_skb(skb);
|
|
return NETDEV_TX_OK;
|
|
}
|
|
|
|
switch (skb->data[0]) {
|
|
case X25_IFACE_DATA:
|
|
break;
|
|
case X25_IFACE_CONNECT: /* Connection request .. do nothing */
|
|
err = lapb_connect_request(dev);
|
|
if (err != LAPB_OK)
|
|
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)
|
|
netdev_err(dev, "lapb_disconnect_request error: %d\n",
|
|
err);
|
|
/* fall through */
|
|
default:
|
|
kfree_skb(skb);
|
|
return NETDEV_TX_OK;
|
|
}
|
|
skb_pull(skb, 1); /* Remove control byte */
|
|
/*
|
|
* If we are busy already- too bad. We ought to be able
|
|
* to queue things at this point, to allow for a little
|
|
* frame buffer. Oh well...
|
|
* -----------------------------------------------------
|
|
* I hate queues in X.25 driver. May be it's efficient,
|
|
* but for me latency is more important. ;)
|
|
* So, no queues !
|
|
* 14 Oct 1994 Dmitry Gorodchanin.
|
|
*/
|
|
|
|
err = lapb_data_request(dev, skb);
|
|
if (err != LAPB_OK) {
|
|
netdev_err(dev, "lapb_data_request error: %d\n", err);
|
|
kfree_skb(skb);
|
|
return NETDEV_TX_OK;
|
|
}
|
|
return NETDEV_TX_OK;
|
|
}
|
|
|
|
|
|
/*
|
|
* LAPB interface boilerplate
|
|
*/
|
|
|
|
/*
|
|
* Called when I frame data arrives. We did the work above - throw it
|
|
* at the net layer.
|
|
*/
|
|
|
|
static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb)
|
|
{
|
|
return netif_rx(skb);
|
|
}
|
|
|
|
/*
|
|
* Data has emerged from the LAPB protocol machine. We don't handle
|
|
* busy cases too well. Its tricky to see how to do this nicely -
|
|
* perhaps lapb should allow us to bounce this ?
|
|
*/
|
|
|
|
static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
|
|
spin_lock(&sl->lock);
|
|
if (netif_queue_stopped(sl->dev) || sl->tty == NULL) {
|
|
spin_unlock(&sl->lock);
|
|
netdev_err(dev, "tbusy drop\n");
|
|
kfree_skb(skb);
|
|
return;
|
|
}
|
|
/* We were not busy, so we are now... :-) */
|
|
if (skb != NULL) {
|
|
x25_asy_lock(sl);
|
|
dev->stats.tx_bytes += skb->len;
|
|
x25_asy_encaps(sl, skb->data, skb->len);
|
|
dev_kfree_skb(skb);
|
|
}
|
|
spin_unlock(&sl->lock);
|
|
}
|
|
|
|
/*
|
|
* LAPB connection establish/down information.
|
|
*/
|
|
|
|
static void x25_asy_connected(struct net_device *dev, int reason)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
struct sk_buff *skb;
|
|
unsigned char *ptr;
|
|
|
|
skb = dev_alloc_skb(1);
|
|
if (skb == NULL) {
|
|
netdev_err(dev, "out of memory\n");
|
|
return;
|
|
}
|
|
|
|
ptr = skb_put(skb, 1);
|
|
*ptr = X25_IFACE_CONNECT;
|
|
|
|
skb->protocol = x25_type_trans(skb, sl->dev);
|
|
netif_rx(skb);
|
|
}
|
|
|
|
static void x25_asy_disconnected(struct net_device *dev, int reason)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
struct sk_buff *skb;
|
|
unsigned char *ptr;
|
|
|
|
skb = dev_alloc_skb(1);
|
|
if (skb == NULL) {
|
|
netdev_err(dev, "out of memory\n");
|
|
return;
|
|
}
|
|
|
|
ptr = skb_put(skb, 1);
|
|
*ptr = X25_IFACE_DISCONNECT;
|
|
|
|
skb->protocol = x25_type_trans(skb, sl->dev);
|
|
netif_rx(skb);
|
|
}
|
|
|
|
static const struct lapb_register_struct x25_asy_callbacks = {
|
|
.connect_confirmation = x25_asy_connected,
|
|
.connect_indication = x25_asy_connected,
|
|
.disconnect_confirmation = x25_asy_disconnected,
|
|
.disconnect_indication = x25_asy_disconnected,
|
|
.data_indication = x25_asy_data_indication,
|
|
.data_transmit = x25_asy_data_transmit,
|
|
};
|
|
|
|
|
|
/* Open the low-level part of the X.25 channel. Easy! */
|
|
static int x25_asy_open(struct net_device *dev)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
unsigned long len;
|
|
int err;
|
|
|
|
if (sl->tty == NULL)
|
|
return -ENODEV;
|
|
|
|
/*
|
|
* Allocate the X.25 frame buffers:
|
|
*
|
|
* rbuff Receive buffer.
|
|
* xbuff Transmit buffer.
|
|
*/
|
|
|
|
len = dev->mtu * 2;
|
|
|
|
sl->rbuff = kmalloc(len + 4, GFP_KERNEL);
|
|
if (sl->rbuff == NULL)
|
|
goto norbuff;
|
|
sl->xbuff = kmalloc(len + 4, GFP_KERNEL);
|
|
if (sl->xbuff == NULL)
|
|
goto noxbuff;
|
|
|
|
sl->buffsize = len;
|
|
sl->rcount = 0;
|
|
sl->xleft = 0;
|
|
sl->flags &= (1 << SLF_INUSE); /* Clear ESCAPE & ERROR flags */
|
|
|
|
netif_start_queue(dev);
|
|
|
|
/*
|
|
* Now attach LAPB
|
|
*/
|
|
err = lapb_register(dev, &x25_asy_callbacks);
|
|
if (err == LAPB_OK)
|
|
return 0;
|
|
|
|
/* Cleanup */
|
|
kfree(sl->xbuff);
|
|
sl->xbuff = NULL;
|
|
noxbuff:
|
|
kfree(sl->rbuff);
|
|
sl->rbuff = NULL;
|
|
norbuff:
|
|
return -ENOMEM;
|
|
}
|
|
|
|
|
|
/* Close the low-level part of the X.25 channel. Easy! */
|
|
static int x25_asy_close(struct net_device *dev)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
|
|
spin_lock(&sl->lock);
|
|
if (sl->tty)
|
|
clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
|
|
|
|
netif_stop_queue(dev);
|
|
sl->rcount = 0;
|
|
sl->xleft = 0;
|
|
spin_unlock(&sl->lock);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Handle the 'receiver data ready' interrupt.
|
|
* This function is called by the 'tty_io' module in the kernel when
|
|
* a block of X.25 data has been received, which can now be decapsulated
|
|
* and sent on to some IP layer for further processing.
|
|
*/
|
|
|
|
static void x25_asy_receive_buf(struct tty_struct *tty,
|
|
const unsigned char *cp, char *fp, int count)
|
|
{
|
|
struct x25_asy *sl = tty->disc_data;
|
|
|
|
if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev))
|
|
return;
|
|
|
|
|
|
/* Read the characters out of the buffer */
|
|
while (count--) {
|
|
if (fp && *fp++) {
|
|
if (!test_and_set_bit(SLF_ERROR, &sl->flags))
|
|
sl->dev->stats.rx_errors++;
|
|
cp++;
|
|
continue;
|
|
}
|
|
x25_asy_unesc(sl, *cp++);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Open the high-level part of the X.25 channel.
|
|
* This function is called by the TTY module when the
|
|
* X.25 line discipline is called for. Because we are
|
|
* sure the tty line exists, we only have to link it to
|
|
* a free X.25 channel...
|
|
*/
|
|
|
|
static int x25_asy_open_tty(struct tty_struct *tty)
|
|
{
|
|
struct x25_asy *sl;
|
|
int err;
|
|
|
|
if (tty->ops->write == NULL)
|
|
return -EOPNOTSUPP;
|
|
|
|
/* OK. Find a free X.25 channel to use. */
|
|
sl = x25_asy_alloc();
|
|
if (sl == NULL)
|
|
return -ENFILE;
|
|
|
|
sl->tty = tty;
|
|
tty->disc_data = sl;
|
|
tty->receive_room = 65536;
|
|
tty_driver_flush_buffer(tty);
|
|
tty_ldisc_flush(tty);
|
|
|
|
/* Restore default settings */
|
|
sl->dev->type = ARPHRD_X25;
|
|
|
|
/* Perform the low-level X.25 async init */
|
|
err = x25_asy_open(sl->dev);
|
|
if (err) {
|
|
x25_asy_free(sl);
|
|
return err;
|
|
}
|
|
/* Done. We have linked the TTY line to a channel. */
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
* Close down an X.25 channel.
|
|
* This means flushing out any pending queues, and then restoring the
|
|
* TTY line discipline to what it was before it got hooked to X.25
|
|
* (which usually is TTY again).
|
|
*/
|
|
static void x25_asy_close_tty(struct tty_struct *tty)
|
|
{
|
|
struct x25_asy *sl = tty->disc_data;
|
|
int err;
|
|
|
|
/* First make sure we're connected. */
|
|
if (!sl || sl->magic != X25_ASY_MAGIC)
|
|
return;
|
|
|
|
rtnl_lock();
|
|
if (sl->dev->flags & IFF_UP)
|
|
dev_close(sl->dev);
|
|
rtnl_unlock();
|
|
|
|
err = lapb_unregister(sl->dev);
|
|
if (err != LAPB_OK)
|
|
pr_err("%s: lapb_unregister error: %d\n",
|
|
__func__, err);
|
|
|
|
tty->disc_data = NULL;
|
|
sl->tty = NULL;
|
|
x25_asy_free(sl);
|
|
}
|
|
|
|
/************************************************************************
|
|
* STANDARD X.25 ENCAPSULATION *
|
|
************************************************************************/
|
|
|
|
static int x25_asy_esc(unsigned char *s, unsigned char *d, int len)
|
|
{
|
|
unsigned char *ptr = d;
|
|
unsigned char c;
|
|
|
|
/*
|
|
* Send an initial END character to flush out any
|
|
* data that may have accumulated in the receiver
|
|
* due to line noise.
|
|
*/
|
|
|
|
*ptr++ = X25_END; /* Send 10111110 bit seq */
|
|
|
|
/*
|
|
* For each byte in the packet, send the appropriate
|
|
* character sequence, according to the X.25 protocol.
|
|
*/
|
|
|
|
while (len-- > 0) {
|
|
switch (c = *s++) {
|
|
case X25_END:
|
|
*ptr++ = X25_ESC;
|
|
*ptr++ = X25_ESCAPE(X25_END);
|
|
break;
|
|
case X25_ESC:
|
|
*ptr++ = X25_ESC;
|
|
*ptr++ = X25_ESCAPE(X25_ESC);
|
|
break;
|
|
default:
|
|
*ptr++ = c;
|
|
break;
|
|
}
|
|
}
|
|
*ptr++ = X25_END;
|
|
return ptr - d;
|
|
}
|
|
|
|
static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)
|
|
{
|
|
|
|
switch (s) {
|
|
case X25_END:
|
|
if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
|
|
sl->rcount > 2)
|
|
x25_asy_bump(sl);
|
|
clear_bit(SLF_ESCAPE, &sl->flags);
|
|
sl->rcount = 0;
|
|
return;
|
|
case X25_ESC:
|
|
set_bit(SLF_ESCAPE, &sl->flags);
|
|
return;
|
|
case X25_ESCAPE(X25_ESC):
|
|
case X25_ESCAPE(X25_END):
|
|
if (test_and_clear_bit(SLF_ESCAPE, &sl->flags))
|
|
s = X25_UNESCAPE(s);
|
|
break;
|
|
}
|
|
if (!test_bit(SLF_ERROR, &sl->flags)) {
|
|
if (sl->rcount < sl->buffsize) {
|
|
sl->rbuff[sl->rcount++] = s;
|
|
return;
|
|
}
|
|
sl->dev->stats.rx_over_errors++;
|
|
set_bit(SLF_ERROR, &sl->flags);
|
|
}
|
|
}
|
|
|
|
|
|
/* Perform I/O control on an active X.25 channel. */
|
|
static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
|
|
unsigned int cmd, unsigned long arg)
|
|
{
|
|
struct x25_asy *sl = tty->disc_data;
|
|
|
|
/* First make sure we're connected. */
|
|
if (!sl || sl->magic != X25_ASY_MAGIC)
|
|
return -EINVAL;
|
|
|
|
switch (cmd) {
|
|
case SIOCGIFNAME:
|
|
if (copy_to_user((void __user *)arg, sl->dev->name,
|
|
strlen(sl->dev->name) + 1))
|
|
return -EFAULT;
|
|
return 0;
|
|
case SIOCSIFHWADDR:
|
|
return -EINVAL;
|
|
default:
|
|
return tty_mode_ioctl(tty, file, cmd, arg);
|
|
}
|
|
}
|
|
|
|
static int x25_asy_open_dev(struct net_device *dev)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
if (sl->tty == NULL)
|
|
return -ENODEV;
|
|
return 0;
|
|
}
|
|
|
|
static const struct net_device_ops x25_asy_netdev_ops = {
|
|
.ndo_open = x25_asy_open_dev,
|
|
.ndo_stop = x25_asy_close,
|
|
.ndo_start_xmit = x25_asy_xmit,
|
|
.ndo_tx_timeout = x25_asy_timeout,
|
|
.ndo_change_mtu = x25_asy_change_mtu,
|
|
};
|
|
|
|
/* Initialise the X.25 driver. Called by the device init code */
|
|
static void x25_asy_setup(struct net_device *dev)
|
|
{
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
|
|
sl->magic = X25_ASY_MAGIC;
|
|
sl->dev = dev;
|
|
spin_lock_init(&sl->lock);
|
|
set_bit(SLF_INUSE, &sl->flags);
|
|
|
|
/*
|
|
* Finish setting up the DEVICE info.
|
|
*/
|
|
|
|
dev->mtu = SL_MTU;
|
|
dev->min_mtu = 0;
|
|
dev->max_mtu = 65534;
|
|
dev->netdev_ops = &x25_asy_netdev_ops;
|
|
dev->watchdog_timeo = HZ*20;
|
|
dev->hard_header_len = 0;
|
|
dev->addr_len = 0;
|
|
dev->type = ARPHRD_X25;
|
|
dev->tx_queue_len = 10;
|
|
|
|
/* New-style flags. */
|
|
dev->flags = IFF_NOARP;
|
|
}
|
|
|
|
static struct tty_ldisc_ops x25_ldisc = {
|
|
.owner = THIS_MODULE,
|
|
.magic = TTY_LDISC_MAGIC,
|
|
.name = "X.25",
|
|
.open = x25_asy_open_tty,
|
|
.close = x25_asy_close_tty,
|
|
.ioctl = x25_asy_ioctl,
|
|
.receive_buf = x25_asy_receive_buf,
|
|
.write_wakeup = x25_asy_write_wakeup,
|
|
};
|
|
|
|
static int __init init_x25_asy(void)
|
|
{
|
|
if (x25_asy_maxdev < 4)
|
|
x25_asy_maxdev = 4; /* Sanity */
|
|
|
|
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)
|
|
return -ENOMEM;
|
|
|
|
return tty_register_ldisc(N_X25, &x25_ldisc);
|
|
}
|
|
|
|
|
|
static void __exit exit_x25_asy(void)
|
|
{
|
|
struct net_device *dev;
|
|
int i;
|
|
|
|
for (i = 0; i < x25_asy_maxdev; i++) {
|
|
dev = x25_asy_devs[i];
|
|
if (dev) {
|
|
struct x25_asy *sl = netdev_priv(dev);
|
|
|
|
spin_lock_bh(&sl->lock);
|
|
if (sl->tty)
|
|
tty_hangup(sl->tty);
|
|
|
|
spin_unlock_bh(&sl->lock);
|
|
/*
|
|
* VSV = if dev->start==0, then device
|
|
* unregistered while close proc.
|
|
*/
|
|
unregister_netdev(dev);
|
|
free_netdev(dev);
|
|
}
|
|
}
|
|
|
|
kfree(x25_asy_devs);
|
|
tty_unregister_ldisc(N_X25);
|
|
}
|
|
|
|
module_init(init_x25_asy);
|
|
module_exit(exit_x25_asy);
|