diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 05:27:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 05:27:13 -0400 |
| commit | 7109561524dc57b95fd3f9b61547268b9b6db8ed (patch) | |
| tree | df08f565b2c616b7e68fe35cd428a8c5ba3bfcb1 /drivers/net/xen-netback/common.h | |
| parent | 6bf755db4d5e7ccea61fb17727a183b9bd8945b1 (diff) | |
| parent | 3bb70de692f70861f5c5729cd2b870d0104a7cc9 (diff) | |
Merge branches 'fixes' and 'misc' into for-next
Conflicts:
arch/arm/kernel/iwmmxt.S
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Diffstat (limited to 'drivers/net/xen-netback/common.h')
| -rw-r--r-- | drivers/net/xen-netback/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 4dd7c4a1923b..2532ce85d718 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h | |||
| @@ -222,6 +222,7 @@ struct xenvif { | |||
| 222 | 222 | ||
| 223 | /* Queues */ | 223 | /* Queues */ |
| 224 | struct xenvif_queue *queues; | 224 | struct xenvif_queue *queues; |
| 225 | unsigned int num_queues; /* active queues, resource allocated */ | ||
| 225 | 226 | ||
| 226 | /* Miscellaneous private stuff. */ | 227 | /* Miscellaneous private stuff. */ |
| 227 | struct net_device *dev; | 228 | struct net_device *dev; |