Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Thu, 19 Jul 2012 18:17:30 +0000 (11:17 -0700)]
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

1254 files changed:
Documentation/connector/cn_test.c
Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt [new file with mode: 0644]
Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
Documentation/devicetree/bindings/net/davinci_emac.txt [new file with mode: 0644]
Documentation/devicetree/bindings/net/fsl-fec.txt
Documentation/devicetree/bindings/net/phy.txt
Documentation/devicetree/bindings/net/stmmac.txt
Documentation/feature-removal-schedule.txt
Documentation/networking/batman-adv.txt
Documentation/networking/bridge.txt
Documentation/networking/caif/Linux-CAIF.txt
Documentation/networking/can.txt
Documentation/networking/ip-sysctl.txt
Documentation/networking/s2io.txt
Documentation/networking/stmmac.txt
Documentation/networking/vxge.txt
Documentation/nfc/nfc-hci.txt
MAINTAINERS
arch/blackfin/mach-bf537/boards/stamp.c
arch/c6x/kernel/soc.c
arch/m68k/include/asm/mcf8390.h [new file with mode: 0644]
arch/m68k/include/asm/mcfne.h [deleted file]
arch/mips/ar7/platform.c
arch/mips/powertv/powertv_setup.c
arch/sparc/net/bpf_jit_comp.c
arch/um/drivers/net_kern.c
arch/x86/net/bpf_jit_comp.c
crypto/crypto_user.c
drivers/bcma/bcma_private.h
drivers/bcma/core.c
drivers/bcma/driver_chipcommon.c
drivers/bcma/driver_chipcommon_pmu.c
drivers/bcma/driver_mips.c
drivers/bcma/driver_pci_host.c
drivers/bcma/host_pci.c
drivers/bcma/main.c
drivers/bcma/scan.c
drivers/bcma/sprom.c
drivers/bluetooth/bluecard_cs.c
drivers/bluetooth/bpa10x.c
drivers/bluetooth/bt3c_cs.c
drivers/bluetooth/btmrvl_sdio.c
drivers/bluetooth/btuart_cs.c
drivers/bluetooth/btusb.c
drivers/bluetooth/dtl1_cs.c
drivers/bluetooth/hci_bcsp.c
drivers/bluetooth/hci_h4.c
drivers/bluetooth/hci_ldisc.c
drivers/bluetooth/hci_ll.c
drivers/connector/cn_proc.c
drivers/connector/cn_queue.c
drivers/connector/connector.c
drivers/ieee802154/Kconfig
drivers/ieee802154/Makefile
drivers/ieee802154/at86rf230.c [new file with mode: 0644]
drivers/infiniband/core/netlink.c
drivers/infiniband/hw/cxgb3/iwch_cm.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx4/mlx4_ib.h
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/ulp/ipoib/ipoib_cm.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
drivers/isdn/gigaset/capi.c
drivers/isdn/hardware/mISDN/hfcsusb.c
drivers/isdn/hisax/hfc_usb.c
drivers/isdn/hisax/isurf.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/misc/iwmc3200top/Kconfig [deleted file]
drivers/misc/iwmc3200top/Makefile [deleted file]
drivers/misc/iwmc3200top/debugfs.c [deleted file]
drivers/misc/iwmc3200top/debugfs.h [deleted file]
drivers/misc/iwmc3200top/fw-download.c [deleted file]
drivers/misc/iwmc3200top/fw-msg.h [deleted file]
drivers/misc/iwmc3200top/iwmc3200top.h [deleted file]
drivers/misc/iwmc3200top/log.c [deleted file]
drivers/misc/iwmc3200top/log.h [deleted file]
drivers/misc/iwmc3200top/main.c [deleted file]
drivers/net/appletalk/cops.c
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_main.c
drivers/net/bonding/bonding.h
drivers/net/caif/caif_hsi.c
drivers/net/can/bfin_can.c
drivers/net/can/c_can/Kconfig
drivers/net/can/c_can/Makefile
drivers/net/can/c_can/c_can.c
drivers/net/can/c_can/c_can.h
drivers/net/can/c_can/c_can_pci.c [new file with mode: 0644]
drivers/net/can/c_can/c_can_platform.c
drivers/net/can/cc770/cc770.c
drivers/net/can/dev.c
drivers/net/can/flexcan.c
drivers/net/can/mcp251x.c
drivers/net/can/mscan/mpc5xxx_can.c
drivers/net/can/softing/softing_main.c
drivers/net/can/vcan.c
drivers/net/cris/eth_v10.c
drivers/net/dummy.c
drivers/net/ethernet/3com/3c501.c
drivers/net/ethernet/8390/Kconfig
drivers/net/ethernet/8390/Makefile
drivers/net/ethernet/8390/apne.c
drivers/net/ethernet/8390/mcf8390.c [new file with mode: 0644]
drivers/net/ethernet/aeroflex/greth.c
drivers/net/ethernet/amd/declance.c
drivers/net/ethernet/amd/lance.c
drivers/net/ethernet/apple/macmace.c
drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
drivers/net/ethernet/atheros/atl1e/atl1e_main.c
drivers/net/ethernet/atheros/atl1e/atl1e_param.c
drivers/net/ethernet/atheros/atlx/atl1.c
drivers/net/ethernet/atheros/atlx/atl2.c
drivers/net/ethernet/atheros/atlx/atlx.c
drivers/net/ethernet/broadcom/b44.c
drivers/net/ethernet/broadcom/b44.h
drivers/net/ethernet/broadcom/bnx2.c
drivers/net/ethernet/broadcom/bnx2.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h [new file with mode: 0644]
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
drivers/net/ethernet/broadcom/cnic.c
drivers/net/ethernet/broadcom/cnic_if.h
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/broadcom/tg3.h
drivers/net/ethernet/brocade/bna/bfa_cee.c
drivers/net/ethernet/brocade/bna/bfa_cs.h
drivers/net/ethernet/brocade/bna/bfa_defs.h
drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
drivers/net/ethernet/brocade/bna/bfa_defs_status.h
drivers/net/ethernet/brocade/bna/bfa_ioc.c
drivers/net/ethernet/brocade/bna/bfa_ioc.h
drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
drivers/net/ethernet/brocade/bna/bfa_msgq.c
drivers/net/ethernet/brocade/bna/bfi.h
drivers/net/ethernet/brocade/bna/bfi_cna.h
drivers/net/ethernet/brocade/bna/bfi_enet.h
drivers/net/ethernet/brocade/bna/bfi_reg.h
drivers/net/ethernet/brocade/bna/bna.h
drivers/net/ethernet/brocade/bna/bna_enet.c
drivers/net/ethernet/brocade/bna/bna_hw_defs.h
drivers/net/ethernet/brocade/bna/bna_tx_rx.c
drivers/net/ethernet/brocade/bna/bna_types.h
drivers/net/ethernet/brocade/bna/bnad.c
drivers/net/ethernet/brocade/bna/bnad.h
drivers/net/ethernet/brocade/bna/cna_fwimg.c
drivers/net/ethernet/cadence/macb.c
drivers/net/ethernet/calxeda/xgmac.c
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
drivers/net/ethernet/chelsio/cxgb3/l2t.c
drivers/net/ethernet/chelsio/cxgb3/l2t.h
drivers/net/ethernet/chelsio/cxgb3/sge.c
drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/chelsio/cxgb4/sge.c
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/net/ethernet/cisco/enic/enic_main.c
drivers/net/ethernet/dec/tulip/de4x5.c
drivers/net/ethernet/emulex/benet/be.h
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_cmds.h
drivers/net/ethernet/emulex/benet/be_ethtool.c
drivers/net/ethernet/emulex/benet/be_hw.h
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/ethoc.c
drivers/net/ethernet/faraday/ftgmac100.c
drivers/net/ethernet/faraday/ftmac100.c
drivers/net/ethernet/freescale/fec.c
drivers/net/ethernet/freescale/fsl_pq_mdio.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/freescale/gianfar_ethtool.c
drivers/net/ethernet/freescale/ucc_geth.c
drivers/net/ethernet/hp/hp100.c
drivers/net/ethernet/i825xx/lp486e.c
drivers/net/ethernet/i825xx/sun3_82586.c
drivers/net/ethernet/ibm/ehea/ehea_qmr.c
drivers/net/ethernet/intel/e100.c
drivers/net/ethernet/intel/e1000/e1000_hw.c
drivers/net/ethernet/intel/e1000/e1000_main.c
drivers/net/ethernet/intel/e1000e/82571.c
drivers/net/ethernet/intel/e1000e/e1000.h
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/e1000e/param.c
drivers/net/ethernet/intel/igb/e1000_regs.h
drivers/net/ethernet/intel/igb/igb.h
drivers/net/ethernet/intel/igb/igb_ethtool.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/igb/igb_ptp.c
drivers/net/ethernet/intel/igbvf/netdev.c
drivers/net/ethernet/intel/igbvf/vf.c
drivers/net/ethernet/intel/ixgb/ixgb_main.c
drivers/net/ethernet/intel/ixgbe/Makefile
drivers/net/ethernet/intel/ixgbe/ixgbe.h
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
drivers/net/ethernet/intel/ixgbevf/defines.h
drivers/net/ethernet/intel/ixgbevf/ethtool.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/jme.c
drivers/net/ethernet/lantiq_etop.c
drivers/net/ethernet/marvell/mv643xx_eth.c
drivers/net/ethernet/marvell/pxa168_eth.c
drivers/net/ethernet/marvell/sky2.c
drivers/net/ethernet/marvell/sky2.h
drivers/net/ethernet/mellanox/mlx4/cmd.c
drivers/net/ethernet/mellanox/mlx4/en_cq.c
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/ethernet/mellanox/mlx4/en_rx.c
drivers/net/ethernet/mellanox/mlx4/eq.c
drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/mellanox/mlx4/fw.h
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/mcg.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
drivers/net/ethernet/mellanox/mlx4/port.c
drivers/net/ethernet/mellanox/mlx4/profile.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
drivers/net/ethernet/micrel/ks8851.c
drivers/net/ethernet/micrel/ks8851_mll.c
drivers/net/ethernet/micrel/ksz884x.c
drivers/net/ethernet/myricom/myri10ge/myri10ge.c
drivers/net/ethernet/neterion/s2io.c
drivers/net/ethernet/neterion/vxge/vxge-config.c
drivers/net/ethernet/neterion/vxge/vxge-config.h
drivers/net/ethernet/neterion/vxge/vxge-main.c
drivers/net/ethernet/neterion/vxge/vxge-main.h
drivers/net/ethernet/neterion/vxge/vxge-traffic.c
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/ethernet/nxp/lpc_eth.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
drivers/net/ethernet/qlogic/netxen/netxen_nic.h
drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/net/ethernet/qlogic/qlge/qlge.h
drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
drivers/net/ethernet/qlogic/qlge/qlge_main.c
drivers/net/ethernet/rdc/r6040.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/renesas/sh_eth.h
drivers/net/ethernet/sfc/efx.c
drivers/net/ethernet/sfc/enum.h
drivers/net/ethernet/sfc/ethtool.c
drivers/net/ethernet/sfc/falcon.c
drivers/net/ethernet/sfc/falcon_xmac.c
drivers/net/ethernet/sfc/filter.c
drivers/net/ethernet/sfc/mcdi.c
drivers/net/ethernet/sfc/mcdi_mon.c
drivers/net/ethernet/sfc/mcdi_pcol.h
drivers/net/ethernet/sfc/net_driver.h
drivers/net/ethernet/sfc/nic.c
drivers/net/ethernet/sfc/nic.h
drivers/net/ethernet/sfc/rx.c
drivers/net/ethernet/sfc/selftest.c
drivers/net/ethernet/sfc/siena.c
drivers/net/ethernet/sfc/tx.c
drivers/net/ethernet/sgi/ioc3-eth.c
drivers/net/ethernet/smsc/smc911x.c
drivers/net/ethernet/smsc/smc91x.c
drivers/net/ethernet/smsc/smsc911x.c
drivers/net/ethernet/smsc/smsc9420.c
drivers/net/ethernet/stmicro/stmmac/common.h
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
drivers/net/ethernet/stmicro/stmmac/stmmac.h
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
drivers/net/ethernet/sun/sunbmac.c
drivers/net/ethernet/sun/sungem.c
drivers/net/ethernet/sun/sunhme.c
drivers/net/ethernet/sun/sunqe.c
drivers/net/ethernet/tehuti/tehuti.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/ethernet/ti/davinci_emac.c
drivers/net/ethernet/ti/davinci_mdio.c
drivers/net/ethernet/tile/tilegx.c
drivers/net/ethernet/toshiba/spider_net.c
drivers/net/ethernet/via/via-velocity.c
drivers/net/ethernet/wiznet/w5100.c
drivers/net/ethernet/wiznet/w5300.c
drivers/net/ethernet/xilinx/ll_temac_main.c
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
drivers/net/fddi/defxx.c
drivers/net/fddi/skfp/pmf.c
drivers/net/hamradio/mkiss.c
drivers/net/hyperv/hyperv_net.h
drivers/net/hyperv/netvsc.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/hyperv/rndis_filter.c
drivers/net/irda/ali-ircc.c
drivers/net/irda/au1k_ir.c
drivers/net/macvtap.c
drivers/net/phy/Kconfig
drivers/net/phy/Makefile
drivers/net/phy/amd.c
drivers/net/phy/bcm63xx.c
drivers/net/phy/bcm87xx.c [new file with mode: 0644]
drivers/net/phy/broadcom.c
drivers/net/phy/cicada.c
drivers/net/phy/davicom.c
drivers/net/phy/dp83640.c
drivers/net/phy/fixed.c
drivers/net/phy/icplus.c
drivers/net/phy/lxt.c
drivers/net/phy/marvell.c
drivers/net/phy/mdio_bus.c
drivers/net/phy/micrel.c
drivers/net/phy/national.c
drivers/net/phy/phy.c
drivers/net/phy/phy_device.c
drivers/net/phy/realtek.c
drivers/net/phy/smsc.c
drivers/net/phy/spi_ks8995.c
drivers/net/phy/ste10Xp.c
drivers/net/phy/vitesse.c
drivers/net/slip/slip.c
drivers/net/team/Kconfig
drivers/net/team/Makefile
drivers/net/team/team.c
drivers/net/team/team_mode_activebackup.c
drivers/net/team/team_mode_broadcast.c [new file with mode: 0644]
drivers/net/team/team_mode_loadbalance.c
drivers/net/team/team_mode_roundrobin.c
drivers/net/tun.c
drivers/net/usb/Kconfig
drivers/net/usb/Makefile
drivers/net/usb/asix.c [deleted file]
drivers/net/usb/asix.h [new file with mode: 0644]
drivers/net/usb/asix_common.c [new file with mode: 0644]
drivers/net/usb/asix_devices.c [new file with mode: 0644]
drivers/net/usb/ax88172a.c [new file with mode: 0644]
drivers/net/usb/cdc-phonet.c
drivers/net/usb/pegasus.c
drivers/net/usb/qmi_wwan.c
drivers/net/usb/smsc75xx.c
drivers/net/usb/smsc95xx.c
drivers/net/usb/usbnet.c
drivers/net/virtio_net.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/wan/x25_asy.c
drivers/net/wimax/i2400m/Kconfig
drivers/net/wimax/i2400m/Makefile
drivers/net/wimax/i2400m/driver.c
drivers/net/wimax/i2400m/fw.c
drivers/net/wimax/i2400m/i2400m-sdio.h [deleted file]
drivers/net/wimax/i2400m/i2400m.h
drivers/net/wimax/i2400m/sdio-debug-levels.h [deleted file]
drivers/net/wimax/i2400m/sdio-fw.c [deleted file]
drivers/net/wimax/i2400m/sdio-rx.c [deleted file]
drivers/net/wimax/i2400m/sdio-tx.c [deleted file]
drivers/net/wimax/i2400m/sdio.c [deleted file]
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/net/wireless/adm8211.c
drivers/net/wireless/airo.c
drivers/net/wireless/ath/ath5k/Kconfig
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/cfg80211.h
drivers/net/wireless/ath/ath6kl/core.h
drivers/net/wireless/ath/ath6kl/htc_mbox.c
drivers/net/wireless/ath/ath6kl/init.c
drivers/net/wireless/ath/ath6kl/main.c
drivers/net/wireless/ath/ath6kl/target.h
drivers/net/wireless/ath/ath6kl/txrx.c
drivers/net/wireless/ath/ath6kl/wmi.c
drivers/net/wireless/ath/ath6kl/wmi.h
drivers/net/wireless/ath/ath9k/Makefile
drivers/net/wireless/ath/ath9k/ahb.c
drivers/net/wireless/ath/ath9k/ani.c
drivers/net/wireless/ath/ath9k/ani.h
drivers/net/wireless/ath/ath9k/antenna.c [new file with mode: 0644]
drivers/net/wireless/ath/ath9k/ar5008_phy.c
drivers/net/wireless/ath/ath9k/ar9002_hw.c
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
drivers/net/wireless/ath/ath9k/ar9003_calib.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/ar9003_hw.c
drivers/net/wireless/ath/ath9k/ar9003_mac.c
drivers/net/wireless/ath/ath9k/ar9003_mci.c
drivers/net/wireless/ath/ath9k/ar9003_mci.h
drivers/net/wireless/ath/ath9k/ar9003_paprd.c
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/ar9003_phy.h
drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
drivers/net/wireless/ath/ath9k/ar9340_initvals.h
drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
drivers/net/wireless/ath/ath9k/ar9485_initvals.h
drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h [new file with mode: 0644]
drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/beacon.c
drivers/net/wireless/ath/ath9k/btcoex.c
drivers/net/wireless/ath/ath9k/btcoex.h
drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.h
drivers/net/wireless/ath/ath9k/eeprom_4k.c
drivers/net/wireless/ath/ath9k/eeprom_9287.c
drivers/net/wireless/ath/ath9k/eeprom_def.c
drivers/net/wireless/ath/ath9k/gpio.c
drivers/net/wireless/ath/ath9k/htc.h
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/link.c [new file with mode: 0644]
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/ath/ath9k/mac.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/mci.c
drivers/net/wireless/ath/ath9k/mci.h
drivers/net/wireless/ath/ath9k/pci.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/reg.h
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ath/carl9170/carl9170.h
drivers/net/wireless/ath/carl9170/cmd.c
drivers/net/wireless/ath/carl9170/fw.c
drivers/net/wireless/ath/carl9170/fwdesc.h
drivers/net/wireless/ath/carl9170/main.c
drivers/net/wireless/ath/carl9170/rx.c
drivers/net/wireless/ath/carl9170/tx.c
drivers/net/wireless/ath/carl9170/version.h
drivers/net/wireless/atmel.c
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/b43legacy/dma.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/b43legacy/xmit.c
drivers/net/wireless/brcm80211/brcmfmac/Makefile
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/net/wireless/brcm80211/brcmfmac/dhd.h
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c [new file with mode: 0644]
drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
drivers/net/wireless/brcm80211/brcmsmac/channel.c
drivers/net/wireless/brcm80211/brcmsmac/channel.h
drivers/net/wireless/brcm80211/brcmsmac/dma.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
drivers/net/wireless/brcm80211/brcmsmac/pmu.c
drivers/net/wireless/brcm80211/brcmsmac/pmu.h
drivers/net/wireless/brcm80211/brcmsmac/pub.h
drivers/net/wireless/brcm80211/brcmutil/utils.c
drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
drivers/net/wireless/brcm80211/include/soc.h
drivers/net/wireless/hostap/hostap_proc.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlegacy/3945-rs.c
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/iwlegacy/common.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/Makefile
drivers/net/wireless/iwlwifi/dvm/Makefile [new file with mode: 0644]
drivers/net/wireless/iwlwifi/dvm/agn.h [moved from drivers/net/wireless/iwlwifi/iwl-agn.h with 80% similarity]
drivers/net/wireless/iwlwifi/dvm/calib.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-calib.c with 98% similarity]
drivers/net/wireless/iwlwifi/dvm/calib.h [copied from drivers/net/wireless/iwlwifi/iwl-agn-calib.h with 98% similarity]
drivers/net/wireless/iwlwifi/dvm/commands.h [moved from drivers/net/wireless/iwlwifi/iwl-commands.h with 99% similarity]
drivers/net/wireless/iwlwifi/dvm/debugfs.c [moved from drivers/net/wireless/iwlwifi/iwl-debugfs.c with 99% similarity]
drivers/net/wireless/iwlwifi/dvm/dev.h [moved from drivers/net/wireless/iwlwifi/iwl-dev.h with 81% similarity]
drivers/net/wireless/iwlwifi/dvm/devices.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-devices.c with 75% similarity]
drivers/net/wireless/iwlwifi/dvm/led.c [moved from drivers/net/wireless/iwlwifi/iwl-led.c with 99% similarity]
drivers/net/wireless/iwlwifi/dvm/led.h [moved from drivers/net/wireless/iwlwifi/iwl-led.h with 100% similarity]
drivers/net/wireless/iwlwifi/dvm/lib.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-lib.c with 98% similarity]
drivers/net/wireless/iwlwifi/dvm/mac80211.c [moved from drivers/net/wireless/iwlwifi/iwl-mac80211.c with 90% similarity]
drivers/net/wireless/iwlwifi/dvm/main.c [moved from drivers/net/wireless/iwlwifi/iwl-agn.c with 84% similarity]
drivers/net/wireless/iwlwifi/dvm/power.c [moved from drivers/net/wireless/iwlwifi/iwl-power.c with 99% similarity]
drivers/net/wireless/iwlwifi/dvm/power.h [moved from drivers/net/wireless/iwlwifi/iwl-power.h with 98% similarity]
drivers/net/wireless/iwlwifi/dvm/rs.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-rs.c with 98% similarity]
drivers/net/wireless/iwlwifi/dvm/rs.h [moved from drivers/net/wireless/iwlwifi/iwl-agn-rs.h with 99% similarity]
drivers/net/wireless/iwlwifi/dvm/rx.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-rx.c with 97% similarity]
drivers/net/wireless/iwlwifi/dvm/rxon.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-rxon.c with 97% similarity]
drivers/net/wireless/iwlwifi/dvm/scan.c [moved from drivers/net/wireless/iwlwifi/iwl-scan.c with 89% similarity]
drivers/net/wireless/iwlwifi/dvm/sta.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-sta.c with 97% similarity]
drivers/net/wireless/iwlwifi/dvm/testmode.c [new file with mode: 0644]
drivers/net/wireless/iwlwifi/dvm/tt.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-tt.c with 99% similarity]
drivers/net/wireless/iwlwifi/dvm/tt.h [moved from drivers/net/wireless/iwlwifi/iwl-agn-tt.h with 99% similarity]
drivers/net/wireless/iwlwifi/dvm/tx.c [moved from drivers/net/wireless/iwlwifi/iwl-agn-tx.c with 96% similarity]
drivers/net/wireless/iwlwifi/dvm/ucode.c [moved from drivers/net/wireless/iwlwifi/iwl-ucode.c with 90% similarity]
drivers/net/wireless/iwlwifi/iwl-config.h
drivers/net/wireless/iwlwifi/iwl-csr.h
drivers/net/wireless/iwlwifi/iwl-debug.c
drivers/net/wireless/iwlwifi/iwl-debug.h
drivers/net/wireless/iwlwifi/iwl-devtrace.c
drivers/net/wireless/iwlwifi/iwl-devtrace.h
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c [new file with mode: 0644]
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h [copied from drivers/net/wireless/iwlwifi/iwl-cfg.h with 55% similarity]
drivers/net/wireless/iwlwifi/iwl-eeprom-read.c [new file with mode: 0644]
drivers/net/wireless/iwlwifi/iwl-eeprom-read.h [moved from drivers/net/wireless/iwlwifi/iwl-agn-calib.h with 89% similarity]
drivers/net/wireless/iwlwifi/iwl-eeprom.c [deleted file]
drivers/net/wireless/iwlwifi/iwl-eeprom.h [deleted file]
drivers/net/wireless/iwlwifi/iwl-fh.h
drivers/net/wireless/iwlwifi/iwl-io.c
drivers/net/wireless/iwlwifi/iwl-io.h
drivers/net/wireless/iwlwifi/iwl-notif-wait.c
drivers/net/wireless/iwlwifi/iwl-op-mode.h
drivers/net/wireless/iwlwifi/iwl-prph.h
drivers/net/wireless/iwlwifi/iwl-test.c [new file with mode: 0644]
drivers/net/wireless/iwlwifi/iwl-test.h [new file with mode: 0644]
drivers/net/wireless/iwlwifi/iwl-testmode.c [deleted file]
drivers/net/wireless/iwlwifi/iwl-trans.h
drivers/net/wireless/iwlwifi/pcie/1000.c [moved from drivers/net/wireless/iwlwifi/iwl-1000.c with 89% similarity]
drivers/net/wireless/iwlwifi/pcie/2000.c [moved from drivers/net/wireless/iwlwifi/iwl-2000.c with 92% similarity]
drivers/net/wireless/iwlwifi/pcie/5000.c [moved from drivers/net/wireless/iwlwifi/iwl-5000.c with 90% similarity]
drivers/net/wireless/iwlwifi/pcie/6000.c [moved from drivers/net/wireless/iwlwifi/iwl-6000.c with 93% similarity]
drivers/net/wireless/iwlwifi/pcie/cfg.h [moved from drivers/net/wireless/iwlwifi/iwl-cfg.h with 100% similarity]
drivers/net/wireless/iwlwifi/pcie/drv.c [moved from drivers/net/wireless/iwlwifi/iwl-pci.c with 99% similarity]
drivers/net/wireless/iwlwifi/pcie/internal.h [moved from drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h with 95% similarity]
drivers/net/wireless/iwlwifi/pcie/rx.c [moved from drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c with 94% similarity]
drivers/net/wireless/iwlwifi/pcie/trans.c [moved from drivers/net/wireless/iwlwifi/iwl-trans-pcie.c with 88% similarity]
drivers/net/wireless/iwlwifi/pcie/tx.c [moved from drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c with 84% similarity]
drivers/net/wireless/iwmc3200wifi/Kconfig [deleted file]
drivers/net/wireless/iwmc3200wifi/Makefile [deleted file]
drivers/net/wireless/iwmc3200wifi/bus.h [deleted file]
drivers/net/wireless/iwmc3200wifi/cfg80211.c [deleted file]
drivers/net/wireless/iwmc3200wifi/cfg80211.h [deleted file]
drivers/net/wireless/iwmc3200wifi/commands.c [deleted file]
drivers/net/wireless/iwmc3200wifi/commands.h [deleted file]
drivers/net/wireless/iwmc3200wifi/debug.h [deleted file]
drivers/net/wireless/iwmc3200wifi/debugfs.c [deleted file]
drivers/net/wireless/iwmc3200wifi/eeprom.c [deleted file]
drivers/net/wireless/iwmc3200wifi/eeprom.h [deleted file]
drivers/net/wireless/iwmc3200wifi/fw.c [deleted file]
drivers/net/wireless/iwmc3200wifi/fw.h [deleted file]
drivers/net/wireless/iwmc3200wifi/hal.c [deleted file]
drivers/net/wireless/iwmc3200wifi/hal.h [deleted file]
drivers/net/wireless/iwmc3200wifi/iwm.h [deleted file]
drivers/net/wireless/iwmc3200wifi/lmac.h [deleted file]
drivers/net/wireless/iwmc3200wifi/main.c [deleted file]
drivers/net/wireless/iwmc3200wifi/netdev.c [deleted file]
drivers/net/wireless/iwmc3200wifi/rx.c [deleted file]
drivers/net/wireless/iwmc3200wifi/rx.h [deleted file]
drivers/net/wireless/iwmc3200wifi/sdio.c [deleted file]
drivers/net/wireless/iwmc3200wifi/sdio.h [deleted file]
drivers/net/wireless/iwmc3200wifi/trace.c [deleted file]
drivers/net/wireless/iwmc3200wifi/trace.h [deleted file]
drivers/net/wireless/iwmc3200wifi/tx.c [deleted file]
drivers/net/wireless/iwmc3200wifi/umac.h [deleted file]
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/libertas/debugfs.c
drivers/net/wireless/libertas/dev.h
drivers/net/wireless/libertas/host.h
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/libertas/mesh.c
drivers/net/wireless/libertas_tf/if_usb.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/11n.c
drivers/net/wireless/mwifiex/11n.h
drivers/net/wireless/mwifiex/11n_rxreorder.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/cmdevt.c
drivers/net/wireless/mwifiex/fw.h
drivers/net/wireless/mwifiex/ie.c
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/ioctl.h
drivers/net/wireless/mwifiex/join.c
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/mwifiex/main.h
drivers/net/wireless/mwifiex/scan.c
drivers/net/wireless/mwifiex/sta_cmd.c
drivers/net/wireless/mwifiex/sta_cmdresp.c
drivers/net/wireless/mwifiex/sta_event.c
drivers/net/wireless/mwifiex/sta_ioctl.c
drivers/net/wireless/mwifiex/uap_cmd.c
drivers/net/wireless/orinoco/cfg.c
drivers/net/wireless/p54/eeprom.c
drivers/net/wireless/p54/fwio.c
drivers/net/wireless/p54/txrx.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800.h
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2800pci.c
drivers/net/wireless/rt2x00/rt2800pci.h
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00mac.c
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/rtl818x/rtl8180/dev.c
drivers/net/wireless/rtl818x/rtl8187/dev.c
drivers/net/wireless/rtlwifi/base.c
drivers/net/wireless/rtlwifi/cam.c
drivers/net/wireless/rtlwifi/core.c
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/pci.c
drivers/net/wireless/rtlwifi/ps.c
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
drivers/net/wireless/rtlwifi/rtl8192de/dm.c
drivers/net/wireless/rtlwifi/rtl8192de/fw.c
drivers/net/wireless/rtlwifi/rtl8192de/hw.c
drivers/net/wireless/rtlwifi/rtl8192de/trx.c
drivers/net/wireless/rtlwifi/rtl8192se/dm.c
drivers/net/wireless/rtlwifi/rtl8192se/hw.c
drivers/net/wireless/rtlwifi/rtl8192se/phy.c
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
drivers/net/wireless/rtlwifi/rtl8192se/trx.c
drivers/net/wireless/ti/Kconfig
drivers/net/wireless/ti/Makefile
drivers/net/wireless/ti/wl1251/cmd.c
drivers/net/wireless/ti/wl1251/main.c
drivers/net/wireless/ti/wl1251/wl1251.h
drivers/net/wireless/ti/wl12xx/Makefile
drivers/net/wireless/ti/wl12xx/acx.h
drivers/net/wireless/ti/wl12xx/cmd.c
drivers/net/wireless/ti/wl12xx/debugfs.c [new file with mode: 0644]
drivers/net/wireless/ti/wl12xx/debugfs.h [new file with mode: 0644]
drivers/net/wireless/ti/wl12xx/main.c
drivers/net/wireless/ti/wl12xx/wl12xx.h
drivers/net/wireless/ti/wl18xx/Kconfig [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/Makefile [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/acx.c [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/acx.h [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/conf.h [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/debugfs.c [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/debugfs.h [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/io.c [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/io.h [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/main.c [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/reg.h [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/tx.c [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/tx.h [new file with mode: 0644]
drivers/net/wireless/ti/wl18xx/wl18xx.h [new file with mode: 0644]
drivers/net/wireless/ti/wlcore/acx.c
drivers/net/wireless/ti/wlcore/acx.h
drivers/net/wireless/ti/wlcore/boot.c
drivers/net/wireless/ti/wlcore/boot.h
drivers/net/wireless/ti/wlcore/cmd.c
drivers/net/wireless/ti/wlcore/cmd.h
drivers/net/wireless/ti/wlcore/conf.h
drivers/net/wireless/ti/wlcore/debugfs.c
drivers/net/wireless/ti/wlcore/debugfs.h
drivers/net/wireless/ti/wlcore/event.c
drivers/net/wireless/ti/wlcore/hw_ops.h
drivers/net/wireless/ti/wlcore/ini.h
drivers/net/wireless/ti/wlcore/init.c
drivers/net/wireless/ti/wlcore/io.c
drivers/net/wireless/ti/wlcore/io.h
drivers/net/wireless/ti/wlcore/main.c
drivers/net/wireless/ti/wlcore/ps.c
drivers/net/wireless/ti/wlcore/rx.c
drivers/net/wireless/ti/wlcore/rx.h
drivers/net/wireless/ti/wlcore/scan.c
drivers/net/wireless/ti/wlcore/scan.h
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c
drivers/net/wireless/ti/wlcore/testmode.c
drivers/net/wireless/ti/wlcore/tx.c
drivers/net/wireless/ti/wlcore/tx.h
drivers/net/wireless/ti/wlcore/wlcore.h
drivers/net/wireless/ti/wlcore/wlcore_i.h [moved from drivers/net/wireless/ti/wlcore/wl12xx.h with 91% similarity]
drivers/net/wireless/zd1211rw/zd_chip.h
drivers/net/wireless/zd1211rw/zd_usb.h
drivers/net/xen-netback/netback.c
drivers/nfc/nfcwilink.c
drivers/nfc/pn533.c
drivers/nfc/pn544_hci.c
drivers/of/of_mdio.c
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c
drivers/scsi/bnx2fc/bnx2fc.h
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/bnx2i/57xx_iscsi_hsi.h
drivers/scsi/bnx2i/bnx2i.h
drivers/scsi/bnx2i/bnx2i_hwi.c
drivers/scsi/bnx2i/bnx2i_init.c
drivers/scsi/bnx2i/bnx2i_iscsi.c
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
drivers/scsi/cxgbi/libcxgbi.c
drivers/scsi/scsi_netlink.c
drivers/scsi/scsi_transport_iscsi.c
drivers/ssb/b43_pci_bridge.c
drivers/ssb/scan.c
drivers/staging/gdm72xx/netlink_k.c
drivers/usb/atm/xusbatm.c
drivers/usb/gadget/u_ether.c
include/linux/bcma/bcma.h
include/linux/bcma/bcma_driver_chipcommon.h
include/linux/can.h
include/linux/can/core.h
include/linux/can/dev.h
include/linux/can/error.h
include/linux/can/raw.h
include/linux/cpu_rmap.h
include/linux/etherdevice.h
include/linux/ethtool.h
include/linux/ieee80211.h
include/linux/if.h
include/linux/if_ether.h
include/linux/if_team.h
include/linux/if_tunnel.h
include/linux/inetdevice.h
include/linux/ipv6.h
include/linux/ks8851_mll.h [new file with mode: 0644]
include/linux/mdio.h
include/linux/mii.h
include/linux/mlx4/cmd.h
include/linux/mlx4/device.h
include/linux/mlx4/driver.h
include/linux/netdevice.h
include/linux/netfilter.h
include/linux/netfilter/Kbuild
include/linux/netfilter/nf_conntrack_sip.h
include/linux/netfilter/nfnetlink.h
include/linux/netfilter/nfnetlink_conntrack.h
include/linux/netfilter/nfnetlink_cthelper.h [new file with mode: 0644]
include/linux/netfilter/nfnetlink_queue.h
include/linux/netfilter/xt_connlimit.h
include/linux/netfilter/xt_recent.h
include/linux/netfilter_ipv4.h
include/linux/netfilter_ipv4/Kbuild
include/linux/netfilter_ipv4/ipt_addrtype.h [deleted file]
include/linux/netfilter_ipv6.h
include/linux/netlink.h
include/linux/netpoll.h
include/linux/nfc.h
include/linux/nl80211.h
include/linux/nl802154.h
include/linux/phy.h
include/linux/pkt_cls.h
include/linux/rtnetlink.h
include/linux/snmp.h
include/linux/sock_diag.h
include/linux/socket.h
include/linux/spi/at86rf230.h [new file with mode: 0644]
include/linux/ssb/ssb.h
include/linux/tcp.h
include/linux/tipc_config.h
include/linux/usb/usbnet.h
include/net/addrconf.h
include/net/af_unix.h
include/net/arp.h
include/net/bluetooth/a2mp.h [new file with mode: 0644]
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci.h
include/net/bluetooth/hci_core.h
include/net/bluetooth/l2cap.h
include/net/caif/caif_hsi.h
include/net/cfg80211.h
include/net/dn_route.h
include/net/dst.h
include/net/dst_ops.h
include/net/fib_rules.h
include/net/flow.h
include/net/genetlink.h
include/net/inet6_connection_sock.h
include/net/inet_common.h
include/net/inet_connection_sock.h
include/net/inet_hashtables.h
include/net/inet_sock.h
include/net/inetpeer.h
include/net/ip.h
include/net/ip6_fib.h
include/net/ip6_route.h
include/net/ip6_tunnel.h
include/net/ip_fib.h
include/net/ipv6.h
include/net/mac80211.h
include/net/mac802154.h
include/net/ndisc.h
include/net/neighbour.h
include/net/net_namespace.h
include/net/netevent.h
include/net/netfilter/nf_conntrack.h
include/net/netfilter/nf_conntrack_core.h
include/net/netfilter/nf_conntrack_expect.h
include/net/netfilter/nf_conntrack_extend.h
include/net/netfilter/nf_conntrack_helper.h
include/net/netfilter/nf_conntrack_l3proto.h
include/net/netfilter/nf_conntrack_l4proto.h
include/net/netfilter/nf_nat_helper.h
include/net/netfilter/nfnetlink_queue.h [new file with mode: 0644]
include/net/netns/conntrack.h
include/net/netns/ipv4.h
include/net/netns/ipv6.h
include/net/nfc/hci.h
include/net/nfc/nfc.h
include/net/nfc/shdlc.h
include/net/protocol.h
include/net/route.h
include/net/sctp/sctp.h
include/net/sctp/structs.h
include/net/sock.h
include/net/tcp.h
include/net/timewait_sock.h
include/net/xfrm.h
kernel/audit.c
lib/kobject_uevent.c
net/8021q/vlan_dev.c
net/9p/client.c
net/9p/trans_virtio.c
net/appletalk/ddp.c
net/atm/lec.c
net/atm/pppoatm.c
net/ax25/ax25_addr.c
net/ax25/ax25_out.c
net/ax25/ax25_route.c
net/batman-adv/Makefile
net/batman-adv/bat_algo.h
net/batman-adv/bat_debugfs.c [deleted file]
net/batman-adv/bat_iv_ogm.c
net/batman-adv/bat_sysfs.c [deleted file]
net/batman-adv/bitarray.c
net/batman-adv/bitarray.h
net/batman-adv/bridge_loop_avoidance.c
net/batman-adv/bridge_loop_avoidance.h
net/batman-adv/debugfs.c [new file with mode: 0644]
net/batman-adv/debugfs.h [moved from net/batman-adv/bat_debugfs.h with 74% similarity]
net/batman-adv/gateway_client.c
net/batman-adv/gateway_client.h
net/batman-adv/gateway_common.c
net/batman-adv/gateway_common.h
net/batman-adv/hard-interface.c
net/batman-adv/hard-interface.h
net/batman-adv/hash.c
net/batman-adv/hash.h
net/batman-adv/icmp_socket.c
net/batman-adv/icmp_socket.h
net/batman-adv/main.c
net/batman-adv/main.h
net/batman-adv/originator.c
net/batman-adv/originator.h
net/batman-adv/packet.h
net/batman-adv/ring_buffer.c
net/batman-adv/ring_buffer.h
net/batman-adv/routing.c
net/batman-adv/routing.h
net/batman-adv/send.c
net/batman-adv/send.h
net/batman-adv/soft-interface.c
net/batman-adv/soft-interface.h
net/batman-adv/sysfs.c [new file with mode: 0644]
net/batman-adv/sysfs.h [moved from net/batman-adv/bat_sysfs.h with 63% similarity]
net/batman-adv/translation-table.c
net/batman-adv/translation-table.h
net/batman-adv/types.h
net/batman-adv/unicast.c
net/batman-adv/unicast.h
net/batman-adv/vis.c
net/batman-adv/vis.h
net/bluetooth/Makefile
net/bluetooth/a2mp.c [new file with mode: 0644]
net/bluetooth/af_bluetooth.c
net/bluetooth/bnep/core.c
net/bluetooth/bnep/netdev.c
net/bluetooth/bnep/sock.c
net/bluetooth/hci_conn.c
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c
net/bluetooth/hci_sysfs.c
net/bluetooth/hidp/core.c
net/bluetooth/hidp/sock.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/lib.c
net/bluetooth/mgmt.c
net/bluetooth/rfcomm/core.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/rfcomm/tty.c
net/bluetooth/sco.c
net/bluetooth/smp.c
net/bridge/br_device.c
net/bridge/br_multicast.c
net/bridge/br_netfilter.c
net/bridge/netfilter/ebt_ulog.c
net/caif/caif_dev.c
net/caif/cfctrl.c
net/can/af_can.c
net/can/af_can.h
net/can/gw.c
net/can/proc.c
net/can/raw.c
net/ceph/pagelist.c
net/core/datagram.c
net/core/dev.c
net/core/dst.c
net/core/ethtool.c
net/core/fib_rules.c
net/core/flow_dissector.c
net/core/neighbour.c
net/core/net-sysfs.c
net/core/netpoll.c
net/core/rtnetlink.c
net/core/skbuff.c
net/core/sock.c
net/core/sock_diag.c
net/dcb/dcbnl.c
net/dccp/ackvec.h
net/dccp/ccid.c
net/dccp/ccids/ccid3.c
net/dccp/ccids/lib/loss_interval.c
net/dccp/ccids/lib/packet_history.c
net/dccp/ccids/lib/tfrc_equation.c
net/dccp/dccp.h
net/dccp/feat.c
net/dccp/input.c
net/dccp/ipv4.c
net/dccp/ipv6.c
net/dccp/options.c
net/dccp/output.c
net/decnet/dn_fib.c
net/decnet/dn_neigh.c
net/decnet/dn_nsp_out.c
net/decnet/dn_route.c
net/decnet/dn_table.c
net/decnet/netfilter/dn_rtmsg.c
net/ethernet/Makefile
net/ethernet/eth.c
net/ieee802154/6lowpan.c
net/ieee802154/netlink.c
net/ieee802154/nl-mac.c
net/ieee802154/nl-phy.c
net/ipv4/Kconfig
net/ipv4/Makefile
net/ipv4/af_inet.c
net/ipv4/ah4.c
net/ipv4/arp.c
net/ipv4/devinet.c
net/ipv4/esp4.c
net/ipv4/fib_frontend.c
net/ipv4/fib_rules.c
net/ipv4/fib_semantics.c
net/ipv4/fib_trie.c
net/ipv4/icmp.c
net/ipv4/inet_connection_sock.c
net/ipv4/inet_diag.c
net/ipv4/inet_fragment.c
net/ipv4/inetpeer.c
net/ipv4/ip_fragment.c
net/ipv4/ip_gre.c
net/ipv4/ip_input.c
net/ipv4/ip_options.c
net/ipv4/ip_output.c
net/ipv4/ip_sockglue.c
net/ipv4/ip_vti.c [new file with mode: 0644]
net/ipv4/ipcomp.c
net/ipv4/ipip.c
net/ipv4/ipmr.c
net/ipv4/netfilter/ipt_ULOG.c
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
net/ipv4/netfilter/nf_defrag_ipv4.c
net/ipv4/netfilter/nf_nat_amanda.c
net/ipv4/netfilter/nf_nat_core.c
net/ipv4/netfilter/nf_nat_h323.c
net/ipv4/netfilter/nf_nat_helper.c
net/ipv4/netfilter/nf_nat_pptp.c
net/ipv4/netfilter/nf_nat_snmp_basic.c
net/ipv4/netfilter/nf_nat_tftp.c
net/ipv4/ping.c
net/ipv4/proc.c
net/ipv4/protocol.c
net/ipv4/raw.c
net/ipv4/route.c
net/ipv4/syncookies.c
net/ipv4/sysctl_net_ipv4.c
net/ipv4/tcp.c
net/ipv4/tcp_fastopen.c [new file with mode: 0644]
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_metrics.c [new file with mode: 0644]
net/ipv4/tcp_minisocks.c
net/ipv4/tcp_output.c
net/ipv4/udp.c
net/ipv4/udp_diag.c
net/ipv4/xfrm4_mode_tunnel.c
net/ipv4/xfrm4_policy.c
net/ipv6/addrconf.c
net/ipv6/ah6.c
net/ipv6/esp6.c
net/ipv6/exthdrs.c
net/ipv6/icmp.c
net/ipv6/inet6_connection_sock.c
net/ipv6/ip6_fib.c
net/ipv6/ip6_input.c
net/ipv6/ip6_output.c
net/ipv6/ip6_tunnel.c
net/ipv6/ip6mr.c
net/ipv6/ipcomp6.c
net/ipv6/mcast.c
net/ipv6/ndisc.c
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
net/ipv6/protocol.c
net/ipv6/raw.c
net/ipv6/route.c
net/ipv6/sit.c
net/ipv6/syncookies.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
net/ipv6/xfrm6_policy.c
net/ipx/Makefile
net/ipx/pe2.c [moved from net/ethernet/pe2.c with 91% similarity]
net/irda/af_irda.c
net/irda/irlan/irlan_provider.c
net/irda/irqueue.c
net/l2tp/l2tp_core.c
net/l2tp/l2tp_eth.c
net/l2tp/l2tp_netlink.c
net/l2tp/l2tp_ppp.c
net/llc/af_llc.c
net/llc/llc_station.c
net/mac80211/Kconfig
net/mac80211/Makefile
net/mac80211/agg-rx.c
net/mac80211/agg-tx.c
net/mac80211/cfg.c
net/mac80211/chan.c
net/mac80211/debug.h [new file with mode: 0644]
net/mac80211/debugfs_key.c
net/mac80211/debugfs_netdev.c
net/mac80211/driver-ops.h
net/mac80211/driver-trace.c [deleted file]
net/mac80211/ht.c
net/mac80211/ibss.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/key.c
net/mac80211/main.c
net/mac80211/mesh.c
net/mac80211/mesh.h
net/mac80211/mesh_hwmp.c
net/mac80211/mesh_pathtbl.c
net/mac80211/mesh_plink.c
net/mac80211/mesh_sync.c
net/mac80211/mlme.c
net/mac80211/offchannel.c
net/mac80211/pm.c
net/mac80211/rx.c
net/mac80211/scan.c
net/mac80211/sta_info.c
net/mac80211/status.c
net/mac80211/tkip.c
net/mac80211/trace.c [new file with mode: 0644]
net/mac80211/trace.h [moved from net/mac80211/driver-trace.h with 95% similarity]
net/mac80211/tx.c
net/mac80211/util.c
net/mac80211/wme.c
net/mac80211/wme.h
net/mac80211/work.c [deleted file]
net/mac802154/Makefile
net/mac802154/ieee802154_dev.c
net/mac802154/mac802154.h
net/mac802154/mac_cmd.c
net/mac802154/mib.c
net/mac802154/rx.c
net/mac802154/tx.c
net/mac802154/wpan.c [new file with mode: 0644]
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/core.c
net/netfilter/ipvs/ip_vs_core.c
net/netfilter/ipvs/ip_vs_xmit.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_extend.c
net/netfilter/nf_conntrack_ftp.c
net/netfilter/nf_conntrack_h323_main.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_irc.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_pptp.c
net/netfilter/nf_conntrack_proto.c
net/netfilter/nf_conntrack_proto_dccp.c
net/netfilter/nf_conntrack_proto_generic.c
net/netfilter/nf_conntrack_proto_gre.c
net/netfilter/nf_conntrack_proto_sctp.c
net/netfilter/nf_conntrack_proto_tcp.c
net/netfilter/nf_conntrack_proto_udp.c
net/netfilter/nf_conntrack_proto_udplite.c
net/netfilter/nf_conntrack_sane.c
net/netfilter/nf_conntrack_sip.c
net/netfilter/nf_conntrack_tftp.c
net/netfilter/nfnetlink.c
net/netfilter/nfnetlink_cthelper.c [new file with mode: 0644]
net/netfilter/nfnetlink_cttimeout.c
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue_core.c [moved from net/netfilter/nfnetlink_queue.c with 92% similarity]
net/netfilter/nfnetlink_queue_ct.c [new file with mode: 0644]
net/netfilter/xt_CT.c
net/netfilter/xt_NFQUEUE.c
net/netfilter/xt_TPROXY.c
net/netfilter/xt_connlimit.c
net/netfilter/xt_recent.c
net/netlink/af_netlink.c
net/netlink/genetlink.c
net/nfc/core.c
net/nfc/hci/command.c
net/nfc/hci/core.c
net/nfc/hci/hci.h
net/nfc/hci/shdlc.c
net/nfc/llcp/commands.c
net/nfc/llcp/llcp.c
net/nfc/llcp/llcp.h
net/nfc/llcp/sock.c
net/nfc/nci/core.c
net/nfc/nci/ntf.c
net/nfc/netlink.c
net/nfc/nfc.h
net/packet/af_packet.c
net/rds/page.c
net/rfkill/core.c
net/rxrpc/ar-error.c
net/rxrpc/ar-output.c
net/sched/Kconfig
net/sched/Makefile
net/sched/act_api.c
net/sched/cls_api.c
net/sched/em_canid.c [new file with mode: 0644]
net/sched/em_ipset.c [new file with mode: 0644]
net/sched/sch_api.c
net/sched/sch_netem.c
net/sched/sch_teql.c
net/sctp/associola.c
net/sctp/input.c
net/sctp/ipv6.c
net/sctp/output.c
net/sctp/sm_make_chunk.c
net/sctp/socket.c
net/sctp/transport.c
net/sunrpc/backchannel_rqst.c
net/sunrpc/clnt.c
net/sunrpc/svcauth_unix.c
net/sunrpc/svcsock.c
net/sunrpc/xdr.c
net/sunrpc/xprt.c
net/sunrpc/xprtsock.c
net/tipc/Kconfig
net/tipc/bcast.c
net/tipc/bearer.c
net/tipc/bearer.h
net/tipc/config.c
net/tipc/core.c
net/tipc/core.h
net/tipc/discover.c
net/tipc/handler.c
net/tipc/link.c
net/tipc/link.h
net/tipc/log.c
net/tipc/log.h [deleted file]
net/tipc/msg.c
net/tipc/name_distr.c
net/tipc/name_table.c
net/tipc/net.c
net/tipc/netlink.c
net/tipc/node.c
net/tipc/node_subscr.c
net/tipc/port.c
net/tipc/port.h
net/tipc/ref.c
net/tipc/socket.c
net/tipc/subscr.c
net/unix/af_unix.c
net/unix/diag.c
net/wireless/Kconfig
net/wireless/Makefile
net/wireless/ap.c [new file with mode: 0644]
net/wireless/chan.c
net/wireless/core.c
net/wireless/core.h
net/wireless/ibss.c
net/wireless/mesh.c
net/wireless/mlme.c
net/wireless/nl80211.c
net/wireless/reg.c
net/wireless/util.c
net/wireless/wext-compat.c
net/wireless/wext-sme.c
net/x25/x25_route.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_user.c
security/selinux/hooks.c
security/selinux/netlink.c

index 7764594..adcca03 100644 (file)
@@ -69,9 +69,13 @@ static int cn_test_want_notify(void)
                return -ENOMEM;
        }
 
-       nlh = NLMSG_PUT(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh));
+       nlh = nlmsg_put(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh), 0);
+       if (!nlh) {
+               kfree_skb(skb);
+               return -EMSGSIZE;
+       }
 
-       msg = (struct cn_msg *)NLMSG_DATA(nlh);
+       msg = nlmsg_data(nlh);
 
        memset(msg, 0, size0);
 
@@ -117,11 +121,6 @@ static int cn_test_want_notify(void)
        pr_info("request was sent: group=0x%x\n", ctl->group);
 
        return 0;
-
-nlmsg_failure:
-       pr_err("failed to send %u.%u\n", msg->seq, msg->ack);
-       kfree_skb(skb);
-       return -EINVAL;
 }
 #endif
 
diff --git a/Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt b/Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
new file mode 100644 (file)
index 0000000..7c86d5e
--- /dev/null
@@ -0,0 +1,29 @@
+The Broadcom BCM87XX devices are a family of 10G Ethernet PHYs.  They
+have these bindings in addition to the standard PHY bindings.
+
+Compatible: Should contain "broadcom,bcm8706" or "broadcom,bcm8727" and
+            "ethernet-phy-ieee802.3-c45"
+
+Optional Properties:
+
+- broadcom,c45-reg-init : one of more sets of 4 cells.  The first cell
+  is the MDIO Manageable Device (MMD) address, the second a register
+  address within the MMD, the third cell contains a mask to be ANDed
+  with the existing register value, and the fourth cell is ORed with
+  he result to yield the new register value.  If the third cell has a
+  value of zero, no read of the existing value is performed.
+
+Example:
+
+       ethernet-phy@5 {
+               reg = <5>;
+               compatible = "broadcom,bcm8706", "ethernet-phy-ieee802.3-c45";
+               interrupt-parent = <&gpio>;
+               interrupts = <12 8>; /* Pin 12, active low */
+               /*
+                * Set PMD Digital Control Register for
+                * GPIO[1] Tx/Rx
+                * GPIO[0] R64 Sync Acquired
+                */
+               broadcom,c45-reg-init = <1 0xc808 0xff8f 0x70>;
+       };
index f31b686..8ff324e 100644 (file)
@@ -11,6 +11,9 @@ Required properties:
 
 - reg : Offset and length of the register set for this device
 - interrupts : Interrupt tuple for this device
+
+Optional properties:
+
 - clock-frequency : The oscillator frequency driving the flexcan device
 
 Example:
diff --git a/Documentation/devicetree/bindings/net/davinci_emac.txt b/Documentation/devicetree/bindings/net/davinci_emac.txt
new file mode 100644 (file)
index 0000000..48b259e
--- /dev/null
@@ -0,0 +1,41 @@
+* Texas Instruments Davinci EMAC
+
+This file provides information, what the device node
+for the davinci_emac interface contains.
+
+Required properties:
+- compatible: "ti,davinci-dm6467-emac";
+- reg: Offset and length of the register set for the device
+- ti,davinci-ctrl-reg-offset: offset to control register
+- ti,davinci-ctrl-mod-reg-offset: offset to control module register
+- ti,davinci-ctrl-ram-offset: offset to control module ram
+- ti,davinci-ctrl-ram-size: size of control module ram
+- ti,davinci-rmii-en: use RMII
+- ti,davinci-no-bd-ram: has the emac controller BD RAM
+- phy-handle: Contains a phandle to an Ethernet PHY.
+              if not, davinci_emac driver defaults to 100/FULL
+- interrupts: interrupt mapping for the davinci emac interrupts sources:
+              4 sources: <Receive Threshold Interrupt
+                         Receive Interrupt
+                         Transmit Interrupt
+                         Miscellaneous Interrupt>
+
+Optional properties:
+- local-mac-address : 6 bytes, mac address
+
+Example (enbw_cmc board):
+       eth0: emac@1e20000 {
+               compatible = "ti,davinci-dm6467-emac";
+               reg = <0x220000 0x4000>;
+               ti,davinci-ctrl-reg-offset = <0x3000>;
+               ti,davinci-ctrl-mod-reg-offset = <0x2000>;
+               ti,davinci-ctrl-ram-offset = <0>;
+               ti,davinci-ctrl-ram-size = <0x2000>;
+               local-mac-address = [ 00 00 00 00 00 00 ];
+               interrupts = <33
+                               34
+                               35
+                               36
+                               >;
+               interrupt-parent = <&intc>;
+       };
index 4616fc2..d536392 100644 (file)
@@ -7,10 +7,14 @@ Required properties:
 - phy-mode : String, operation mode of the PHY interface.
   Supported values are: "mii", "gmii", "sgmii", "tbi", "rmii",
   "rgmii", "rgmii-id", "rgmii-rxid", "rgmii-txid", "rtbi", "smii".
-- phy-reset-gpios : Should specify the gpio for phy reset
 
 Optional properties:
 - local-mac-address : 6 bytes, mac address
+- phy-reset-gpios : Should specify the gpio for phy reset
+- phy-reset-duration : Reset duration in milliseconds.  Should present
+  only if property "phy-reset-gpios" is available.  Missing the property
+  will have the duration be 1 millisecond.  Numbers greater than 1000 are
+  invalid and 1 millisecond will be used instead.
 
 Example:
 
index bb8c742..7cd18fb 100644 (file)
@@ -14,10 +14,20 @@ Required properties:
  - linux,phandle :  phandle for this node; likely referenced by an
    ethernet controller node.
 
+Optional Properties:
+
+- compatible: Compatible list, may contain
+  "ethernet-phy-ieee802.3-c22" or "ethernet-phy-ieee802.3-c45" for
+  PHYs that implement IEEE802.3 clause 22 or IEEE802.3 clause 45
+  specifications. If neither of these are specified, the default is to
+  assume clause 22. The compatible list may also contain other
+  elements.
+
 Example:
 
 ethernet-phy@0 {
-       linux,phandle = <2452000>
+       compatible = "ethernet-phy-ieee802.3-c22";
+       linux,phandle = <2452000>;
        interrupt-parent = <40000>;
        interrupts = <35 1>;
        reg = <0>;
index 1f62623..060bbf0 100644 (file)
@@ -1,7 +1,8 @@
 * STMicroelectronics 10/100/1000 Ethernet driver (GMAC)
 
 Required properties:
-- compatible: Should be "st,spear600-gmac"
+- compatible: Should be "snps,dwmac-<ip_version>" "snps,dwmac"
+       For backwards compatibility: "st,spear600-gmac" is also supported.
 - reg: Address and length of the register set for the device
 - interrupt-parent: Should be the phandle for the interrupt controller
   that services interrupts for this device
index 56000b3..61d1a89 100644 (file)
@@ -249,15 +249,6 @@ Who:       Ravikiran Thirumalai <kiran@scalex86.org>
 
 ---------------------------
 
-What:  Code that is now under CONFIG_WIRELESS_EXT_SYSFS
-       (in net/core/net-sysfs.c)
-When:  3.5
-Why:   Over 1K .text/.data size reduction, data is available in other
-       ways (ioctls)
-Who:   Johannes Berg <johannes@sipsolutions.net>
-
----------------------------
-
 What:  sysfs ui for changing p4-clockmod parameters
 When:  September 2009
 Why:   See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
@@ -414,21 +405,6 @@ Who:       Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
 
-What:  xt_connlimit rev 0
-When:  2012
-Who:   Jan Engelhardt <jengelh@medozas.de>
-Files: net/netfilter/xt_connlimit.c
-
-----------------------------
-
-What:  ipt_addrtype match include file
-When:  2012
-Why:   superseded by xt_addrtype
-Who:   Florian Westphal <fw@strlen.de>
-Files: include/linux/netfilter_ipv4/ipt_addrtype.h
-
-----------------------------
-
 What:  i2c_driver.attach_adapter
        i2c_driver.detach_adapter
 When:  September 2011
@@ -449,6 +425,19 @@ Who:       Hans Verkuil <hans.verkuil@cisco.com>
 
 ----------------------------
 
+What:  CONFIG_CFG80211_WEXT
+When:  as soon as distributions ship new wireless tools, ie. wpa_supplicant 1.0
+       and NetworkManager/connman/etc. that are able to use nl80211
+Why:   Wireless extensions are deprecated, and userland tools are moving to
+       using nl80211. New drivers are no longer using wireless extensions,
+       and while there might still be old drivers, both new drivers and new
+       userland no longer needs them and they can't be used for an feature
+       developed in the past couple of years. As such, compatibility with
+       wireless extensions in new drivers will be removed.
+Who:   Johannes Berg <johannes@sipsolutions.net>
+
+----------------------------
+
 What:  g_file_storage driver
 When:  3.8
 Why:   This driver has been superseded by g_mass_storage.
@@ -589,6 +578,13 @@ Why:       Remount currently allows changing bound subsystems and
 
 ----------------------------
 
+What:  xt_recent rev 0
+When:  2013
+Who:   Pablo Neira Ayuso <pablo@netfilter.org>
+Files: net/netfilter/xt_recent.c
+
+----------------------------
+
 What:  KVM debugfs statistics
 When:  2013
 Why:   KVM tracepoints provide mostly equivalent information in a much more
index 75a5923..8f3ae4a 100644 (file)
@@ -211,6 +211,11 @@ The debug output can be changed at runtime  using  the  file
 
 will enable debug messages for when routes change.
 
+Counters for different types of packets entering and leaving the
+batman-adv module are available through ethtool:
+
+# ethtool --statistics bat0
+
 
 BATCTL
 ------
index a7ba5e4..a27cb62 100644 (file)
@@ -1,7 +1,14 @@
 In order to use the Ethernet bridging functionality, you'll need the
-userspace tools. These programs and documentation are available
-at http://www.linuxfoundation.org/en/Net:Bridge.  The download page is
-http://prdownloads.sourceforge.net/bridge.
+userspace tools.
+
+Documentation for Linux bridging is on:
+   http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
+
+The bridge-utilities are maintained at:
+   git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git
+
+Additionally, the iproute2 utilities can be used to configure
+bridge devices.
 
 If you still have questions, don't hesitate to post to the mailing list 
 (more info https://lists.linux-foundation.org/mailman/listinfo/bridge).
index e52fd62..0aa4bd3 100644 (file)
@@ -19,60 +19,36 @@ and host. Currently, UART and Loopback are available for Linux.
 Architecture:
 ------------
 The implementation of CAIF is divided into:
-* CAIF Socket Layer, Kernel API, and  Net Device.
+* CAIF Socket Layer and GPRS IP Interface.
 * CAIF Core Protocol Implementation
 * CAIF Link Layer, implemented as NET devices.
 
 
   RTNL
    !
-   !    +------+   +------+   +------+
-   !   +------+!  +------+!  +------+!
-   !   ! Sock !!  !Kernel!!  ! Net  !!
-   !   ! API  !+  ! API  !+  ! Dev  !+   <- CAIF Client APIs
-   !   +------+   +------!   +------+
-   !      !          !          !
-   !      +----------!----------+
-   !              +------+               <- CAIF Protocol Implementation
-   +------->      ! CAIF !
-                  ! Core !
-                  +------+
-            +--------!--------+
-            !                 !
-         +------+          +-----+
-         !      !          ! TTY !       <- Link Layer (Net Devices)
-         +------+          +-----+
-
-
-Using the Kernel API
-----------------------
-The Kernel API is used for accessing CAIF channels from the
-kernel.
-The user of the API has to implement two callbacks for receive
-and control.
-The receive callback gives a CAIF packet as a SKB. The control
-callback will
-notify of channel initialization complete, and flow-on/flow-
-off.
-
-
-  struct caif_device caif_dev = {
-    .caif_config = {
-     .name = "MYDEV"
-     .type = CAIF_CHTY_AT
-    }
-   .receive_cb = my_receive,
-   .control_cb = my_control,
-  };
-  caif_add_device(&caif_dev);
-  caif_transmit(&caif_dev, skb);
-
-See the caif_kernel.h for details about the CAIF kernel API.
+   !         +------+   +------+
+   !        +------+!  +------+!
+   !        !  IP  !!  !Socket!!
+   +-------> !interf!+ ! API  !+       <- CAIF Client APIs
+   !        +------+   +------!
+   !           !           !
+   !           +-----------+
+   !                 !
+   !              +------+             <- CAIF Core Protocol
+   !              ! CAIF !
+   !              ! Core !
+   !              +------+
+   !      +----------!---------+
+   !      !          !         !
+   !   +------+   +-----+   +------+
+   +--> ! HSI  !   ! TTY !   ! USB  !  <- Link Layer (Net Devices)
+       +------+   +-----+   +------+
+
 
 
 I M P L E M E N T A T I O N
 ===========================
-===========================
+
 
 CAIF Core Protocol Layer
 =========================================
@@ -88,17 +64,13 @@ The Core CAIF implementation contains:
       -        Simple implementation of CAIF.
       -        Layered architecture (a la Streams), each layer in the CAIF
        specification is implemented in a separate c-file.
-      -        Clients must implement PHY layer to access physical HW
-       with receive and transmit functions.
       -        Clients must call configuration function to add PHY layer.
       -        Clients must implement CAIF layer to consume/produce
        CAIF payload with receive and transmit functions.
       -        Clients must call configuration function to add and connect the
        Client layer.
       - When receiving / transmitting CAIF Packets (cfpkt), ownership is passed
-       to the called function (except for framing layers' receive functions
-       or if a transmit function returns an error, in which case the caller
-       must free the packet).
+       to the called function (except for framing layers' receive function)
 
 Layered Architecture
 --------------------
@@ -109,11 +81,6 @@ Implementation. The support functions include:
        CAIF Packet has functions for creating, destroying and adding content
        and for adding/extracting header and trailers to protocol packets.
 
-      - CFLST CAIF list implementation.
-
-      - CFGLUE CAIF Glue. Contains OS Specifics, such as memory
-       allocation, endianness, etc.
-
 The CAIF Protocol implementation contains:
 
       - CFCNFG CAIF Configuration layer. Configures the CAIF Protocol
@@ -128,7 +95,7 @@ The CAIF Protocol implementation contains:
        control and remote shutdown requests.
 
       - CFVEI CAIF VEI layer. Handles CAIF AT Channels on VEI (Virtual
-        External Interface). This layer encodes/decodes VEI frames.
+       External Interface). This layer encodes/decodes VEI frames.
 
       - CFDGML CAIF Datagram layer. Handles CAIF Datagram layer (IP
        traffic), encodes/decodes Datagram frames.
@@ -170,7 +137,7 @@ The CAIF Protocol implementation contains:
            +---------+     +---------+
                 !              !
            +---------+     +---------+
-           |         |     | Serial  |
+           |         |     | Serial  |
            |         |     | CFSERL  |
            +---------+     +---------+
 
@@ -186,24 +153,20 @@ In this layered approach the following "rules" apply.
                 layer->dn->transmit(layer->dn, packet);
 
 
-Linux Driver Implementation
+CAIF Socket and IP interface
 ===========================
 
-Linux GPRS Net Device and CAIF socket are implemented on top of the
-CAIF Core protocol. The Net device and CAIF socket have an instance of
+The IP interface and CAIF socket API are implemented on top of the
+CAIF Core protocol. The IP Interface and CAIF socket have an instance of
 'struct cflayer', just like the CAIF Core protocol stack.
 Net device and Socket implement the 'receive()' function defined by
 'struct cflayer', just like the rest of the CAIF stack. In this way, transmit and
 receive of packets is handled as by the rest of the layers: the 'dn->transmit()'
 function is called in order to transmit data.
 
-The layer on top of the CAIF Core implementation is
-sometimes referred to as the "Client layer".
-
-
 Configuration of Link Layer
 ---------------------------
-The Link Layer is implemented as Linux net devices (struct net_device).
+The Link Layer is implemented as Linux network devices (struct net_device).
 Payload handling and registration is done using standard Linux mechanisms.
 
 The CAIF Protocol relies on a loss-less link layer without implementing
index ac29539..820f553 100644 (file)
@@ -22,7 +22,8 @@ This file contains
       4.1.2 RAW socket option CAN_RAW_ERR_FILTER
       4.1.3 RAW socket option CAN_RAW_LOOPBACK
       4.1.4 RAW socket option CAN_RAW_RECV_OWN_MSGS
-      4.1.5 RAW socket returned message flags
+      4.1.5 RAW socket option CAN_RAW_FD_FRAMES
+      4.1.6 RAW socket returned message flags
     4.2 Broadcast Manager protocol sockets (SOCK_DGRAM)
     4.3 connected transport protocols (SOCK_SEQPACKET)
     4.4 unconnected transport protocols (SOCK_DGRAM)
@@ -41,7 +42,8 @@ This file contains
       6.5.1 Netlink interface to set/get devices properties
       6.5.2 Setting the CAN bit-timing
       6.5.3 Starting and stopping the CAN network device
-    6.6 supported CAN hardware
+    6.6 CAN FD (flexible data rate) driver support
+    6.7 supported CAN hardware
 
   7 Socket CAN resources
 
@@ -232,16 +234,16 @@ solution for a couple of reasons:
   arbitration problems and error frames caused by the different
   ECUs. The occurrence of detected errors are important for diagnosis
   and have to be logged together with the exact timestamp. For this
-  reason the CAN interface driver can generate so called Error Frames
-  that can optionally be passed to the user application in the same
-  way as other CAN frames. Whenever an error on the physical layer
+  reason the CAN interface driver can generate so called Error Message
+  Frames that can optionally be passed to the user application in the
+  same way as other CAN frames. Whenever an error on the physical layer
   or the MAC layer is detected (e.g. by the CAN controller) the driver
-  creates an appropriate error frame. Error frames can be requested by
-  the user application using the common CAN filter mechanisms. Inside
-  this filter definition the (interested) type of errors may be
-  selected. The reception of error frames is disabled by default.
-  The format of the CAN error frame is briefly described in the Linux
-  header file "include/linux/can/error.h".
+  creates an appropriate error message frame. Error messages frames can
+  be requested by the user application using the common CAN filter
+  mechanisms. Inside this filter definition the (interested) type of
+  errors may be selected. The reception of error messages is disabled
+  by default. The format of the CAN error message frame is briefly
+  described in the Linux header file "include/linux/can/error.h".
 
 4. How to use Socket CAN
 ------------------------
@@ -273,7 +275,7 @@ solution for a couple of reasons:
 
     struct can_frame {
             canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
-            __u8    can_dlc; /* data length code: 0 .. 8 */
+            __u8    can_dlc; /* frame payload length in byte (0 .. 8) */
             __u8    data[8] __attribute__((aligned(8)));
     };
 
@@ -375,6 +377,51 @@ solution for a couple of reasons:
     nbytes = sendto(s, &frame, sizeof(struct can_frame),
                     0, (struct sockaddr*)&addr, sizeof(addr));
 
+  Remark about CAN FD (flexible data rate) support:
+
+  Generally the handling of CAN FD is very similar to the formerly described
+  examples. The new CAN FD capable CAN controllers support two different
+  bitrates for the arbitration phase and the payload phase of the CAN FD frame
+  and up to 64 bytes of payload. This extended payload length breaks all the
+  kernel interfaces (ABI) which heavily rely on the CAN frame with fixed eight
+  bytes of payload (struct can_frame) like the CAN_RAW socket. Therefore e.g.
+  the CAN_RAW socket supports a new socket option CAN_RAW_FD_FRAMES that
+  switches the socket into a mode that allows the handling of CAN FD frames
+  and (legacy) CAN frames simultaneously (see section 4.1.5).
+
+  The struct canfd_frame is defined in include/linux/can.h:
+
+    struct canfd_frame {
+            canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
+            __u8    len;     /* frame payload length in byte (0 .. 64) */
+            __u8    flags;   /* additional flags for CAN FD */
+            __u8    __res0;  /* reserved / padding */
+            __u8    __res1;  /* reserved / padding */
+            __u8    data[64] __attribute__((aligned(8)));
+    };
+
+  The struct canfd_frame and the existing struct can_frame have the can_id,
+  the payload length and the payload data at the same offset inside their
+  structures. This allows to handle the different structures very similar.
+  When the content of a struct can_frame is copied into a struct canfd_frame
+  all structure elements can be used as-is - only the data[] becomes extended.
+
+  When introducing the struct canfd_frame it turned out that the data length
+  code (DLC) of the struct can_frame was used as a length information as the
+  length and the DLC has a 1:1 mapping in the range of 0 .. 8. To preserve
+  the easy handling of the length information the canfd_frame.len element
+  contains a plain length value from 0 .. 64. So both canfd_frame.len and
+  can_frame.can_dlc are equal and contain a length information and no DLC.
+  For details about the distinction of CAN and CAN FD capable devices and
+  the mapping to the bus-relevant data length code (DLC), see chapter 6.6.
+
+  The length of the two CAN(FD) frame structures define the maximum transfer
+  unit (MTU) of the CAN(FD) network interface and skbuff data length. Two
+  definitions are specified for CAN specific MTUs in include/linux/can.h :
+
+  #define CAN_MTU   (sizeof(struct can_frame))   == 16  => 'legacy' CAN frame
+  #define CANFD_MTU (sizeof(struct canfd_frame)) == 72  => CAN FD frame
+
   4.1 RAW protocol sockets with can_filters (SOCK_RAW)
 
   Using CAN_RAW sockets is extensively comparable to the commonly
@@ -383,7 +430,7 @@ solution for a couple of reasons:
   defaults are set at RAW socket binding time:
 
   - The filters are set to exactly one filter receiving everything
-  - The socket only receives valid data frames (=> no error frames)
+  - The socket only receives valid data frames (=> no error message frames)
   - The loopback of sent CAN frames is enabled (see chapter 3.2)
   - The socket does not receive its own sent frames (in loopback mode)
 
@@ -434,7 +481,7 @@ solution for a couple of reasons:
   4.1.2 RAW socket option CAN_RAW_ERR_FILTER
 
   As described in chapter 3.4 the CAN interface driver can generate so
-  called Error Frames that can optionally be passed to the user
+  called Error Message Frames that can optionally be passed to the user
   application in the same way as other CAN frames. The possible
   errors are divided into different error classes that may be filtered
   using the appropriate error mask. To register for every possible
@@ -472,7 +519,69 @@ solution for a couple of reasons:
     setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
                &recv_own_msgs, sizeof(recv_own_msgs));
 
-  4.1.5 RAW socket returned message flags
+  4.1.5 RAW socket option CAN_RAW_FD_FRAMES
+
+  CAN FD support in CAN_RAW sockets can be enabled with a new socket option
+  CAN_RAW_FD_FRAMES which is off by default. When the new socket option is
+  not supported by the CAN_RAW socket (e.g. on older kernels), switching the
+  CAN_RAW_FD_FRAMES option returns the error -ENOPROTOOPT.
+
+  Once CAN_RAW_FD_FRAMES is enabled the application can send both CAN frames
+  and CAN FD frames. OTOH the application has to handle CAN and CAN FD frames
+  when reading from the socket.
+
+    CAN_RAW_FD_FRAMES enabled:  CAN_MTU and CANFD_MTU are allowed
+    CAN_RAW_FD_FRAMES disabled: only CAN_MTU is allowed (default)
+
+  Example:
+    [ remember: CANFD_MTU == sizeof(struct canfd_frame) ]
+
+    struct canfd_frame cfd;
+
+    nbytes = read(s, &cfd, CANFD_MTU);
+
+    if (nbytes == CANFD_MTU) {
+            printf("got CAN FD frame with length %d\n", cfd.len);
+           /* cfd.flags contains valid data */
+    } else if (nbytes == CAN_MTU) {
+            printf("got legacy CAN frame with length %d\n", cfd.len);
+           /* cfd.flags is undefined */
+    } else {
+            fprintf(stderr, "read: invalid CAN(FD) frame\n");
+            return 1;
+    }
+
+    /* the content can be handled independently from the received MTU size */
+
+    printf("can_id: %X data length: %d data: ", cfd.can_id, cfd.len);
+    for (i = 0; i < cfd.len; i++)
+            printf("%02X ", cfd.data[i]);
+
+  When reading with size CANFD_MTU only returns CAN_MTU bytes that have
+  been received from the socket a legacy CAN frame has been read into the
+  provided CAN FD structure. Note that the canfd_frame.flags data field is
+  not specified in the struct can_frame and therefore it is only valid in
+  CANFD_MTU sized CAN FD frames.
+
+  As long as the payload length is <=8 the received CAN frames from CAN FD
+  capable CAN devices can be received and read by legacy sockets too. When
+  user-generated CAN FD frames have a payload length <=8 these can be send
+  by legacy CAN network interfaces too. Sending CAN FD frames with payload
+  length > 8 to a legacy CAN network interface returns an -EMSGSIZE error.
+
+  Implementation hint for new CAN applications:
+
+  To build a CAN FD aware application use struct canfd_frame as basic CAN
+  data structure for CAN_RAW based applications. When the application is
+  executed on an older Linux kernel and switching the CAN_RAW_FD_FRAMES
+  socket option returns an error: No problem. You'll get legacy CAN frames
+  or CAN FD frames and can process them the same way.
+
+  When sending to CAN devices make sure that the device is capable to handle
+  CAN FD frames by checking if the device maximum transfer unit is CANFD_MTU.
+  The CAN device MTU can be retrieved e.g. with a SIOCGIFMTU ioctl() syscall.
+
+  4.1.6 RAW socket returned message flags
 
   When using recvmsg() call, the msg->msg_flags may contain following flags:
 
@@ -527,7 +636,7 @@ solution for a couple of reasons:
 
     rcvlist_all - list for unfiltered entries (no filter operations)
     rcvlist_eff - list for single extended frame (EFF) entries
-    rcvlist_err - list for error frames masks
+    rcvlist_err - list for error message frames masks
     rcvlist_fil - list for mask/value filters
     rcvlist_inv - list for mask/value filters (inverse semantic)
     rcvlist_sff - list for single standard frame (SFF) entries
@@ -573,10 +682,13 @@ solution for a couple of reasons:
     dev->type  = ARPHRD_CAN; /* the netdevice hardware type */
     dev->flags = IFF_NOARP;  /* CAN has no arp */
 
-    dev->mtu   = sizeof(struct can_frame);
+    dev->mtu = CAN_MTU; /* sizeof(struct can_frame) -> legacy CAN interface */
 
-  The struct can_frame is the payload of each socket buffer in the
-  protocol family PF_CAN.
+    or alternative, when the controller supports CAN with flexible data rate:
+    dev->mtu = CANFD_MTU; /* sizeof(struct canfd_frame) -> CAN FD interface */
+
+  The struct can_frame or struct canfd_frame is the payload of each socket
+  buffer (skbuff) in the protocol family PF_CAN.
 
   6.2 local loopback of sent frames
 
@@ -784,15 +896,41 @@ solution for a couple of reasons:
     $ ip link set canX type can restart-ms 100
 
   Alternatively, the application may realize the "bus-off" condition
-  by monitoring CAN error frames and do a restart when appropriate with
-  the command:
+  by monitoring CAN error message frames and do a restart when
+  appropriate with the command:
 
     $ ip link set canX type can restart
 
-  Note that a restart will also create a CAN error frame (see also
-  chapter 3.4).
+  Note that a restart will also create a CAN error message frame (see
+  also chapter 3.4).
+
+  6.6 CAN FD (flexible data rate) driver support
+
+  CAN FD capable CAN controllers support two different bitrates for the
+  arbitration phase and the payload phase of the CAN FD frame. Therefore a
+  second bittiming has to be specified in order to enable the CAN FD bitrate.
+
+  Additionally CAN FD capable CAN controllers support up to 64 bytes of
+  payload. The representation of this length in can_frame.can_dlc and
+  canfd_frame.len for userspace applications and inside the Linux network
+  layer is a plain value from 0 .. 64 instead of the CAN 'data length code'.
+  The data length code was a 1:1 mapping to the payload length in the legacy
+  CAN frames anyway. The payload length to the bus-relevant DLC mapping is
+  only performed inside the CAN drivers, preferably with the helper
+  functions can_dlc2len() and can_len2dlc().
+
+  The CAN netdevice driver capabilities can be distinguished by the network
+  devices maximum transfer unit (MTU):
+
+  MTU = 16 (CAN_MTU)   => sizeof(struct can_frame)   => 'legacy' CAN device
+  MTU = 72 (CANFD_MTU) => sizeof(struct canfd_frame) => CAN FD capable device
+
+  The CAN device MTU can be retrieved e.g. with a SIOCGIFMTU ioctl() syscall.
+  N.B. CAN FD capable devices can also handle and send legacy CAN frames.
+
+  FIXME: Add details about the CAN FD controller configuration when available.
 
-  6.6 Supported CAN hardware
+  6.7 Supported CAN hardware
 
   Please check the "Kconfig" file in "drivers/net/can" to get an actual
   list of the support CAN hardware. On the Socket CAN project website
index 6f896b9..5f3ef7f 100644 (file)
@@ -468,6 +468,19 @@ tcp_syncookies - BOOLEAN
        SYN flood warnings in logs not being really flooded, your server
        is seriously misconfigured.
 
+tcp_fastopen - INTEGER
+       Enable TCP Fast Open feature (draft-ietf-tcpm-fastopen) to send data
+       in the opening SYN packet. To use this feature, the client application
+       must not use connect(). Instead, it should use sendmsg() or sendto()
+       with MSG_FASTOPEN flag which performs a TCP handshake automatically.
+
+       The values (bitmap) are:
+       1: Enables sending data in the opening SYN on the client
+       5: Enables sending data in the opening SYN on the client regardless
+          of cookie availability.
+
+       Default: 0
+
 tcp_syn_retries - INTEGER
        Number of times initial SYNs for an active TCP connection attempt
        will be retransmitted. Should not be higher than 255. Default value
@@ -551,6 +564,25 @@ tcp_thin_dupack - BOOLEAN
        Documentation/networking/tcp-thin.txt
        Default: 0
 
+tcp_limit_output_bytes - INTEGER
+       Controls TCP Small Queue limit per tcp socket.
+       TCP bulk sender tends to increase packets in flight until it
+       gets losses notifications. With SNDBUF autotuning, this can
+       result in a large amount of packets queued in qdisc/device
+       on the local machine, hurting latency of other flows, for
+       typical pfifo_fast qdiscs.
+       tcp_limit_output_bytes limits the number of bytes on qdisc
+       or device to reduce artificial RTT/cwnd and reduce bufferbloat.
+       Note: For GSO/TSO enabled flows, we try to have at least two
+       packets in flight. Reducing tcp_limit_output_bytes might also
+       reduce the size of individual GSO packet (64KB being the max)
+       Default: 131072
+
+tcp_challenge_ack_limit - INTEGER
+       Limits number of Challenge ACK sent per second, as recommended
+       in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks)
+       Default: 100
+
 UDP variables:
 
 udp_mem - vector of 3 INTEGERs: min, pressure, max
@@ -857,9 +889,19 @@ accept_source_route - BOOLEAN
                FALSE (host)
 
 accept_local - BOOLEAN
-       Accept packets with local source addresses. In combination with
-       suitable routing, this can be used to direct packets between two
-       local interfaces over the wire and have them accepted properly.
+       Accept packets with local source addresses. In combination
+       with suitable routing, this can be used to direct packets
+       between two local interfaces over the wire and have them
+       accepted properly.
+
+       rp_filter must be set to a non-zero value in order for
+       accept_local to have an effect.
+
+       default FALSE
+
+route_localnet - BOOLEAN
+       Do not consider loopback addresses as martian source or destination
+       while routing. This enables the use of 127/8 for local routing purposes.
        default FALSE
 
 rp_filter - INTEGER
index 4be0c03..d2a9f43 100644 (file)
@@ -136,16 +136,6 @@ For more information, please review the AMD8131 errata at
 http://vip.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/
 26310_AMD-8131_HyperTransport_PCI-X_Tunnel_Revision_Guide_rev_3_18.pdf
 
-6.  Available Downloads
-Neterion "s2io" driver in Red Hat and Suse 2.6-based distributions is kept up 
-to date, also the latest "s2io" code (including support for 2.4 kernels) is 
-available via "Support" link on the Neterion site:  http://www.neterion.com.
-
-For Xframe User Guide (Programming manual), visit ftp site ns1.s2io.com,
-user: linuxdocs password: HALdocs
-
-7. Support 
+6. Support
 For further support please contact either your 10GbE Xframe NIC vendor (IBM, 
-HP, SGI etc.) or click on the "Support" link on the Neterion site:  
-http://www.neterion.com.
-
+HP, SGI etc.)
index 5cb9a19..c676b9c 100644 (file)
@@ -257,9 +257,11 @@ reset procedure etc).
  o Makefile
  o stmmac_main.c: main network device driver;
  o stmmac_mdio.c: mdio functions;
+ o stmmac_pci: PCI driver;
+ o stmmac_platform.c: platform driver
  o stmmac_ethtool.c: ethtool support;
  o stmmac_timer.[ch]: timer code used for mitigating the driver dma interrupts
-                     Only tested on ST40 platforms based.
+                     (only tested on ST40 platforms based);
  o stmmac.h: private driver structure;
  o common.h: common definitions and VFTs;
  o descs.h: descriptor structure definitions;
@@ -269,9 +271,11 @@ reset procedure etc).
  o dwmac100_core: MAC 100 core and dma code;
  o dwmac100_dma.c: dma funtions for the MAC chip;
  o dwmac1000.h: specific header file for the MAC;
- o dwmac_lib.c: generic DMA functions shared among chips
- o enh_desc.c: functions for handling enhanced descriptors
- o norm_desc.c: functions for handling normal descriptors
+ o dwmac_lib.c: generic DMA functions shared among chips;
+ o enh_desc.c: functions for handling enhanced descriptors;
+ o norm_desc.c: functions for handling normal descriptors;
+ o chain_mode.c/ring_mode.c:: functions to manage RING/CHAINED modes;
+ o mmc_core.c/mmc.h: Management MAC Counters;
 
 5) Debug Information
 
@@ -304,7 +308,27 @@ All these are only useful during the developing stage
 and should never enabled inside the code for general usage.
 In fact, these can generate an huge amount of debug messages.
 
-6) TODO:
+6) Energy Efficient Ethernet
+
+Energy Efficient Ethernet(EEE) enables IEEE 802.3 MAC sublayer along
+with a family of Physical layer to operate in the Low power Idle(LPI)
+mode. The EEE mode supports the IEEE 802.3 MAC operation at 100Mbps,
+1000Mbps & 10Gbps.
+
+The LPI mode allows power saving by switching off parts of the
+communication device functionality when there is no data to be
+transmitted & received. The system on both the side of the link can
+disable some functionalities & save power during the period of low-link
+utilization. The MAC controls whether the system should enter or exit
+the LPI mode & communicate this to PHY.
+
+As soon as the interface is opened, the driver verifies if the EEE can
+be supported. This is done by looking at both the DMA HW capability
+register and the PHY devices MCD registers.
+To enter in Tx LPI mode the driver needs to have a software timer
+that enable and disable the LPI mode when there is nothing to be
+transmitted.
+
+7) TODO:
  o XGMAC is not supported.
- o Add the EEE - Energy Efficient Ethernet
  o Add the PTP - precision time protocol
index d2e2997..bb76c66 100644 (file)
@@ -91,10 +91,3 @@ v)  addr_learn_en
        virtualization environment.
        Valid range: 0,1 (disabled, enabled respectively)
        Default: 0
