Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26e04462 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking update from David Miller:

 1) Fix dump iterator in nfnl_acct_dump() and ctnl_timeout_dump() to
    dump all objects properly, from Pablo Neira Ayuso.

 2) xt_TCPMSS must use the default MSS of 536 when no MSS TCP option is
    present.  Fix from Phil Oester.

 3) qdisc_get_rtab() looks for an existing matching rate table and uses
    that instead of creating a new one.  However, it's key matching is
    incomplete, it fails to check to make sure the ->data[] array is
    identical too.  Fix from Eric Dumazet.

 4) ip_vs_dest_entry isn't fully initialized before copying back to
    userspace, fix from Dan Carpenter.

 5) Fix ubuf reference counting regression in vhost_net, from Jason
    Wang.

 6) When sock_diag dumps a socket filter back to userspace, we have to
    translate it out of the kernel's internal representation first.
    From Nicolas Dichtel.

 7) davinci_mdio holds a spinlock while calling pm_runtime, which
    sleeps.  Fix from Sebastian Siewior.

 8) Timeout check in sh_eth_check_reset is off by one, from Sergei
    Shtylyov.

 9) If sctp socket init fails, we can NULL deref during cleanup.  Fix
    from Daniel Borkmann.

10) netlink_mmap() does not propagate errors properly, from Patrick
    McHardy.

11) Disable powersave and use minstrel by default in ath9k.  From Sujith
    Manoharan.

12) Fix a regression in that SOCK_ZEROCOPY is not set on tuntap sockets
    which prevents vhost from being able to use zerocopy.  From Jason
    Wang.

13) Fix race between port lookup and TX path in team driver, from Jiri
    Pirko.

14) Missing length checks in bluetooth L2CAP packet parsing, from Johan
    Hedberg.

15) rtlwifi fails to connect to networking using any encryption method
    other than WPA2.  Fix from Larry Finger.

16) Fix iwlegacy build due to incorrect CONFIG_* ifdeffing for power
    management stuff.  From Yijing Wang.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)
  b43: stop format string leaking into error msgs
  ath9k: Use minstrel rate control by default
  Revert "ath9k_hw: Update rx gain initval to improve rx sensitivity"
  ath9k: Disable PowerSave by default
  net: wireless: iwlegacy: fix build error for il_pm_ops
  rtlwifi: Fix a false leak indication for PCI devices
  wl12xx/wl18xx: scan all 5ghz channels
  wl12xx: increase minimum singlerole firmware version required
  wl12xx: fix minimum required firmware version for wl127x multirole
  rtlwifi: rtl8192cu: Fix problem in connecting to WEP or WPA(1) networks
  mwifiex: debugfs: Fix out of bounds array access
  Bluetooth: Fix mgmt handling of power on failures
  Bluetooth: Fix missing length checks for L2CAP signalling PDUs
  Bluetooth: btmrvl: support Marvell Bluetooth device SD8897
  Bluetooth: Fix checks for LE support on LE-only controllers
  team: fix checks in team_get_first_port_txable_rcu()
  team: move add to port list before port enablement
  team: check return value of team_get_port_by_index_rcu() for NULL
  tuntap: set SOCK_ZEROCOPY flag during open
  netlink: fix error propagation in netlink_mmap()
  ...
parents 645a9929 090adb89

drivers/bluetooth/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ config BT_MRVL 
	  The core driver to support Marvell Bluetooth devices.



	  This driver is required if you want to support

	  Marvell Bluetooth devices, such as 8688/8787/8797.

	  Marvell Bluetooth devices, such as 8688/8787/8797/8897.



	  Say Y here to compile Marvell Bluetooth driver

	  into the kernel or say M to compile it as module.
@@ -214,7 +214,7 @@ config BT_MRVL_SDIO 
	  The driver for Marvell Bluetooth chipsets with SDIO interface.



	  This driver is required if you want to use Marvell Bluetooth

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8897

	  chipsets are supported.



	  Say Y here to compile support for Marvell BT-over-SDIO driver

drivers/bluetooth/btmrvl_sdio.c

+28 −0
Original line number Diff line number Diff line
@@ -82,6 +82,23 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = { 
	.io_port_2 = 0x7a,

};



static const struct btmrvl_sdio_card_reg btmrvl_reg_88xx = {

	.cfg = 0x00,

	.host_int_mask = 0x02,

	.host_intstatus = 0x03,

	.card_status = 0x50,

	.sq_read_base_addr_a0 = 0x60,

	.sq_read_base_addr_a1 = 0x61,

	.card_revision = 0xbc,

	.card_fw_status0 = 0xc0,

	.card_fw_status1 = 0xc1,

	.card_rx_len = 0xc2,

	.card_rx_unit = 0xc3,

	.io_port_0 = 0xd8,

	.io_port_1 = 0xd9,

	.io_port_2 = 0xda,

};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {

	.helper		= "mrvl/sd8688_helper.bin",

	.firmware	= "mrvl/sd8688.bin",
@@ -103,6 +120,13 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = { 
	.sd_blksz_fw_dl	= 256,

};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {

	.helper		= NULL,

	.firmware	= "mrvl/sd8897_uapsta.bin",

	.reg		= &btmrvl_reg_88xx,

	.sd_blksz_fw_dl	= 256,

};



static const struct sdio_device_id btmrvl_sdio_ids[] = {

	/* Marvell SD8688 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),
@@ -116,6 +140,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = { 
	/* Marvell SD8797 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },

	/* Marvell SD8897 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8897 },



	{ }	/* Terminating entry */

};
@@ -1194,3 +1221,4 @@ MODULE_FIRMWARE("mrvl/sd8688_helper.bin"); 
MODULE_FIRMWARE("mrvl/sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");

drivers/net/ethernet/renesas/sh_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -897,8 +897,8 @@ static int sh_eth_check_reset(struct net_device *ndev) 
		mdelay(1);

		cnt--;

	}

	if (cnt < 0) {

		pr_err("Device reset fail\n");

	if (cnt <= 0) {

		pr_err("Device reset failed\n");

		ret = -ETIMEDOUT;

	}

	return ret;

drivers/net/ethernet/ti/davinci_mdio.c

+2 −3
Original line number Diff line number Diff line
@@ -449,10 +449,9 @@ static int davinci_mdio_suspend(struct device *dev) 
	__raw_writel(ctrl, &data->regs->control);

	wait_for_idle(data);



	pm_runtime_put_sync(data->dev);



	data->suspended = true;

	spin_unlock(&data->lock);

	pm_runtime_put_sync(data->dev);



	return 0;

}
@@ -462,9 +461,9 @@ static int davinci_mdio_resume(struct device *dev) 
	struct davinci_mdio_data *data = dev_get_drvdata(dev);

	u32 ctrl;



	spin_lock(&data->lock);

	pm_runtime_get_sync(data->dev);



	spin_lock(&data->lock);

	/* restart the scan state machine */

	ctrl = __raw_readl(&data->regs->control);

	ctrl |= CONTROL_ENABLE;

drivers/net/team/team.c

+1 −1
Original line number Diff line number Diff line
@@ -1092,8 +1092,8 @@ static int team_port_add(struct team *team, struct net_device *port_dev) 
	}



	port->index = -1;

	team_port_enable(team, port);

	list_add_tail_rcu(&port->list, &team->port_list);

	team_port_enable(team, port);

	__team_compute_features(team);

	__team_port_change_port_added(port, !!netif_carrier_ok(port_dev));

	__team_options_change_check(team);