Patchwork [2/4] e1000e: Use marco instead of digit for defining e1000_rx_desc_packet_split

login
register
mail settings
Submitter Wei Yang
Date May 20, 2013, 8:15 a.m.
Message ID <1369037707-27026-3-git-send-email-weiyang@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/244863/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

Wei Yang - May 20, 2013, 8:15 a.m.
In structure e1000_rx_desc_packet_split, the size of wb.upper.length is
defined by a digit. This may introduce some problem when the lenght is
changed.

This patch use the marco PS_PAGE_BUFFERS for the definition. And move the
definition to hw.h.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
---
 drivers/net/ethernet/intel/e1000e/e1000.h |    3 ---
 drivers/net/ethernet/intel/e1000e/hw.h    |    5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)
Jeff Kirsher - May 20, 2013, 9:37 a.m.
On 05/20/2013 01:15 AM, Wei Yang wrote:
> In structure e1000_rx_desc_packet_split, the size of wb.upper.length is
> defined by a digit. This may introduce some problem when the lenght is
> changed.
>
> This patch use the marco PS_PAGE_BUFFERS for the definition. And move the
> definition to hw.h.
>
> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
> ---
>  drivers/net/ethernet/intel/e1000e/e1000.h |    3 ---
>  drivers/net/ethernet/intel/e1000e/hw.h    |    5 ++++-
>  2 files changed, 4 insertions(+), 4 deletions(-)
Thanks, I have added the patch to my queue for e1000e.
Wei Yang - May 20, 2013, 4:24 p.m.
On Mon, May 20, 2013 at 02:37:29AM -0700, Jeff Kirsher wrote:
>On 05/20/2013 01:15 AM, Wei Yang wrote:
>> In structure e1000_rx_desc_packet_split, the size of wb.upper.length is
>> defined by a digit. This may introduce some problem when the lenght is
>> changed.
>>
>> This patch use the marco PS_PAGE_BUFFERS for the definition. And move the
>> definition to hw.h.
>>
>> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
>> ---
>>  drivers/net/ethernet/intel/e1000e/e1000.h |    3 ---
>>  drivers/net/ethernet/intel/e1000e/hw.h    |    5 ++++-
>>  2 files changed, 4 insertions(+), 4 deletions(-)
>Thanks, I have added the patch to my queue for e1000e.
>

Thanks~

Patch

diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index fcc7581..3ba560d 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -90,9 +90,6 @@  struct e1000_info;
 
 #define E1000_MNG_VLAN_NONE		(-1)
 
-/* Number of packet split data buffers (not including the header buffer) */
-#define PS_PAGE_BUFFERS			(MAX_PS_BUFFERS - 1)
-
 #define DEFAULT_JUMBO			9234
 
 /* Time to wait before putting the device into D3 if there's no link (in ms). */
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
index 1e6b889..edc618ad 100644
--- a/drivers/net/ethernet/intel/e1000e/hw.h
+++ b/drivers/net/ethernet/intel/e1000e/hw.h
@@ -227,6 +227,9 @@  union e1000_rx_desc_extended {
 };
 
 #define MAX_PS_BUFFERS 4
+
+/* Number of packet split data buffers (not including the header buffer) */
+#define PS_PAGE_BUFFERS			(MAX_PS_BUFFERS - 1)
 /* Receive Descriptor - Packet Split */
 union e1000_rx_desc_packet_split {
 	struct {
@@ -251,7 +254,7 @@  union e1000_rx_desc_packet_split {
 		} middle;
 		struct {
 			__le16 header_status;
-			__le16 length[3];	/* length of buffers 1-3 */
+			__le16 length[PS_PAGE_BUFFERS];	/* length of buffers 1-3 */
 		} upper;
 		__le64 reserved;
 	} wb; /* writeback */