diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 01:07:11 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 01:07:20 -0500 |
| commit | 6b914c998787d65022e80d6262dfd0edef58cadb (patch) | |
| tree | ec9d9605ae08e6e40664c4302a181979ab4fe1d3 /drivers/net/ethernet/emulex/benet/be.h | |
| parent | 1f87a404d02a96519284e1928445ca5cfe9667db (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge tag 'v3.8-rc5' into next/cleanup
Linux 3.8-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be.h')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 3bc1912afba9..4eba17b83ba8 100644 --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h | |||
| @@ -190,6 +190,7 @@ struct be_eq_obj { | |||
| 190 | 190 | ||
| 191 | u8 idx; /* array index */ | 191 | u8 idx; /* array index */ |
| 192 | u16 tx_budget; | 192 | u16 tx_budget; |
| 193 | u16 spurious_intr; | ||
| 193 | struct napi_struct napi; | 194 | struct napi_struct napi; |
| 194 | struct be_adapter *adapter; | 195 | struct be_adapter *adapter; |
| 195 | } ____cacheline_aligned_in_smp; | 196 | } ____cacheline_aligned_in_smp; |