diff options
author | 2012-02-13 16:20:07 +0100 | |
---|---|---|
committer | 2012-02-13 16:20:07 +0100 | |
commit | 654b0c9627bc1b34cc21643afa8ac359c50db7d7 (patch) | |
tree | f25069e2987e6d61793585adf969f42f9380afcd /drivers/net/xen-netfront.c | |
parent | PM / QoS: Simplify PM QoS expansion/merge (diff) | |
parent | PM / QoS: CPU C-state breakage with PM Qos change (diff) | |
download | wireguard-linux-654b0c9627bc1b34cc21643afa8ac359c50db7d7.tar.xz wireguard-linux-654b0c9627bc1b34cc21643afa8ac359c50db7d7.zip |
Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos
New material in the pm-qos branch depends on recent power management
fixes.
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 fa679057630f..698b905058dd 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; |