Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

此提交包含在:
David S. Miller
2015-01-06 22:29:20 -05:00
當前提交 44d84d7272
共有 95 個檔案被更改,包括 783 行新增578 行删除

查看文件

@@ -1653,7 +1653,7 @@ static int enic_open(struct net_device *netdev)
if (vnic_rq_desc_used(&enic->rq[i]) == 0) {
netdev_err(netdev, "Unable to alloc receive buffers\n");
err = -ENOMEM;
goto err_out_notify_unset;
goto err_out_free_rq;
}
}
@@ -1686,7 +1686,9 @@ static int enic_open(struct net_device *netdev)
return 0;
err_out_notify_unset:
err_out_free_rq:
for (i = 0; i < enic->rq_count; i++)
vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
enic_dev_notify_unset(enic);
err_out_free_intr:
enic_free_intr(enic);