-
-4) Troubleshooting:
--------------------
-
-To resolve an issue with the source code or X3100 series adapter, please collect
-the statistics, register dumps using ethool, relevant logs and email them to
-support@neterion.com.
index 320f933..89a339c 100644 (file)
@@ -178,3 +178,36 @@ ANY_GET_PARAMETER to the reader A gate to get information on the target
 that was discovered).
 
 Typically, such an event will be propagated to NFC Core from MSGRXWQ context.
+
+Error management
+----------------
+
+Errors that occur synchronously with the execution of an NFC Core request are
+simply returned as the execution result of the request. These are easy.
+
+Errors that occur asynchronously (e.g. in a background protocol handling thread)
+must be reported such that upper layers don't stay ignorant that something
+went wrong below and know that expected events will probably never happen.
+Handling of these errors is done as follows:
+
+- driver (pn544) fails to deliver an incoming frame: it stores the error such
+that any subsequent call to the driver will result in this error. Then it calls
+the standard nfc_shdlc_recv_frame() with a NULL argument to report the problem
+above. shdlc stores a EREMOTEIO sticky status, which will trigger SMW to
+report above in turn.
+
+- SMW is basically a background thread to handle incoming and outgoing shdlc
+frames. This thread will also check the shdlc sticky status and report to HCI
+when it discovers it is not able to run anymore because of an unrecoverable
+error that happened within shdlc or below. If the problem occurs during shdlc
+connection, the error is reported through the connect completion.
+
+- HCI: if an internal HCI error happens (frame is lost), or HCI is reported an
+error from a lower layer, HCI will either complete the currently executing
+command with that error, or notify NFC Core directly if no command is executing.
+
+- NFC Core: when NFC Core is notified of an error from below and polling is
+active, it will send a tag discovered event with an empty tag list to the user
+space to let it know that the poll operation will never be able to detect a tag.
+If polling is not active and the error was sticky, lower levels will return it
+at next invocation.
index fe643e7..f93b8ff 100644 (file)
@@ -329,7 +329,7 @@ F:  drivers/hwmon/adm1029.c
 
 ADM8211 WIRELESS DRIVER
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 S:     Orphan
 F:     drivers/net/wireless/adm8211.*
 
