From 27e464efdfde3c3d69b5210ce52085b3c63c10bc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 23 Jan 2013 21:52:13 +0000 Subject: [PATCH] --- yaml --- r: 368196 b: refs/heads/master c: 80c2e716d555912168f93853f96a24d0de75897b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/net_driver.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dd557af11c4c..b91c1bd7e036 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 626950db84c065925ee10c2e833da265cbda8800 +refs/heads/master: 80c2e716d555912168f93853f96a24d0de75897b diff --git a/trunk/drivers/net/ethernet/sfc/net_driver.h b/trunk/drivers/net/ethernet/sfc/net_driver.h index 9e900817d2ab..f74411fc000c 100644 --- a/trunk/drivers/net/ethernet/sfc/net_driver.h +++ b/trunk/drivers/net/ethernet/sfc/net_driver.h @@ -209,7 +209,8 @@ struct efx_tx_queue { * @page: The associated page buffer. * Will be %NULL if the buffer slot is currently free. * @page_offset: Offset within page - * @len: Buffer length, in bytes. + * @len: If pending: length for DMA descriptor. + * If completed: received length, excluding hash prefix. * @flags: Flags for buffer and packet state. */ struct efx_rx_buffer { @@ -668,7 +669,8 @@ struct vfdi_status; * @n_channels: Number of channels in use * @n_rx_channels: Number of channels used for RX (= number of RX queues) * @n_tx_channels: Number of channels used for TX - * @rx_buffer_len: RX buffer length + * @rx_buffer_len: RX buffer length, including start alignment but excluding + * any metadata * @rx_buffer_order: Order (log2) of number of pages for each RX buffer * @rx_hash_key: Toeplitz hash key for RSS * @rx_indir_table: Indirection table for RSS