Netdev List
 help / color / mirror / Atom feed
From: John Fastabend <john.fastabend@gmail.com>
To: john.fastabend@gmail.com, jhs@mojatatu.com, jeffrey.t.kirsher@intel.com
Cc: netdev@vger.kernel.org, davem@davemloft.net
Subject: [net-next PATCH 1/2] ixgbe: use u32 instead of __u32 in model header
Date: Wed, 17 Feb 2016 14:34:53 -0800	[thread overview]
Message-ID: <20160217223453.9858.76096.stgit@john-Precision-Tower-5810> (raw)

I incorrectly used __u32 types where we should be using u32 types when
I added the ixgbe_model.h file.

Fixes: 9d35cf062e05 ("net: ixgbe: add minimal parser details for ixgbe")
Suggested-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_model.h |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h
index 43ebec4..62ea2e7 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h
@@ -35,13 +35,13 @@ struct ixgbe_mat_field {
 	unsigned int mask;
 	int (*val)(struct ixgbe_fdir_filter *input,
 		   union ixgbe_atr_input *mask,
-		   __u32 val, __u32 m);
+		   u32 val, u32 m);
 	unsigned int type;
 };
 
 static inline int ixgbe_mat_prgm_sip(struct ixgbe_fdir_filter *input,
 				     union ixgbe_atr_input *mask,
-				     __u32 val, __u32 m)
+				     u32 val, u32 m)
 {
 	input->filter.formatted.src_ip[0] = val;
 	mask->formatted.src_ip[0] = m;
@@ -50,7 +50,7 @@ static inline int ixgbe_mat_prgm_sip(struct ixgbe_fdir_filter *input,
 
 static inline int ixgbe_mat_prgm_dip(struct ixgbe_fdir_filter *input,
 				     union ixgbe_atr_input *mask,
-				     __u32 val, __u32 m)
+				     u32 val, u32 m)
 {
 	input->filter.formatted.dst_ip[0] = val;
 	mask->formatted.dst_ip[0] = m;
@@ -67,7 +67,7 @@ static struct ixgbe_mat_field ixgbe_ipv4_fields[] = {
 
 static inline int ixgbe_mat_prgm_sport(struct ixgbe_fdir_filter *input,
 				       union ixgbe_atr_input *mask,
-				       __u32 val, __u32 m)
+				       u32 val, u32 m)
 {
 	input->filter.formatted.src_port = val & 0xffff;
 	mask->formatted.src_port = m & 0xffff;
@@ -76,7 +76,7 @@ static inline int ixgbe_mat_prgm_sport(struct ixgbe_fdir_filter *input,
 
 static inline int ixgbe_mat_prgm_dport(struct ixgbe_fdir_filter *input,
 				       union ixgbe_atr_input *mask,
-				       __u32 val, __u32 m)
+				       u32 val, u32 m)
 {
 	input->filter.formatted.dst_port = val & 0xffff;
 	mask->formatted.dst_port = m & 0xffff;
@@ -94,12 +94,12 @@ static struct ixgbe_mat_field ixgbe_tcp_fields[] = {
 struct ixgbe_nexthdr {
 	/* offset, shift, and mask of position to next header */
 	unsigned int o;
-	__u32 s;
-	__u32 m;
+	u32 s;
+	u32 m;
 	/* match criteria to make this jump*/
 	unsigned int off;
-	__u32 val;
-	__u32 mask;
+	u32 val;
+	u32 mask;
 	/* location of jump to make */
 	struct ixgbe_mat_field *jump;
 };

             reply	other threads:[~2016-02-17 22:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-17 22:34 John Fastabend [this message]
2016-02-17 22:35 ` [net-next PATCH 2/2] ixgbe: fix dates on header of ixgbe_model.h John Fastabend
2016-02-17 22:42   ` Jeff Kirsher
2016-02-18  2:44   ` David Miller
2016-02-17 22:41 ` [net-next PATCH 1/2] ixgbe: use u32 instead of __u32 in model header Jeff Kirsher
2016-02-18  2:23   ` David Miller
2016-02-18  2:44 ` David Miller

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=20160217223453.9858.76096.stgit@john-Precision-Tower-5810 \
    --to=john.fastabend@gmail.com \
    --cc=davem@davemloft.net \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=jhs@mojatatu.com \
    --cc=netdev@vger.kernel.org \
    /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