Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286675
b: refs/heads/master
c: b67f231
h: refs/heads/master
i:
  286673: 303a00e
  286671: 2f14e40
v: v3
  • Loading branch information
Roopa Prabhu authored and David S. Miller committed Jan 20, 2012
1 parent 0c2c829 commit f674105
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3d8fe98f8d5cb303d907d8f94ea6dc1f9a1d8b7a
refs/heads/master: b67f231ded332461dd31123c4f659c4681223fb1
4 changes: 2 additions & 2 deletions trunk/drivers/net/ethernet/cisco/enic/enic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
#ifdef CONFIG_PCI_IOV
int pos = 0;
#endif
int num_pps;
int num_pps = 1;

/* Allocate net device structure and initialize. Private
* instance data is initialized to zero.
Expand Down Expand Up @@ -2380,11 +2380,11 @@ static int __devinit enic_probe(struct pci_dev *pdev,
goto err_out_vnic_unregister;
}
enic->priv_flags |= ENIC_SRIOV_ENABLED;
num_pps = enic->num_vfs;
}
}
#endif

num_pps = enic->num_vfs ? enic->num_vfs : 1;
/* Allocate structure for port profiles */
enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
if (!enic->pp) {
Expand Down

0 comments on commit f674105

Please sign in to comment.