diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /drivers/net/cnic.h | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'drivers/net/cnic.h')
| -rw-r--r-- | drivers/net/cnic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h index 5192d4a9df5a..a94b302bb464 100644 --- a/drivers/net/cnic.h +++ b/drivers/net/cnic.h | |||
| @@ -176,6 +176,7 @@ struct cnic_local { | |||
| 176 | unsigned long ulp_flags[MAX_CNIC_ULP_TYPE]; | 176 | unsigned long ulp_flags[MAX_CNIC_ULP_TYPE]; |
| 177 | #define ULP_F_INIT 0 | 177 | #define ULP_F_INIT 0 |
| 178 | #define ULP_F_START 1 | 178 | #define ULP_F_START 1 |
| 179 | #define ULP_F_CALL_PENDING 2 | ||
| 179 | struct cnic_ulp_ops *ulp_ops[MAX_CNIC_ULP_TYPE]; | 180 | struct cnic_ulp_ops *ulp_ops[MAX_CNIC_ULP_TYPE]; |
| 180 | 181 | ||
| 181 | /* protected by ulp_lock */ | 182 | /* protected by ulp_lock */ |