diff options
| author | Konstantin Khlebnikov <khlebnikov@openvz.org> | 2013-07-08 03:22:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-09 15:55:48 -0400 |
| commit | e057590b05bc120732967a04d63c15f2f82cdd2b (patch) | |
| tree | 37fef264841596e0796f5d286b035f4ddf7a1c90 | |
| parent | dd7633ecd553a5e304d349aa6f8eb8a0417098c5 (diff) | |
drivers/net: enic: release rtnl_lock on error-path
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 635f55992d7e..992ec2ee64d9 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) | |||
| 1761 | enic_synchronize_irqs(enic); | 1761 | enic_synchronize_irqs(enic); |
| 1762 | err = vnic_rq_disable(&enic->rq[0]); | 1762 | err = vnic_rq_disable(&enic->rq[0]); |
| 1763 | if (err) { | 1763 | if (err) { |
| 1764 | rtnl_unlock(); | ||
| 1764 | netdev_err(netdev, "Unable to disable RQ.\n"); | 1765 | netdev_err(netdev, "Unable to disable RQ.\n"); |
| 1765 | return; | 1766 | return; |
| 1766 | } | 1767 | } |
| @@ -1773,6 +1774,7 @@ static void enic_change_mtu_work(struct work_struct *work) | |||
| 1773 | vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf); | 1774 | vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf); |
| 1774 | /* Need at least one buffer on ring to get going */ | 1775 | /* Need at least one buffer on ring to get going */ |
| 1775 | if (vnic_rq_desc_used(&enic->rq[0]) == 0) { | 1776 | if (vnic_rq_desc_used(&enic->rq[0]) == 0) { |
| 1777 | rtnl_unlock(); | ||
| 1776 | netdev_err(netdev, "Unable to alloc receive buffers.\n"); | 1778 | netdev_err(netdev, "Unable to alloc receive buffers.\n"); |
| 1777 | return; | 1779 | return; |
| 1778 | } | 1780 | } |
