* [net-next] e1000e: balance semaphore put/get for 82573
@ 2013-08-24 0:19 Jeff Kirsher
2013-08-27 20:05 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2013-08-24 0:19 UTC (permalink / raw)
To: davem; +Cc: Steven La, netdev, gospo, sassmann, Jeff Kirsher
From: Steven La <sla@riverbed.com>
Steven (cc-ed) noticed an imbalance in semaphore put/get for
82573-based NICs. Don't we need something like the following
(untested) patch?
Signed-off-by: Steven La <sla@riverbed.com>
Acked-by: Arthur Kepner <akepner@riverbed.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000e/82571.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 104fcec..8fed74e 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -1011,6 +1011,11 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
/* Must release MDIO ownership and mutex after MAC reset. */
switch (hw->mac.type) {
+ case e1000_82573:
+ /* Release mutex only if the hw semaphore is acquired */
+ if (!ret_val)
+ e1000_put_hw_semaphore_82573(hw);
+ break;
case e1000_82574:
case e1000_82583:
/* Release mutex only if the hw semaphore is acquired */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [net-next] e1000e: balance semaphore put/get for 82573
2013-08-24 0:19 [net-next] e1000e: balance semaphore put/get for 82573 Jeff Kirsher
@ 2013-08-27 20:05 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-08-27 20:05 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: sla, netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 23 Aug 2013 17:19:37 -0700
> From: Steven La <sla@riverbed.com>
>
> Steven (cc-ed) noticed an imbalance in semaphore put/get for
> 82573-based NICs. Don't we need something like the following
> (untested) patch?
>
> Signed-off-by: Steven La <sla@riverbed.com>
> Acked-by: Arthur Kepner <akepner@riverbed.com>
> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-27 20:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-24 0:19 [net-next] e1000e: balance semaphore put/get for 82573 Jeff Kirsher
2013-08-27 20:05 ` David Miller
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).