@@ -1423,7 +1423,7 @@ B43 WIRELESS DRIVER
 M:     Stefano Brivio <stefano.brivio@polimi.it>
 L:     linux-wireless@vger.kernel.org
 L:     b43-dev@lists.infradead.org
-W:     http://linuxwireless.org/en/users/Drivers/b43
+W:     http://wireless.kernel.org/en/users/Drivers/b43
 S:     Maintained
 F:     drivers/net/wireless/b43/
 
@@ -1432,7 +1432,7 @@ M:        Larry Finger <Larry.Finger@lwfinger.net>
 M:     Stefano Brivio <stefano.brivio@polimi.it>
 L:     linux-wireless@vger.kernel.org
 L:     b43-dev@lists.infradead.org
-W:     http://linuxwireless.org/en/users/Drivers/b43
+W:     http://wireless.kernel.org/en/users/Drivers/b43
 S:     Maintained
 F:     drivers/net/wireless/b43legacy/
 
@@ -1595,6 +1595,7 @@ M:        Arend van Spriel <arend@broadcom.com>
 M:     Franky (Zhenhui) Lin <frankyl@broadcom.com>
 M:     Kan Yan <kanyan@broadcom.com>
 L:     linux-wireless@vger.kernel.org
+L:     brcm80211-dev-list@broadcom.com
 S:     Supported
 F:     drivers/net/wireless/brcm80211/
 
