shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-10 15:08:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
83ad357dee467f63574de35752bc40033deab30e
linux/drivers/net/ethernet
History
David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-15 11:59:32 -04:00
..
3com
net/3com: Make el3_netdev_get_ecmd return void
2017-06-05 11:00:43 -04:00
8390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-05-26 20:46:35 -04:00
adaptec
net: adaptec: starfire: add checks for dma mapping errors
2017-01-29 19:04:11 -05:00
adi
net: bfin_mac: Remove unused stats member from struct bfin_mac_local
2017-03-27 16:01:59 -07:00
aeroflex
net: greth: Utilize of_get_mac_address()
2017-03-22 12:00:39 -07:00
agere
drivers: net: generalize napi_complete_done()
2017-01-30 15:10:42 -05:00
alacritech
net: make ndo_get_stats64 a void function
2017-01-08 17:51:44 -05:00
allwinner
net: ethernet: sun4i-emac: Read rxhdr in CPU byte-order
2016-11-15 22:05:54 -05:00
alteon
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
altera
drivers: net: generalize napi_complete_done()
2017-01-30 15:10:42 -05:00
amazon
net: ena: update ena driver to version 1.1.7
2017-06-11 16:36:47 -04:00
amd
net: propagate tc filter chain index down the ndo_setup_tc call
2017-06-08 09:55:53 -04:00
apm
net: phy: Make phy_ethtool_ksettings_get return void
2017-06-13 12:59:06 -04:00
apple
networking: use skb_put_zero()
2017-06-13 13:54:03 -04:00
aquantia
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
arc
net: arc_emac: switch to phy_start()/phy_stop()
2017-04-21 15:23:52 -04:00
atheros
net: atheros: atl2: don't return zero on failure path in atl2_probe()
2017-05-22 12:05:01 -04:00
aurora
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-12-03 12:29:53 -05:00
broadcom
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
brocade
bna: ethtool: Avoid reading past end of buffer
2017-05-08 14:41:42 -04:00
cadence
net: macb: fix phy interrupt parsing
2017-04-30 22:21:49 -04:00
calxeda
drivers: net: generalize napi_complete_done()
2017-01-30 15:10:42 -05:00
cavium
liquidio: fix VF driver off-by-one bug when setting ethtool -C ethX rx-frames
2017-06-14 15:42:20 -04:00
chelsio
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
cirrus
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
cisco
enic: unmask intr only when napi is complete
2017-05-23 11:05:45 -04:00
davicom
net: davicom: dm9000: use new api ethtool_{get|set}_link_ksettings
2016-12-17 21:31:41 -05:00
dec
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
dlink
net: dl2k: Use net_device_stats from struct net_device
2017-04-07 07:03:33 -07:00
emulex
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-05-26 20:46:35 -04:00
ezchip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-04-06 08:24:51 -07:00
faraday
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
freescale
net: phy: Make phy_ethtool_ksettings_get return void
2017-06-13 12:59:06 -04:00
fujitsu
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
hisilicon
net: phy: Make phy_ethtool_ksettings_get return void
2017-06-13 12:59:06 -04:00
hp
Annotate hardware config module parameters in drivers/net/ethernet/
2017-04-20 12:02:32 +01:00
i825xx
net: deprecate eth_change_mtu, remove usage
2016-10-13 09:36:57 -04:00
ibm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
intel
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
marvell
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
mediatek
net: phy: Make phy_ethtool_ksettings_get return void
2017-06-13 12:59:06 -04:00
mellanox
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
micrel
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
microchip
net: microchip: encx24j600: use new api ethtool_{get|set}_link_ksettings
2017-02-12 22:32:17 -05:00
moxa
net: moxa: Use net_device_stats from struct net_device
2017-04-07 07:03:33 -07:00
myricom
net: myricom: myri10ge: use new api ethtool_{get|set}_link_ksettings
2017-02-12 22:32:17 -05:00
natsemi
format-security: move static strings to const
2017-05-08 17:15:14 -07:00
neterion
net: ethernet: update drivers to handle HWTSTAMP_FILTER_NTP_ALL
2017-05-21 13:37:32 -04:00
netronome
nfp: report application FW build name in ethtool -i
2017-06-09 12:52:09 -04:00
nuvoton
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
nvidia
forcedeth: remove unnecessary carrier status check
2017-05-04 10:57:41 -04:00
nxp
drivers: net: generalize napi_complete_done()
2017-01-30 15:10:42 -05:00
oki-semi
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
packetengines
net: hamachi: use new api ethtool_{get|set}_link_ksettings
2017-02-17 14:06:41 -05:00
pasemi
drivers: net: generalize napi_complete_done()
2017-01-30 15:10:42 -05:00
qlogic
qed: Fix an off by one bug
2017-06-14 15:20:04 -04:00
qualcomm
networking: use skb_put_zero()
2017-06-13 13:54:03 -04:00
rdc
r6040: move spinlock in r6040_close as SOFTIRQ-unsafe lock order detected
2016-12-17 21:35:12 -05:00
realtek
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
renesas
net: phy: Make phy_ethtool_ksettings_get return void
2017-06-13 12:59:06 -04:00
rocker
rocker: Remove support bridge bypass FDB
2017-06-08 14:16:30 -04:00
samsung
net: ethernet: update drivers to make both SW and HW TX timestamps
2017-05-21 13:37:32 -04:00
seeq
drivers: net: ethernet: remove incorrect __exit markups
2017-03-02 14:33:49 -08:00
sfc
net: propagate tc filter chain index down the ndo_setup_tc call
2017-06-08 09:55:53 -04:00
sgi
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
silan
net: silan: sc92031: use new api ethtool_{get|set}_link_ksettings
2017-03-06 17:05:39 -08:00
sis
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
smsc
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
stmicro
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
sun
ldmvsw: stop the clean timer at beginning of remove
2017-05-15 15:36:08 -04:00
synopsys
net: dwc-xlgmac: add the initial ethtool support
2017-04-13 13:46:38 -04:00
tehuti
net: tehuti: use new api ethtool_{get|set}_link_ksettings
2017-03-27 16:00:07 -07:00
ti
net: phy: Make phy_ethtool_ksettings_get return void
2017-06-13 12:59:06 -04:00
tile
net: ethernet: update drivers to handle HWTSTAMP_FILTER_NTP_ALL
2017-05-21 13:37:32 -04:00
toshiba
format-security: move static strings to const
2017-05-08 17:15:14 -07:00
tundra
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
via
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
wiznet
net: ethernet: wiznet: avoid format string exposure
2017-04-06 13:38:11 -07:00
xilinx
net: axienet: use eth_hw_addr_random()
2017-03-06 17:15:41 -08:00
xircom
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
xscale
net: ethernet: ixp4xx_eth: Utilize phy_ethtool_nway_reset
2016-11-15 16:33:35 -05:00
dnet.c
drivers: net: generalize napi_complete_done()
2017-01-30 15:10:42 -05:00
dnet.h
net: ethernet: dnet: use phydev from struct net_device
2016-06-28 05:10:26 -04:00
ec_bhf.c
net: make ndo_get_stats64 a void function
2017-01-08 17:51:44 -05:00
ethoc.c
net: ethoc: enable NAPI before poll may be scheduled
2017-06-06 16:22:51 -04:00
fealnx.c
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
jme.c
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
jme.h
net: jme: use new api ethtool_{get|set}_link_ksettings
2017-01-17 11:44:27 -05:00
Kconfig
net: dwc-xlgmac: Initial driver for DesignWare Enterprise Ethernet
2017-03-09 13:29:27 -08:00
korina.c
net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void
2017-06-05 11:00:42 -04:00
lantiq_etop.c
drivers: net: generalize napi_complete_done()
2017-01-30 15:10:42 -05:00
Makefile
net: dwc-xlgmac: Initial driver for DesignWare Enterprise Ethernet
2017-03-09 13:29:27 -08:00
netx-eth.c
net: deprecate eth_change_mtu, remove usage
2016-10-13 09:36:57 -04:00