From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Wei Yang <weiyang@linux.vnet.ibm.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 04/12] e1000e: Use marco instead of digit for defining e1000_rx_desc_packet_split
Date: Sun, 28 Jul 2013 04:41:08 -0700 [thread overview]
Message-ID: <1375011676-30739-5-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1375011676-30739-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Wei Yang <weiyang@linux.vnet.ibm.com>
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 length is
changed.
This patch use the macro PS_PAGE_BUFFERS for the definition. And move the
definition to hw.h.
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000e/e1000.h | 3 ---
drivers/net/ethernet/intel/e1000e/hw.h | 6 +++++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index ffbc08f..ad0edd1 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 a6f903a..cee565d 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,8 @@ union e1000_rx_desc_packet_split {
} middle;
struct {
__le16 header_status;
- __le16 length[3]; /* length of buffers 1-3 */
+ /* length of buffers 1-3 */
+ __le16 length[PS_PAGE_BUFFERS];
} upper;
__le64 reserved;
} wb; /* writeback */
--
1.7.11.7
next prev parent reply other threads:[~2013-07-28 11:41 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-28 11:41 [net-next 00/12][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-07-28 11:41 ` [net-next 01/12] e100: dump small buffers via %*ph Jeff Kirsher
2013-07-28 11:41 ` [net-next 02/12] e1000e: restore call to pci_clear_master() Jeff Kirsher
2013-07-28 11:41 ` [net-next 03/12] e1000e: Remove duplicate assignment of default rx/tx ring size Jeff Kirsher
2013-07-28 11:41 ` Jeff Kirsher [this message]
2013-07-28 11:41 ` [net-next 05/12] e1000e: disable ASPM L1 on 82583 Jeff Kirsher
2013-07-28 11:41 ` [net-next 06/12] e1000e: iAMT connections drop on driver unload when jumbo frames enabled Jeff Kirsher
2013-07-28 11:41 ` [net-next 07/12] e1000e: low throughput using 4K jumbos on I218 Jeff Kirsher
2013-07-28 11:41 ` [net-next 08/12] e1000e: Tx hang on I218 when linked at 100Half and slow response at 10Mbps Jeff Kirsher
2013-07-28 11:41 ` [net-next 09/12] e1000e: ethtool unnecessarily takes device out of RPM suspend Jeff Kirsher
2013-07-28 11:41 ` [net-next 10/12] e1000e: enable support for new device IDs Jeff Kirsher
2013-07-28 11:41 ` [net-next 11/12] e1000e: do not resume device from RPM suspend to read PHY status registers Jeff Kirsher
2013-07-28 11:41 ` [net-next 12/12] e1000e: fix I217/I218 PHY initialization flow Jeff Kirsher
2013-07-28 20:21 ` [net-next 00/12][pull request] Intel Wired LAN Driver Updates David Miller
2013-07-28 23:11 ` Jeff Kirsher
2013-07-29 0:20 ` David Miller
2013-07-29 2:08 ` Jeff Kirsher
2013-07-29 7:34 ` David Miller
2013-07-29 8:34 ` Jeff Kirsher
2013-07-29 8:46 ` David Miller
2013-07-29 9:17 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375011676-30739-5-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
--cc=weiyang@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).