@@ -3661,14 +3662,6 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 S:     Supported
 F:     drivers/net/wireless/iwlwifi/
 
-INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
-M:     Samuel Ortiz <samuel.ortiz@intel.com>
-M:     Intel Linux Wireless <ilw@linux.intel.com>
-L:     linux-wireless@vger.kernel.org
-S:     Supported
-W:     http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
-F:     drivers/net/wireless/iwmc3200wifi/
-
 INTEL MANAGEMENT ENGINE (mei)
 M:     Tomas Winkler <tomas.winkler@intel.com>
 L:     linux-kernel@vger.kernel.org
@@ -4352,7 +4345,7 @@ F:        arch/m68k/hp300/
 MAC80211
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:     Maintained
@@ -4364,7 +4357,7 @@ MAC80211 PID RATE CONTROL
 M:     Stefano Brivio <stefano.brivio@polimi.it>
 M:     Mattias Nissler <mattias.nissler@gmx.de>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
+W:     http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:     Maintained
@@ -4638,8 +4631,6 @@ F:        net/sched/sch_netem.c
 NETERION 10GbE DRIVERS (s2io/vxge)
 M:     Jon Mason <jdmason@kudzu.us>
 L:     netdev@vger.kernel.org
-W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
-W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:     Supported
 F:     Documentation/networking/s2io.txt
 F:     Documentation/networking/vxge.txt
