diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:19:16 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:19:16 -0800 |
commit | d235b7b42ab59e2e616082a0735b3bcc76685c7b (patch) | |
tree | 2b2275cd21df35e47b2ce4be5ccdce2d6d5e5fae /drivers/net/ethernet/mellanox | |
parent | de862fe2cd3432b1d1acb0b570a33dbdd02bf4a1 (diff) | |
parent | 03ed106ff4c200d01f3c72f71fa9c5b18da07d9b (diff) |
Merge tag 'v3.10.94' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.10lsk-v3.10-15.12linux-linaro-lsk-v3.10
This is the 3.10.94 stable release
# gpg: Signature made Wed Dec 9 10:43:26 2015 PST using RSA key ID 6092693E
# gpg: checking the trustdb
# gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
# gpg: depth: 0 valid: 1 signed: 72 trust: 0-, 0q, 0n, 0m, 0f, 1u
# gpg: depth: 1 valid: 72 signed: 112 trust: 63-, 1q, 0n, 1m, 7f, 0u
# gpg: depth: 2 valid: 49 signed: 64 trust: 49-, 0q, 0n, 0m, 0f, 0u
# gpg: next trustdb check due at 2015-12-15
# gpg: Good signature from "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>"
* tag 'v3.10.94' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (32 commits)
Linux 3.10.94
ALSA: usb-audio: work around CH345 input SysEx corruption
ALSA: usb-audio: prevent CH345 multiport output SysEx corruption
ALSA: usb-audio: add packet size quirk for the Medeli DD305
USB: option: add XS Stick W100-2 from 4G Systems
USB: serial: option: add support for Novatel MiFi USB620L
usb: musb: core: fix order of arguments to ulpi write callback
usblp: do not set TASK_INTERRUPTIBLE before lock
arm64: Fix compat register mappings
can: sja1000: clear interrupts on start
Bluetooth: hidp: fix device disconnect on idle timeout
staging: rtl8712: Add device ID for Sitecom WLA2100
mwifiex: fix mwifiex_rdeeprom_read()
net: mvneta: Fix CPU_MAP registers initialisation
mac80211: fix driver RSSI event calculations
x86/cpu: Fix SMAP check in PVOPS environments
x86/cpu: Call verify_cpu() after having entered long mode too
x86/setup: Fix low identity map for >= 2GB kernel range
x86/setup: Extend low identity map to cover whole kernel range
ARM: orion: Fix DSA platform device after mvmdio conversion
...
Diffstat (limited to 'drivers/net/ethernet/mellanox')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/eq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index 28d706bd12eb..d64050fcafc3 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c @@ -1836,7 +1836,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev) spin_lock_init(&s_state->lock); } - memset(&priv->mfunc.master.cmd_eqe, 0, dev->caps.eqe_size); + memset(&priv->mfunc.master.cmd_eqe, 0, sizeof(struct mlx4_eqe)); priv->mfunc.master.cmd_eqe.type = MLX4_EVENT_TYPE_CMD; INIT_WORK(&priv->mfunc.master.comm_work, mlx4_master_comm_channel); diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index 6000342f9725..16a1ccc269f1 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c @@ -183,7 +183,7 @@ static void slave_event(struct mlx4_dev *dev, u8 slave, struct mlx4_eqe *eqe) return; } - memcpy(s_eqe, eqe, dev->caps.eqe_size - 1); + memcpy(s_eqe, eqe, sizeof(struct mlx4_eqe) - 1); s_eqe->slave_id = slave; /* ensure all information is written before setting the ownersip bit */ wmb(); |