Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351467
b: refs/heads/master
c: 4505f40
h: refs/heads/master
i:
  351465: 5348fbf
  351463: 57dc2b9
v: v3
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Jan 18, 2013
1 parent d9844a6 commit 4bead0a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 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: 6b80778d3d7424b8f0a45052742d065ec491abd8
refs/heads/master: 4505f40a6f1a6a1bb8f8ef84a4a35263d64b5125
12 changes: 8 additions & 4 deletions trunk/drivers/net/ethernet/cisco/enic/enic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1490,28 +1490,32 @@ static int enic_request_intr(struct enic *enic)

for (i = 0; i < enic->rq_count; i++) {
intr = enic_msix_rq_intr(enic, i);
sprintf(enic->msix[intr].devname,
snprintf(enic->msix[intr].devname,
sizeof(enic->msix[intr].devname),
"%.11s-rx-%d", netdev->name, i);
enic->msix[intr].isr = enic_isr_msix_rq;
enic->msix[intr].devid = &enic->napi[i];
}

for (i = 0; i < enic->wq_count; i++) {
intr = enic_msix_wq_intr(enic, i);
sprintf(enic->msix[intr].devname,
snprintf(enic->msix[intr].devname,
sizeof(enic->msix[intr].devname),
"%.11s-tx-%d", netdev->name, i);
enic->msix[intr].isr = enic_isr_msix_wq;
enic->msix[intr].devid = enic;
}

intr = enic_msix_err_intr(enic);
sprintf(enic->msix[intr].devname,
snprintf(enic->msix[intr].devname,
sizeof(enic->msix[intr].devname),
"%.11s-err", netdev->name);
enic->msix[intr].isr = enic_isr_msix_err;
enic->msix[intr].devid = enic;

intr = enic_msix_notify_intr(enic);
sprintf(enic->msix[intr].devname,
snprintf(enic->msix[intr].devname,
sizeof(enic->msix[intr].devname),
"%.11s-notify", netdev->name);
enic->msix[intr].isr = enic_isr_msix_notify;
enic->msix[intr].devid = enic;
Expand Down

0 comments on commit 4bead0a

Please sign in to comment.