@@ -5050,7 +5041,7 @@ F:        fs/ocfs2/
 
 ORINOCO DRIVER
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/en/users/Drivers/orinoco
+W:     http://wireless.kernel.org/en/users/Drivers/orinoco
 W:     http://www.nongnu.org/orinoco/
 S:     Orphan
 F:     drivers/net/wireless/orinoco/
@@ -5754,7 +5745,7 @@ F:        net/rose/
 RTL8180 WIRELESS DRIVER
 M:     "John W. Linville" <linville@tuxdriver.com>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/rtl818x/rtl8180/
@@ -5764,7 +5755,7 @@ M:        Herton Ronaldo Krzesinski <herton@canonical.com>
 M:     Hin-Tak Leung <htl10@users.sourceforge.net>
 M:     Larry Finger <Larry.Finger@lwfinger.net>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/rtl818x/rtl8187/
@@ -5773,7 +5764,7 @@ RTL8192CE WIRELESS DRIVER
 M:     Larry Finger <Larry.Finger@lwfinger.net>
 M:     Chaoming Li <chaoming_li@realsil.com.cn>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/rtlwifi/
index c9d9473..5ed654a 100644 (file)
@@ -873,7 +873,7 @@ static struct adf702x_platform_data adf7021_platform_data = {
 };
 static inline void adf702x_mac_init(void)
 {
-       random_ether_addr(adf7021_platform_data.mac_addr);
+       eth_random_addr(adf7021_platform_data.mac_addr);
 }
 #else
 static inline void adf702x_mac_init(void) {}
