diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /drivers/net/hyperv/hyperv_net.h | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'drivers/net/hyperv/hyperv_net.h')
| -rw-r--r-- | drivers/net/hyperv/hyperv_net.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 4ffcd57b011b..2857ab078aac 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h | |||
| @@ -478,6 +478,7 @@ struct netvsc_device { | |||
| 478 | u32 nvsp_version; | 478 | u32 nvsp_version; |
| 479 | 479 | ||
| 480 | atomic_t num_outstanding_sends; | 480 | atomic_t num_outstanding_sends; |
| 481 | wait_queue_head_t wait_drain; | ||
| 481 | bool start_remove; | 482 | bool start_remove; |
| 482 | bool destroy; | 483 | bool destroy; |
| 483 | /* | 484 | /* |
