Commit 83310d61 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Merge in late fixes in preparation for the net-next PR.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 42d1c54d bf9cf80c

Documentation/netlink/specs/mptcp_pm.yaml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ definitions: 
    type: enum

    name: event-type

    enum-name: mptcp-event-type

    doc: Netlink MPTCP event types

    name-prefix: mptcp-event-

    entries:

      -

drivers/dpll/zl3073x/dpll.c

+4 −8
Original line number Diff line number Diff line
@@ -1018,10 +1018,8 @@ zl3073x_dpll_output_pin_phase_adjust_get(const struct dpll_pin *dpll_pin, 
	out_id = zl3073x_output_pin_out_get(pin->id);

	out = zl3073x_out_state_get(zldev, out_id);



	/* Convert value to ps and reverse two's complement negation applied

	 * during 'set'

	 */

	*phase_adjust = -out->phase_comp * pin->phase_gran;

	/* The value in the register is expressed in half synth clock cycles. */

	*phase_adjust = out->phase_comp * pin->phase_gran;



	return 0;

}
@@ -1043,10 +1041,8 @@ zl3073x_dpll_output_pin_phase_adjust_set(const struct dpll_pin *dpll_pin, 
	out_id = zl3073x_output_pin_out_get(pin->id);

	out = *zl3073x_out_state_get(zldev, out_id);



	/* The value in the register is stored as two's complement negation

	 * of requested value and expressed in half synth clock cycles.

	 */

	out.phase_comp = -phase_adjust / pin->phase_gran;

	/* The value in the register is expressed in half synth clock cycles. */

	out.phase_comp = phase_adjust / pin->phase_gran;



	/* Update output configuration from mailbox */

	return zl3073x_out_state_set(zldev, out_id, &out);

drivers/net/bonding/bond_main.c

+9 −6
Original line number Diff line number Diff line
@@ -791,26 +791,29 @@ static int bond_update_speed_duplex(struct slave *slave) 
	struct ethtool_link_ksettings ecmd;

	int res;



	slave->speed = SPEED_UNKNOWN;

	slave->duplex = DUPLEX_UNKNOWN;



	res = __ethtool_get_link_ksettings(slave_dev, &ecmd);

	if (res < 0)

		return 1;

		goto speed_duplex_unknown;

	if (ecmd.base.speed == 0 || ecmd.base.speed == ((__u32)-1))

		return 1;

		goto speed_duplex_unknown;

	switch (ecmd.base.duplex) {

	case DUPLEX_FULL:

	case DUPLEX_HALF:

		break;

	default:

		return 1;

		goto speed_duplex_unknown;

	}



	slave->speed = ecmd.base.speed;

	slave->duplex = ecmd.base.duplex;



	return 0;



speed_duplex_unknown:

	slave->speed = SPEED_UNKNOWN;

	slave->duplex = DUPLEX_UNKNOWN;



	return 1;

}



const char *bond_slave_link_status(s8 link)

drivers/net/caif/caif_serial.c

+3 −2
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static void ser_release(struct work_struct *work) 
{

	struct list_head list;

	struct ser_device *ser, *tmp;

	struct tty_struct *tty;



	spin_lock(&ser_lock);

	list_replace_init(&ser_release_list, &list);
@@ -292,9 +293,11 @@ static void ser_release(struct work_struct *work) 
	if (!list_empty(&list)) {

		rtnl_lock();

		list_for_each_entry_safe(ser, tmp, &list, node) {

			tty = ser->tty;

			dev_close(ser->dev);

			unregister_netdevice(ser->dev);

			debugfs_deinit(ser);

			tty_kref_put(tty);

		}

		rtnl_unlock();

	}
@@ -355,8 +358,6 @@ static void ldisc_close(struct tty_struct *tty) 
{

	struct ser_device *ser = tty->disc_data;



	tty_kref_put(ser->tty);



	spin_lock(&ser_lock);

	list_move(&ser->node, &ser_release_list);

	spin_unlock(&ser_lock);

drivers/net/ethernet/amd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ config AMD_XGBE 
	select CRC32

	select PHYLIB

	select AMD_XGBE_HAVE_ECC if X86

	select NET_SELFTESTS

	imply NET_SELFTESTS

	help

	  This driver supports the AMD 10GbE Ethernet device found on an

	  AMD SoC.