index 0748c94..3ac7408 100644 (file)
@@ -80,7 +80,7 @@ int soc_mac_addr(unsigned int index, u8 *addr)
                if (have_fuse_mac)
                        memcpy(addr, c6x_fuse_mac, 6);
                else
-                       random_ether_addr(addr);
+                       eth_random_addr(addr);
        }
 
        /* adjust for specific EMAC device */
diff --git a/arch/m68k/include/asm/mcf8390.h b/arch/m68k/include/asm/mcf8390.h
new file mode 100644 (file)
index 0000000..a72a208
--- /dev/null
@@ -0,0 +1,131 @@
+/****************************************************************************/
+
+/*
+ *     mcf8390.h -- NS8390 support for ColdFire eval boards.
+ *
+ *     (C) Copyright 1999-2000, Greg Ungerer (gerg@snapgear.com)
+ *     (C) Copyright 2000,      Lineo (www.lineo.com)
+ *     (C) Copyright 2001,      SnapGear (www.snapgear.com)
+ *
+ *      19990409 David W. Miller  Converted from m5206ne.h for 5307 eval board
+ *
+ *      Hacked support for m5206e Cadre III evaluation board
+ *      Fred Stevens (fred.stevens@pemstar.com) 13 April 1999
+ */
+
+/****************************************************************************/
+#ifndef        mcf8390_h
+#define        mcf8390_h
+/****************************************************************************/
+
+
+/*
+ *     Support for NE2000 clones devices in ColdFire based boards.
+ *     Not all boards address these parts the same way, some use a
+ *     direct addressing method, others use a side-band address space
+ *     to access odd address registers, some require byte swapping
+ *     others do not.
+ */
+#define        BSWAP(w)        (((w) << 8) | ((w) >> 8))
+#define        RSWAP(w)        (w)
+
+
+/*
+ *     Define the basic hardware resources of NE2000 boards.
+ */
+
+#if defined(CONFIG_ARN5206)
+#define NE2000_ADDR            0x40000300
+#define NE2000_ODDOFFSET       0x00010000
+#define NE2000_ADDRSIZE                0x00020000
+#define        NE2000_IRQ_VECTOR       0xf0
+#define        NE2000_IRQ_PRIORITY     2
+#define        NE2000_IRQ_LEVEL        4
+#define        NE2000_BYTE             volatile unsigned short
+#endif
+
+#if defined(CONFIG_M5206eC3)
+#define        NE2000_ADDR             0x40000300
+#define        NE2000_ODDOFFSET        0x00010000
+#define        NE2000_ADDRSIZE         0x00020000
+#define        NE2000_IRQ_VECTOR       0x1c
+#define        NE2000_IRQ_PRIORITY     2
+#define        NE2000_IRQ_LEVEL        4
+#define        NE2000_BYTE             volatile unsigned short
+#endif
+
+#if defined(CONFIG_M5206e) && defined(CONFIG_NETtel)
+#define NE2000_ADDR            0x30000300
+#define NE2000_ADDRSIZE                0x00001000
+#define NE2000_IRQ_VECTOR      25
+#define NE2000_IRQ_PRIORITY    1
+#define NE2000_IRQ_LEVEL       3
+#define        NE2000_BYTE             volatile unsigned char
+#endif
+
+#if defined(CONFIG_M5307C3)
+#define NE2000_ADDR            0x40000300
+#define NE2000_ODDOFFSET       0x00010000
+#define NE2000_ADDRSIZE                0x00020000
+#define NE2000_IRQ_VECTOR      0x1b
+#define        NE2000_BYTE             volatile unsigned short
+#endif
+
+#if defined(CONFIG_M5272) && defined(CONFIG_NETtel)
+#define NE2000_ADDR            0x30600300
+#define NE2000_ODDOFFSET       0x00008000
+#define NE2000_ADDRSIZE                0x00010000
+#define NE2000_IRQ_VECTOR      67
+#undef BSWAP
+#define        BSWAP(w)                (w)
+#define        NE2000_BYTE             volatile unsigned short
+#undef RSWAP
+#define        RSWAP(w)                (((w) << 8) | ((w) >> 8))
+#endif
+
+#if defined(CONFIG_M5307) && defined(CONFIG_NETtel)
+#define NE2000_ADDR0           0x30600300
+#define NE2000_ADDR1           0x30800300
+#define NE2000_ODDOFFSET       0x00008000
+#define NE2000_ADDRSIZE                0x00010000
+#define NE2000_IRQ_VECTOR0     27
+#define NE2000_IRQ_VECTOR1     29
+#undef BSWAP
+#define        BSWAP(w)                (w)
+#define        NE2000_BYTE             volatile unsigned short
+#undef RSWAP
+#define        RSWAP(w)                (((w) << 8) | ((w) >> 8))
+#endif
+
+#if defined(CONFIG_M5307) && defined(CONFIG_SECUREEDGEMP3)
+#define NE2000_ADDR            0x30600300
+#define NE2000_ODDOFFSET       0x00008000
+#define NE2000_ADDRSIZE                0x00010000
+#define NE2000_IRQ_VECTOR      27
+#undef BSWAP
+#define        BSWAP(w)                (w)
+#define        NE2000_BYTE             volatile unsigned short
+#undef RSWAP
+#define        RSWAP(w)                (((w) << 8) | ((w) >> 8))
+#endif
+
+#if defined(CONFIG_ARN5307)
+#define NE2000_ADDR            0xfe600300
+#define NE2000_ODDOFFSET       0x00010000
+#define NE2000_ADDRSIZE                0x00020000
+#define NE2000_IRQ_VECTOR      0x1b
+#define NE2000_IRQ_PRIORITY    2
+#define NE2000_IRQ_LEVEL       3
+#define        NE2000_BYTE             volatile unsigned short
+#endif
+
+#if defined(CONFIG_M5407C3)
+#define NE2000_ADDR            0x40000300
+#define NE2000_ODDOFFSET       0x00010000
+#define NE2000_ADDRSIZE                0x00020000
+#define NE2000_IRQ_VECTOR      0x1b
+#define        NE2000_BYTE             volatile unsigned short
+#endif
+
+/****************************************************************************/
+#endif /* mcf8390_h */
diff --git a/arch/m68k/include/asm/mcfne.h b/arch/m68k/include/asm/mcfne.h
deleted file mode 100644 (file)
index bf638be..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-/****************************************************************************/
-
-/*
- *     mcfne.h -- NE2000 in ColdFire eval boards.
- *
- *     (C) Copyright 1999-2000, Greg Ungerer (gerg@snapgear.com)
- *     (C) Copyright 2000,      Lineo (www.lineo.com)
- *     (C) Copyright 2001,      SnapGear (www.snapgear.com)
- *
- *      19990409 David W. Miller  Converted from m5206ne.h for 5307 eval board
- *
- *      Hacked support for m5206e Cadre III evaluation board
- *      Fred Stevens (fred.stevens@pemstar.com) 13 April 1999
- */
-
-/****************************************************************************/
-#ifndef        mcfne_h
-#define        mcfne_h
-/****************************************************************************/
-
-
-/*
- *     Support for NE2000 clones devices in ColdFire based boards.
- *     Not all boards address these parts the same way, some use a
- *     direct addressing method, others use a side-band address space
- *     to access odd address registers, some require byte swapping
- *     others do not.
- */
-#define        BSWAP(w)        (((w) << 8) | ((w) >> 8))
-#define        RSWAP(w)        (w)
-
-
-/*
- *     Define the basic hardware resources of NE2000 boards.
- */
-
-#if defined(CONFIG_ARN5206)
-#define NE2000_ADDR            0x40000300
-#define NE2000_ODDOFFSET       0x00010000
-#define        NE2000_IRQ_VECTOR       0xf0
-#define        NE2000_IRQ_PRIORITY     2
-#define        NE2000_IRQ_LEVEL        4
-#define        NE2000_BYTE             volatile unsigned short
-#endif
-
-#if defined(CONFIG_M5206eC3)
-#define        NE2000_ADDR             0x40000300
-#define        NE2000_ODDOFFSET        0x00010000
-#define        NE2000_IRQ_VECTOR       0x1c
-#define        NE2000_IRQ_PRIORITY     2
-#define        NE2000_IRQ_LEVEL        4
-#define        NE2000_BYTE             volatile unsigned short
-#endif
-
-#if defined(CONFIG_M5206e) && defined(CONFIG_NETtel)
-#define NE2000_ADDR            0x30000300
-#define NE2000_IRQ_VECTOR      25
-#define NE2000_IRQ_PRIORITY    1
-#define NE2000_IRQ_LEVEL       3
-#define        NE2000_BYTE             volatile unsigned char
-#endif
-
-#if defined(CONFIG_M5307C3)
-#define NE2000_ADDR            0x40000300
-#define NE2000_ODDOFFSET       0x00010000
-#define NE2000_IRQ_VECTOR      0x1b
-#define        NE2000_BYTE             volatile unsigned short
-#endif
-
-#if defined(CONFIG_M5272) && defined(CONFIG_NETtel)
-#define NE2000_ADDR            0x30600300
-#define NE2000_ODDOFFSET       0x00008000
-#define NE2000_IRQ_VECTOR      67
-#undef BSWAP
-#define        BSWAP(w)                (w)
-#define        NE2000_BYTE             volatile unsigned short
-#undef RSWAP
-#define        RSWAP(w)                (((w) << 8) | ((w) >> 8))
-#endif
-
-#if defined(CONFIG_M5307) && defined(CONFIG_NETtel)
-#define NE2000_ADDR0           0x30600300
-#define NE2000_ADDR1           0x30800300
-#define NE2000_ODDOFFSET       0x00008000
-#define NE2000_IRQ_VECTOR0     27
-#define NE2000_IRQ_VECTOR1     29
-#undef BSWAP
-#define        BSWAP(w)                (w)
-#define        NE2000_BYTE             volatile unsigned short
-#undef RSWAP
-#define        RSWAP(w)                (((w) << 8) | ((w) >> 8))
-#endif
-
-#if defined(CONFIG_M5307) && defined(CONFIG_SECUREEDGEMP3)
-#define NE2000_ADDR            0x30600300
-#define NE2000_ODDOFFSET       0x00008000
-#define NE2000_IRQ_VECTOR      27
-#undef BSWAP
-#define        BSWAP(w)                (w)
-#define        NE2000_BYTE             volatile unsigned short
-#undef RSWAP
-#define        RSWAP(w)                (((w) << 8) | ((w) >> 8))
-#endif
-
-#if defined(CONFIG_ARN5307)
-#define NE2000_ADDR            0xfe600300
-#define NE2000_ODDOFFSET       0x00010000
-#define NE2000_IRQ_VECTOR      0x1b
-#define NE2000_IRQ_PRIORITY    2
-#define NE2000_IRQ_LEVEL       3
-#define        NE2000_BYTE             volatile unsigned short
-#endif
-
-#if defined(CONFIG_M5407C3)
-#define NE2000_ADDR            0x40000300
-#define NE2000_ODDOFFSET       0x00010000
-#define NE2000_IRQ_VECTOR      0x1b
-#define        NE2000_BYTE             volatile unsigned short
-#endif
-
-/****************************************************************************/
-
-/*
- *     Side-band address space for odd address requires re-mapping
- *     many of the standard ISA access functions.
- */
-#ifdef NE2000_ODDOFFSET
-
-#undef outb
-#undef outb_p
-#undef inb
-#undef inb_p
-#undef outsb
-#undef outsw
-#undef insb
-#undef insw
-
-#define        outb    ne2000_outb
-#define        inb     ne2000_inb
-#define        outb_p  ne2000_outb
-#define        inb_p   ne2000_inb
-#define        outsb   ne2000_outsb
-#define        outsw   ne2000_outsw
-#define        insb    ne2000_insb
-#define        insw    ne2000_insw
-
-
-#ifndef COLDFIRE_NE2000_FUNCS
-
-void ne2000_outb(unsigned int val, unsigned int addr);
-int  ne2000_inb(unsigned int addr);
-void ne2000_insb(unsigned int addr, void *vbuf, int unsigned long len);
-void ne2000_insw(unsigned int addr, void *vbuf, unsigned long len);
-void ne2000_outsb(unsigned int addr, void *vbuf, unsigned long len);
-void ne2000_outsw(unsigned int addr, void *vbuf, unsigned long len);
-
-#else
-
-/*
- *     This macro converts a conventional register address into the
- *     real memory pointer of the mapped NE2000 device.
- *     On most NE2000 implementations on ColdFire boards the chip is
- *     mapped in kinda funny, due to its ISA heritage.
- */
-#define        NE2000_PTR(addr)        ((addr&0x1)?(NE2000_ODDOFFSET+addr-1):(addr))
-#define        NE2000_DATA_PTR(addr)   (addr)
-
-
-void ne2000_outb(unsigned int val, unsigned int addr)
-{
-       NE2000_BYTE     *rp;
-
-       rp = (NE2000_BYTE *) NE2000_PTR(addr);
-       *rp = RSWAP(val);
-}
-
-int ne2000_inb(unsigned int addr)
-{
-       NE2000_BYTE     *rp, val;
-
-       rp = (NE2000_BYTE *) NE2000_PTR(addr);
-       val = *rp;
-       return((int) ((NE2000_BYTE) RSWAP(val)));
-}
-
-void ne2000_insb(unsigned int addr, void *vbuf, int unsigned long len)
-{
-       NE2000_BYTE     *rp, val;
-       unsigned char   *buf;
-
-       buf = (unsigned char *) vbuf;
-       rp = (NE2000_BYTE *) NE2000_DATA_PTR(addr);
-       for (; (len > 0); len--) {
-               val = *rp;
-               *buf++ = RSWAP(val);
-       }
-}
-
-void ne2000_insw(unsigned int addr, void *vbuf, unsigned long len)
-{
-       volatile unsigned short *rp;
-       unsigned short          w, *buf;
-
-       buf = (unsigned short *) vbuf;
-       rp = (volatile unsigned short *) NE2000_DATA_PTR(addr);
-       for (; (len > 0); len--) {
-               w = *rp;
-               *buf++ = BSWAP(w);
-       }
-}
-
-void ne2000_outsb(unsigned int addr, const void *vbuf, unsigned long len)
-{
-       NE2000_BYTE     *rp, val;
-       unsigned char   *buf;
-
-       buf = (unsigned char *) vbuf;
-       rp = (NE2000_BYTE *) NE2000_DATA_PTR(addr);
-       for (; (len > 0); len--) {
-               val = *buf++;
-               *rp = RSWAP(val);
-       }
-}
-
-void ne2000_outsw(unsigned int addr, const void *vbuf, unsigned long len)
-{
-       volatile unsigned short *rp;
-       unsigned short          w, *buf;
-
-       buf = (unsigned short *) vbuf;
-       rp = (volatile unsigned short *) NE2000_DATA_PTR(addr);
-       for (; (len > 0); len--) {
-               w = *buf++;
-               *rp = BSWAP(w);
-       }
-}
-
-#endif /* COLDFIRE_NE2000_FUNCS */
-#endif /* NE2000_OFFOFFSET */
-
-/****************************************************************************/
-#endif /* mcfne_h */
index 1a24d31..1bbc24b 100644 (file)
@@ -310,10 +310,10 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr)
                                        &dev_addr[4], &dev_addr[5]) != 6) {
                        pr_warning("cannot parse mac address, "
                                        "using random address\n");
-                       random_ether_addr(dev_addr);
+                       eth_random_addr(dev_addr);
                }
        } else
