diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-07 14:05:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-07 14:05:23 -0700 |
| commit | c1e48efc701b79ee4367c9a1a4e8bbc7c3586e02 (patch) | |
| tree | 91921f7c0884813c72993fcd2ecd37dc5e56d89d /drivers/net/benet/be.h | |
| parent | 912d398d28b4359c2fb1f3763f1ce4f86de8350e (diff) | |
| parent | 1b86a58f9d7ce4fe2377687f378fbfb53bdc9b6c (diff) | |
| download | op-kernel-dev-c1e48efc701b79ee4367c9a1a4e8bbc7c3586e02.zip op-kernel-dev-c1e48efc701b79ee4367c9a1a4e8bbc7c3586e02.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_main.c
Diffstat (limited to 'drivers/net/benet/be.h')
| -rw-r--r-- | drivers/net/benet/be.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 0899d91..ea1ea82 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -155,7 +155,7 @@ struct be_eq_obj { u16 min_eqd; /* in usecs */ u16 max_eqd; /* in usecs */ u16 cur_eqd; /* in usecs */ - u8 msix_vec_idx; + u8 eq_idx; struct napi_struct napi; }; @@ -292,7 +292,7 @@ struct be_adapter { u32 num_rx_qs; u32 big_page_size; /* Compounded page size shared by rx wrbs */ - u8 msix_vec_next_idx; + u8 eq_next_idx; struct be_drv_stats drv_stats; struct vlan_group *vlan_grp; |
