mirror_ubuntu-kernels/drivers/net/ethernet
Linus Torvalds c46a024ea5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:

 1) Various VTI tunnel (mark handling, PMTU) bug fixes from Alexander
    Duyck and Steffen Klassert.

 2) Revert ethtool PHY query change, it wasn't correct.  The PHY address
    selected by the driver running the PHY to MAC connection decides
    what PHY address GET ethtool operations return information from.

 3) Fix handling of sequence number bits for encryption IV generation in
    ESP driver, from Herbert Xu.

 4) UDP can return -EAGAIN when we hit a bad checksum on receive, even
    when there are other packets in the receive queue which is wrong.
    Just respect the error returned from the generic socket recv
    datagram helper.  From Eric Dumazet.

 5) Fix BNA driver firmware loading on big-endian systems, from Ivan
    Vecera.

 6) Fix regression in that we were inheriting the congestion control of
    the listening socket for new connections, the intended behavior
    always was to use the default in this case.  From Neal Cardwell.

 7) Fix NULL deref in brcmfmac driver, from Arend van Spriel.

 8) OTP parsing fix in iwlwifi from Liad Kaufman.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
  vti6: Add pmtu handling to vti6_xmit.
  Revert "net: core: 'ethtool' issue with querying phy settings"
  bnx2x: Move statistics implementation into semaphores
  xen: netback: read hotplug script once at start of day.
  xen: netback: fix printf format string warning
  Revert "netfilter: ensure number of counters is >0 in do_replace()"
  net: dsa: Properly propagate errors from dsa_switch_setup_one
  tcp: fix child sockets to use system default congestion control if not set
  udp: fix behavior of wrong checksums
  sfc: free multiple Rx buffers when required
  bna: fix soft lock-up during firmware initialization failure
  bna: remove unreasonable iocpf timer start
  bna: fix firmware loading on big-endian machines
  bridge: fix br_multicast_query_expired() bug
  via-rhine: Resigning as maintainer
  brcmfmac: avoid null pointer access when brcmf_msgbuf_get_pktid() fails
  mac80211: Fix mac80211.h docbook comments
  iwlwifi: nvm: fix otp parsing in 8000 hw family
  iwlwifi: pcie: fix tracking of cmd_in_flight
  ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call
  ...
2015-06-01 20:51:18 -07:00
..
3com
8390 net:treewide: Fix typo in drivers/net 2015-04-27 13:40:53 -04:00
adaptec
adi ptp: blackfin: use helpers for converting ns to timespec. 2015-03-31 17:19:19 -04:00
aeroflex
agere
allwinner
alteon
altera altera_tse: Correct rx packet length 2015-04-29 15:19:34 -04:00
amd net: amd-xgbe: Add hardware dependency 2015-05-09 16:24:15 -04:00
apm net: xgene_enet: Set hardware dependency 2015-05-09 16:24:15 -04:00
apple powerpc updates for 4.1 2015-04-16 13:53:32 -05:00
arc ethernet: arc: ARC_EMAC and EMAC_ROCKCHIP should depend on HAS_DMA 2015-04-23 14:09:58 -04:00
atheros trivial: net: atl1e: atl1e_hw.h: fix 0x0x prefix 2015-04-29 14:56:39 -04:00
broadcom bnx2x: Move statistics implementation into semaphores 2015-06-01 12:04:31 -07:00
brocade bna: fix soft lock-up during firmware initialization failure 2015-05-30 23:46:49 -07:00
cadence net: macb: Disable half duplex gigabit on Zynq 2015-05-22 14:58:09 -04:00
calxeda
chelsio cxgb4: Fix MC1 memory offset calculation 2015-04-29 15:50:16 -04:00
cirrus
cisco
davicom
dec
dlink
emulex cpumask_set_cpu_local_first => cpumask_local_spread, lament 2015-05-28 11:05:20 +09:30
faraday
freescale net: fec: Fix RGMII-ID mode 2015-04-30 16:48:53 -04:00
fujitsu
hisilicon net: hip04: Make tx coalesce timer actually work 2015-04-15 17:21:29 -04:00
hp
i825xx
ibm net/ibm/emac: fix size of emac dump memory areas 2015-05-25 16:38:55 -04:00
icplus
intel e1000e: Add pm_qos header 2015-05-12 23:22:03 -04:00
marvell pxa168: fix double deallocation of managed resources 2015-04-26 16:05:49 -04:00
mellanox ** NOW WITH TESTING! ** 2015-05-29 11:24:28 -07:00
micrel
microchip
moxa
myricom ethernet: myri10ge: use arch_phys_wc_add() 2015-04-23 14:28:14 -04:00
natsemi
neterion s2io: Update driver to use dma_wmb 2015-04-08 12:15:14 -04:00
nuvoton
nvidia
nxp
octeon
oki-semi
packetengines
pasemi
qlogic net: netxen: correct sysfs bin attribute return code 2015-05-27 00:25:33 -04:00
qualcomm net: qca_spi: Fix possible race during probe 2015-05-11 11:01:20 -04:00
rdc
realtek r8169: Do not use dev_kfree_skb in xmit path 2015-05-04 00:06:55 -04:00
renesas
rocker rocker: fix a neigh entry leak issue 2015-05-15 21:20:16 -04:00
samsung
seeq
sfc sfc: free multiple Rx buffers when required 2015-05-31 17:36:20 -07:00
sgi
silan
sis
smsc Revert "Revert "smc91x: retrieve IRQ and trigger flags in a modern way"" 2015-05-04 15:12:33 -04:00
stmicro net: stmmac: create one debugfs dir per net-device 2015-05-25 17:38:23 -04:00
sun sungem, sunhme, sunvnet: Update drivers to use dma_wmb/rmb 2015-04-08 12:15:14 -04:00
tehuti
ti net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface 2015-04-27 23:11:49 -04:00
tile This is the final removal (after several years!) of the obsolete cpus_* 2015-04-20 10:19:03 -07:00
toshiba toshiba: Remove celleb from Kconfig options 2015-04-14 14:57:10 -04:00
tundra
via
wiznet
xilinx net: ll_temac: Fix DMA map size bug 2015-05-12 23:17:42 -04:00
xircom
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
netx-eth.c