-               random_ether_addr(dev_addr);
+               eth_random_addr(dev_addr);
 }
 
 /*****************************************************************************
index 3933c37..820b848 100644 (file)
@@ -254,7 +254,7 @@ early_param("rfmac", rfmac_param);
  * Generates an Ethernet MAC address that is highly likely to be unique for
  * this particular system on a network with other systems of the same type.
  *
- * The problem we are solving is that, when random_ether_addr() is used to
+ * The problem we are solving is that, when eth_random_addr() is used to
  * generate MAC addresses at startup, there isn't much entropy for the random
  * number generator to use and the addresses it produces are fairly likely to
  * be the same as those of other identical systems on the same local network.
@@ -269,7 +269,7 @@ early_param("rfmac", rfmac_param);
  * Still, this does give us something to work with.
  *
  * The approach we take is:
- * 1.  If we can't get the RF MAC Address, just call random_ether_addr.
+ * 1.  If we can't get the RF MAC Address, just call eth_random_addr.
  * 2.  Use the 24-bit NIC-specific bits of the RF MAC address as the last 24
  *     bits of the new address. This is very likely to be unique, except for
  *     the current box.
@@ -299,7 +299,7 @@ void platform_random_ether_addr(u8 addr[ETH_ALEN])
        if (!have_rfmac) {
                pr_warning("rfmac not available on command line; "
                        "generating random MAC address\n");
-               random_ether_addr(addr);
+               eth_random_addr(addr);
        }
 
        else {
index 1a69244..e9073e9 100644 (file)
@@ -96,6 +96,7 @@ static void bpf_flush_icache(void *start_, void *end_)
 #define AND            F3(2, 0x01)
 #define ANDCC          F3(2, 0x11)
 #define OR             F3(2, 0x02)
+#define XOR            F3(2, 0x03)
 #define SUB            F3(2, 0x04)
 #define SUBCC          F3(2, 0x14)
 #define MUL            F3(2, 0x0a)     /* umul */
