From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Jack Morgenstein <jackm@dev.mellanox.co.il>,
Or Gerlitz <ogerlitz@mellanox.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 3.10 08/24] net/mlx4_core: Fix call to __mlx4_unregister_mac
Date: Mon, 18 Nov 2013 10:42:18 -0800 [thread overview]
Message-ID: <20131118184222.631441809@linuxfoundation.org> (raw)
In-Reply-To: <20131118184222.017393843@linuxfoundation.org>
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Morgenstein <jackm@dev.mellanox.co.il>
[ Upstream commit c32b7dfbb1dfb3f0a68f250deff65103c8bb704a ]
In function mlx4_master_deactivate_admin_state() __mlx4_unregister_mac was
called using the MAC index. It should be called with the value of the MAC itself.
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1544,7 +1544,7 @@ static void mlx4_master_deactivate_admin
vp_oper->vlan_idx = NO_INDX;
}
if (NO_INDX != vp_oper->mac_idx) {
- __mlx4_unregister_mac(&priv->dev, port, vp_oper->mac_idx);
+ __mlx4_unregister_mac(&priv->dev, port, vp_oper->state.mac);
vp_oper->mac_idx = NO_INDX;
}
}
next prev parent reply other threads:[~2013-11-18 18:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-18 18:42 [PATCH 3.10 00/24] 3.10.20-stable review Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 01/24] ip_gre: Fix WCCPv2 header parsing Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 02/24] ipv6: ip6_dst_check needs to check for expired dst_entries Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 03/24] ipv6: reset dst.expires value when clearing expire flag Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 04/24] cxgb3: Fix length calculation in write_ofld_wr() on 32-bit architectures Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 05/24] xen-netback: use jiffies_64 value to calculate credit timeout Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 06/24] virtio-net: correctly handle cpu hotplug notifier during resuming Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 07/24] net: flow_dissector: fail on evil iph->ihl Greg Kroah-Hartman
2013-11-18 18:42 ` Greg Kroah-Hartman [this message]
2013-11-18 18:42 ` [PATCH 3.10 09/24] xen-netback: Handle backend state transitions in a more robust way Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 10/24] xen-netback: transition to CLOSED when removing a VIF Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 11/24] batman-adv: set up network coding packet handlers during module init Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 12/24] hyperv-fb: add pci stub Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 13/24] USB: add new zte 3g-dongles pid to option.c Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 14/24] ALSA: hda - hdmi: Fix reported channel map on common default layouts Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 15/24] tracing: Fix potential out-of-bounds in trace_get_user() Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 16/24] perf: Fix perf ring buffer memory ordering Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 17/24] iwlwifi: add new 7260 and 3160 series device IDs Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 18/24] iwlwifi: pcie: add new SKUs for 7000 & 3160 NIC series Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 19/24] misc: atmel_pwm: add deferred-probing support Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 20/24] backlight: atmel-pwm-bl: fix deferred probe from __init Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 21/24] usb: fix cleanup after failure in hub_configure() Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 22/24] usb: fail on usb_hub_create_port_device() errors Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 23/24] usbcore: set lpm_capable field for LPM capable root hubs Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 24/24] media: sh_vou: almost forever loop in sh_vou_try_fmt_vid_out() Greg Kroah-Hartman
2013-11-19 3:08 ` [PATCH 3.10 00/24] 3.10.20-stable review Guenter Roeck
2013-11-20 11:05 ` Satoru Takeuchi
2013-11-20 15:27 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131118184222.631441809@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=jackm@dev.mellanox.co.il \
--cc=linux-kernel@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).