netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drivers/net: enic: release rtnl_lock on error-path
@ 2013-07-08  7:22 Konstantin Khlebnikov
  2013-07-08 16:26 ` Nishank Trivedi
  2013-07-09 19:56 ` David Miller
  0 siblings, 2 replies; 4+ messages in thread
From: Konstantin Khlebnikov @ 2013-07-08  7:22 UTC (permalink / raw)
  To: netdev, linux-kernel
  Cc: Neel Patel, Nishank Trivedi, Roopa Prabhu, Christian Benvenuti

enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Christian Benvenuti <benve@cisco.com>
Cc: Roopa Prabhu <roprabhu@cisco.com>
Cc: Neel Patel <neepatel@cisco.com>
Cc: Nishank Trivedi <nistrive@cisco.com>
---
 drivers/net/ethernet/cisco/enic/enic_main.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 635f559..992ec2e 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -1761,6 +1761,7 @@ static void enic_change_mtu_work(struct work_struct *work)
 	enic_synchronize_irqs(enic);
 	err = vnic_rq_disable(&enic->rq[0]);
 	if (err) {
+		rtnl_unlock();
 		netdev_err(netdev, "Unable to disable RQ.\n");
 		return;
 	}
@@ -1773,6 +1774,7 @@ static void enic_change_mtu_work(struct work_struct *work)
 	vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
 	/* Need at least one buffer on ring to get going */
 	if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
+		rtnl_unlock();
 		netdev_err(netdev, "Unable to alloc receive buffers.\n");
 		return;
 	}

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] drivers/net: enic: release rtnl_lock on error-path
  2013-07-08  7:22 [PATCH] drivers/net: enic: release rtnl_lock on error-path Konstantin Khlebnikov
@ 2013-07-08 16:26 ` Nishank Trivedi
  2013-07-08 16:26   ` Neel Patel (neepatel)
  2013-07-09 19:56 ` David Miller
  1 sibling, 1 reply; 4+ messages in thread
From: Nishank Trivedi @ 2013-07-08 16:26 UTC (permalink / raw)
  To: Konstantin Khlebnikov
  Cc: netdev, linux-kernel, Neel Patel, Christian Benvenuti

On 7/8/13 12:22 AM, Konstantin Khlebnikov wrote:
> enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
> Cc: Christian Benvenuti <benve@cisco.com>
> Cc: Roopa Prabhu <roprabhu@cisco.com>
> Cc: Neel Patel <neepatel@cisco.com>
> Cc: Nishank Trivedi <nistrive@cisco.com>
> ---
>   drivers/net/ethernet/cisco/enic/enic_main.c |    2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
> index 635f559..992ec2e 100644
> --- a/drivers/net/ethernet/cisco/enic/enic_main.c
> +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
> @@ -1761,6 +1761,7 @@ static void enic_change_mtu_work(struct work_struct *work)
>   	enic_synchronize_irqs(enic);
>   	err = vnic_rq_disable(&enic->rq[0]);
>   	if (err) {
> +		rtnl_unlock();
>   		netdev_err(netdev, "Unable to disable RQ.\n");
>   		return;
>   	}
> @@ -1773,6 +1774,7 @@ static void enic_change_mtu_work(struct work_struct *work)
>   	vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
>   	/* Need at least one buffer on ring to get going */
>   	if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
> +		rtnl_unlock();
>   		netdev_err(netdev, "Unable to alloc receive buffers.\n");
>   		return;
>   	}
>

Acked.

Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH] drivers/net: enic: release rtnl_lock on error-path
  2013-07-08 16:26 ` Nishank Trivedi
@ 2013-07-08 16:26   ` Neel Patel (neepatel)
  0 siblings, 0 replies; 4+ messages in thread
From: Neel Patel (neepatel) @ 2013-07-08 16:26 UTC (permalink / raw)
  To: Nishank Trivedi (nistrive), Konstantin Khlebnikov
  Cc: netdev, linux-kernel, Christian Benvenuti (benve)

Looks good.

Thanks!

-----Original Message-----
From: Nishank Trivedi (nistrive) 
Sent: Monday, July 08, 2013 9:26 AM
To: Konstantin Khlebnikov
Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Neel Patel (neepatel); Christian Benvenuti (benve)
Subject: Re: [PATCH] drivers/net: enic: release rtnl_lock on error-path

On 7/8/13 12:22 AM, Konstantin Khlebnikov wrote:
> enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
> Cc: Christian Benvenuti <benve@cisco.com>
> Cc: Roopa Prabhu <roprabhu@cisco.com>
> Cc: Neel Patel <neepatel@cisco.com>
> Cc: Nishank Trivedi <nistrive@cisco.com>
> ---
>   drivers/net/ethernet/cisco/enic/enic_main.c |    2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
> index 635f559..992ec2e 100644
> --- a/drivers/net/ethernet/cisco/enic/enic_main.c
> +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
> @@ -1761,6 +1761,7 @@ static void enic_change_mtu_work(struct work_struct *work)
>   	enic_synchronize_irqs(enic);
>   	err = vnic_rq_disable(&enic->rq[0]);
>   	if (err) {
> +		rtnl_unlock();
>   		netdev_err(netdev, "Unable to disable RQ.\n");
>   		return;
>   	}
> @@ -1773,6 +1774,7 @@ static void enic_change_mtu_work(struct work_struct *work)
>   	vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
>   	/* Need at least one buffer on ring to get going */
>   	if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
> +		rtnl_unlock();
>   		netdev_err(netdev, "Unable to alloc receive buffers.\n");
>   		return;
>   	}
>

Acked.

Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] drivers/net: enic: release rtnl_lock on error-path
  2013-07-08  7:22 [PATCH] drivers/net: enic: release rtnl_lock on error-path Konstantin Khlebnikov
  2013-07-08 16:26 ` Nishank Trivedi
@ 2013-07-09 19:56 ` David Miller
  1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2013-07-09 19:56 UTC (permalink / raw)
  To: khlebnikov; +Cc: netdev, linux-kernel, neepatel, nistrive, roprabhu, benve

From: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date: Mon, 08 Jul 2013 11:22:51 +0400

> enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.
> 
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>

Applied.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-07-09 19:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-08  7:22 [PATCH] drivers/net: enic: release rtnl_lock on error-path Konstantin Khlebnikov
2013-07-08 16:26 ` Nishank Trivedi
2013-07-08 16:26   ` Neel Patel (neepatel)
2013-07-09 19:56 ` 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).