diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-07 08:59:29 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-07 08:59:29 (GMT) |
| commit | 290436c9c61ac983b1bd425da67242a4357c7701 (patch) | |
| tree | 35e1f189b62eb50515600ad607d7fb57fc547870 /drivers/net/xen-netfront.c | |
| parent | 623ec991ce0e8cd5791bad656c162fa837635907 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| download | linux-fsl-qoriq-290436c9c61ac983b1bd425da67242a4357c7701.tar.xz | |
Merge tag 'v3.3-rc2' into perf/core
Linux 3.3-rc2
Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index fa67905..698b905 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -68,7 +68,7 @@ struct netfront_cb { #define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE) #define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE) -#define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256) +#define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE, 256) struct netfront_stats { u64 rx_packets; |