David S. Miller f9aa9dc7d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All conflicts were simple overlapping changes except perhaps for the Thunder driver. That driver has a change_mtu method explicitly for sending a message to the hardware. If that fails it returns an error. Normally a driver doesn't need an ndo_change_mtu method becuase those are usually just range changes, which are now handled generically. But since this extra operation is needed in the Thunder driver, it has to stay. However, if the message send fails we have to restore the original MTU before the change because the entire call chain expects that if an error is thrown by ndo_change_mtu then the MTU did not change. Therefore code is added to nicvf_change_mtu to remember the original MTU, and to restore it upon nicvf_update_hw_max_frs() failue. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-22 13:27:16 -05:00
..
appletalk	net: deprecate eth_change_mtu, remove usage	2016-10-13 09:36:57 -04:00
arcnet	…
bonding	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
caif	…
can	can: sja1000: plx_pci: Add support for Moxa CAN devices	2016-10-31 20:48:19 +01:00
cris	net: cris: make eth_v10.c explicitly non-modular	2016-10-31 20:58:34 -04:00
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
fddi	net: use core MTU range checking in misc drivers	2016-10-20 14:51:10 -04:00
fjes	net: use core MTU range checking in misc drivers	2016-10-20 14:51:10 -04:00
hamradio	…
hippi	net: use core MTU range checking in misc drivers	2016-10-20 14:51:10 -04:00
hyperv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-10-30 12:42:58 -04:00
ieee802154	net: ieee802154: constify ieee802154_ops structures	2016-11-21 15:46:12 -05:00
ipvlan	ipvlan: constify l3mdev_ops structure	2016-10-15 17:49:57 -04:00
irda	…
phy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
plip	net: deprecate eth_change_mtu, remove usage	2016-10-13 09:36:57 -04:00
ppp	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
slip	net: use core MTU range checking in misc drivers	2016-10-20 14:51:10 -04:00
team	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
usb	lan78xx: relocate mdix setting to phy driver	2016-11-18 13:57:33 -05:00
vmxnet3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-10-30 12:42:58 -04:00
wan	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-10-30 12:42:58 -04:00
wimax	net: use core MTU range checking in wireless drivers	2016-10-20 14:51:08 -04:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
xen-netback	xen-netback: prefer xenbus_scanf() over xenbus_gather()	2016-11-09 20:24:35 -05:00
Kconfig	…
LICENSE.SRC	…
Makefile	…
Space.c	…
dummy.c	…
eql.c	…
geneve.c	geneve: Optimize geneve device lookup.	2016-11-21 14:05:50 -05:00
gtp.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
ifb.c	…
loopback.c	…
macsec.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-10-30 12:42:58 -04:00
macvlan.c	driver: macvlan: Remove duplicated IFF_UP condition check in macvlan_forward_source	2016-11-21 11:58:49 -05:00
macvtap.c	virtio_net: Simplify call sites for virtio_net_hdr_{from, to}_skb().	2016-11-19 10:37:03 -05:00
mdio.c	…
mii.c	net: mii: report 0 for unknown lp_advertising	2016-11-09 20:26:58 -05:00
netconsole.c	…
nlmon.c	…
ntb_netdev.c	net: use core MTU range checking in core net infra	2016-10-20 14:51:09 -04:00
rionet.c	net: use core MTU range checking in misc drivers	2016-10-20 14:51:10 -04:00
sb1000.c	net: deprecate eth_change_mtu, remove usage	2016-10-13 09:36:57 -04:00
sungem_phy.c	…
tun.c	virtio_net: Do not clear memory for struct virtio_net_hdr twice.	2016-11-19 10:37:03 -05:00
veth.c	net: use core MTU range checking in core net infra	2016-10-20 14:51:09 -04:00
virtio_net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
vrf.c	net: Enable support for VRF with ipv4 multicast	2016-11-01 11:54:26 -04:00
vxlan.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
xen-netfront.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-15 10:54:36 -05:00