@@ -462,6 +463,9 @@ void bpf_jit_compile(struct sk_filter *fp)
                        case BPF_S_ALU_OR_K:    /* A |= K */
                                emit_alu_K(OR, K);
                                break;
+                       case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
+                               emit_alu_X(XOR);
+                               break;
                        case BPF_S_ALU_LSH_X:   /* A <<= X */
                                emit_alu_X(SLL);
                                break;
index 0d60c56..458d324 100644 (file)
@@ -339,7 +339,7 @@ static int setup_etheraddr(char *str, unsigned char *addr, char *name)
 random:
        printk(KERN_INFO
               "Choosing a random ethernet address for device %s\n", name);
-       random_ether_addr(addr);
+       eth_random_addr(addr);
        return 1;
 }
 
index 0597f95..33643a8 100644 (file)
@@ -309,6 +309,10 @@ void bpf_jit_compile(struct sk_filter *fp)
                                else
                                        EMIT1_off32(0x0d, K);   /* or imm32,%eax */
                                break;
+                       case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
+                               seen |= SEEN_XREG;
+                               EMIT2(0x31, 0xd8);              /* xor %ebx,%eax */
+                               break;
                        case BPF_S_ALU_LSH_X: /* A <<= X; */
                                seen |= SEEN_XREG;
                                EMIT4(0x89, 0xd9, 0xd3, 0xe0);  /* mov %ebx,%ecx; shl %cl,%eax */
index 5a37ead..ba2c611 100644 (file)
@@ -496,9 +496,12 @@ static void crypto_netlink_rcv(struct sk_buff *skb)
 
 static int __init crypto_user_init(void)
 {
+       struct netlink_kernel_cfg cfg = {
+               .input  = crypto_netlink_rcv,
+       };
+
        crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO,
-                                           0, crypto_netlink_rcv,
-                                           NULL, THIS_MODULE);
+                                           THIS_MODULE, &cfg);
        if (!crypto_nlsk)
                return -ENOMEM;
 
index b81755b..f6589eb 100644 (file)
 
 #define BCMA_CORE_SIZE         0x1000
 
+#define bcma_err(bus, fmt, ...) \
+       pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
+#define bcma_warn(bus, fmt, ...) \
+       pr_warn("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
+#define bcma_info(bus, fmt, ...) \
+       pr_info("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
+#define bcma_debug(bus, fmt, ...) \
+       pr_debug("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
+
 struct bcma_bus;
 
 /* main.c */
index bc6e892..63c8b47 100644 (file)
@@ -75,7 +75,7 @@ void bcma_core_set_clockmode(struct bcma_device *core,
                        udelay(10);
                }
                if (i)
-                       pr_err("HT force timeout\n");
+                       bcma_err(core->bus, "HT force timeout\n");
                break;
        case BCMA_CLKMODE_DYNAMIC:
                bcma_set32(core, BCMA_CLKCTLST, ~BCMA_CLKCTLST_FORCEHT);
@@ -102,9 +102,9 @@ void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on)
                        udelay(10);
                }
                if (i)
-                       pr_err("PLL enable timeout\n");
+                       bcma_err(core->bus, "PLL enable timeout\n");
        } else {
-               pr_warn("Disabling PLL not supported yet!\n");
+               bcma_warn(core->bus, "Disabling PLL not supported yet!\n");
        }
 }
 EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
@@ -120,8 +120,8 @@ u32 bcma_core_dma_translation(struct bcma_device *core)
                else
                        return BCMA_DMA_TRANSLATION_DMA32_CMT;
        default:
-               pr_err("DMA translation unknown for host %d\n",
-                      core->bus->hosttype);
+               bcma_err(core->bus, "DMA translation unknown for host %d\n",
+                        core->bus->hosttype);
        }
        return BCMA_DMA_TRANSLATION_NONE;
 }
index e9f1b3f..a4c3ebc 100644 (file)
@@ -44,7 +44,7 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)
        if (cc->capabilities & BCMA_CC_CAP_PMU)
                bcma_pmu_init(cc);
        if (cc->capabilities & BCMA_CC_CAP_PCTL)
-               pr_err("Power control not implemented!\n");
+               bcma_err(cc->core->bus, "Power control not implemented!\n");
 
        if (cc->core->id.rev >= 16) {
                if (cc->core->bus->sprom.leddc_on_time &&
@@ -137,8 +137,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
                                       | BCMA_CC_CORECTL_UARTCLKEN);
                }
        } else {
-               pr_err("serial not supported on this device ccrev: 0x%x\n",
-                      ccrev);
+               bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", ccrev);
                return;
        }