diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:46:24 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:46:24 -0500 |
| commit | 25cf0398bdf365d027e171116aa4a281e9cd3c1c (patch) | |
| tree | a8be3d3d314625a376be0e62c67809dc22274dd4 /drivers/net/xen-netfront.c | |
| parent | 9326845f45650f6af9953a4b6a31e89b54fab82f (diff) | |
| parent | 59bdd133561a432c4655146e283caf85fa64c2fb (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 458bb57914a3..cdbeec9f83ea 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -66,8 +66,8 @@ struct netfront_cb { | |||
| 66 | 66 | ||
| 67 | #define GRANT_INVALID_REF 0 | 67 | #define GRANT_INVALID_REF 0 |
| 68 | 68 | ||
| 69 | #define NET_TX_RING_SIZE __RING_SIZE((struct xen_netif_tx_sring *)0, PAGE_SIZE) | 69 | #define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE) |
| 70 | #define NET_RX_RING_SIZE __RING_SIZE((struct xen_netif_rx_sring *)0, PAGE_SIZE) | 70 | #define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE) |
| 71 | #define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256) | 71 | #define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256) |
| 72 | 72 | ||
| 73 | struct netfront_info { | 73 | struct netfront_info { |