From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jesse Brandeburg <jesse.brandeburg@intel.com>
Subject: linux-next: build failure after merge of the final tree (net-next tree related)
Date: Mon, 17 Mar 2014 21:21:00 +1100 [thread overview]
Message-ID: <20140317212100.9b57a2237439427be566ede7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3400 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/net/ethernet/intel/i40evf/built-in.o:(.data+0x1868): multiple definition of `i40e_ptype_lookup'
drivers/net/ethernet/intel/i40e/built-in.o:(.data+0x3f58): first defined here
Caused by commit 206812b5fccb ("i40e/i40evf: i40e implementation for
skb_set_hash") from the net-next tree.
I applied this patch for today (there is probably a better way):
From 6964d39f8436eade2cdb0c5236734c579b8b0897 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Mar 2014 21:18:48 +1100
Subject: [PATCH] i40e/i40evf: i40e implementation for skb_set_hash fix
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ethernet/intel/i40evf/i40e_common.c | 8 ++++----
drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c
index 78618af271cf..c688a0fc5c29 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c
@@ -160,7 +160,7 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
}
-/* The i40e_ptype_lookup table is used to convert from the 8-bit ptype in the
+/* The i40evf_ptype_lookup table is used to convert from the 8-bit ptype in the
* hardware to a bit-field that can be used by SW to more easily determine the
* packet type.
*
@@ -173,10 +173,10 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
*
* Typical work flow:
*
- * IF NOT i40e_ptype_lookup[ptype].known
+ * IF NOT i40evf_ptype_lookup[ptype].known
* THEN
* Packet is unknown
- * ELSE IF i40e_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP
+ * ELSE IF i40evf_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP
* Use the rest of the fields to look at the tunnels, inner protocols, etc
* ELSE
* Use the enum i40e_rx_l2_ptype to decode the packet type
@@ -205,7 +205,7 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
#define I40E_RX_PTYPE_INNER_PROT_TS I40E_RX_PTYPE_INNER_PROT_TIMESYNC
/* Lookup table mapping the HW PTYPE to the bit field for decoding */
-struct i40e_rx_ptype_decoded i40e_ptype_lookup[] = {
+struct i40e_rx_ptype_decoded i40evf_ptype_lookup[] = {
/* L2 Packet types */
I40E_PTT_UNUSED_ENTRY(0),
I40E_PTT(1, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_prototype.h b/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
index 33c99051cc96..862fcdf52675 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
@@ -63,11 +63,11 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
i40e_status i40e_set_mac_type(struct i40e_hw *hw);
-extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
+extern struct i40e_rx_ptype_decoded i40evf_ptype_lookup[];
static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)
{
- return i40e_ptype_lookup[ptype];
+ return i40evf_ptype_lookup[ptype];
}
/* prototype for functions used for SW locks */
--
1.9.0
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-17 10:21 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-17 10:21 Stephen Rothwell [this message]
2014-03-19 3:11 ` linux-next: build failure after merge of the final tree (net-next tree related) David Miller
-- strict thread matches above, loose matches on Subject: below --
2014-03-18 7:27 Stephen Rothwell
2014-03-19 3:13 ` David Miller
2014-03-17 10:13 Stephen Rothwell
2013-09-02 9:11 Stephen Rothwell
2013-09-02 9:18 ` Cong Wang
2013-07-03 7:48 Stephen Rothwell
2013-07-03 7:51 ` Sedat Dilek
2013-07-03 8:45 ` Eliezer Tamir
2013-07-03 19:17 ` David Miller
2013-06-26 7:56 Stephen Rothwell
2013-06-26 8:07 ` Alexey Brodkin
2013-06-26 8:36 ` David Miller
2013-04-23 7:46 Stephen Rothwell
2013-04-23 17:10 ` David Miller
2013-04-23 23:44 ` David Rientjes
2013-04-12 6:00 Stephen Rothwell
2013-04-12 7:08 ` David Miller
2013-03-28 5:04 Stephen Rothwell
2013-03-28 5:19 ` David Miller
2013-01-03 3:23 Stephen Rothwell
2013-01-03 3:28 ` David Miller
2013-01-03 9:51 ` David Miller
2012-09-20 7:36 Stephen Rothwell
2012-09-20 9:10 ` Mika Westerberg
2012-09-20 20:45 ` David Miller
2012-09-20 22:15 ` Stephen Rothwell
2012-09-20 22:22 ` Benjamin Herrenschmidt
2012-09-20 22:53 ` David Miller
2012-09-21 21:46 ` Benjamin Herrenschmidt
2012-09-22 20:00 ` David Miller
2012-09-22 21:20 ` Benjamin Herrenschmidt
2012-09-20 22:28 ` Stephen Rothwell
2012-09-21 1:37 ` Stephen Rothwell
2012-09-05 5:39 Stephen Rothwell
2012-09-05 21:46 ` David Miller
2012-09-04 6:58 Stephen Rothwell
2012-09-04 18:20 ` David Miller
2012-09-04 19:50 ` Jerry Chu
2012-07-22 6:34 Stephen Rothwell
2012-07-22 7:29 ` Jiri Pirko
2012-05-03 6:16 Stephen Rothwell
2012-05-03 6:26 ` David Miller
2012-04-30 5:58 Stephen Rothwell
2012-04-30 17:22 ` David Miller
2012-04-19 6:28 Stephen Rothwell
2012-04-19 6:40 ` David Miller
2012-04-10 5:29 Stephen Rothwell
2012-04-10 13:26 ` David Miller
2012-04-05 3:25 Stephen Rothwell
2012-04-05 3:59 ` David Miller
2012-04-06 7:09 ` Giuseppe CAVALLARO
2012-04-06 7:30 ` Giuseppe CAVALLARO
2012-02-20 5:15 Stephen Rothwell
2012-02-20 5:46 ` David Miller
2011-12-14 7:07 Stephen Rothwell
2011-12-14 18:35 ` David Miller
2011-11-23 4:00 Stephen Rothwell
2011-11-23 12:09 ` Neil Horman
2011-11-23 23:02 ` Andrew Morton
2011-11-23 23: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=20140317212100.9b57a2237439427be566ede7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=jesse.brandeburg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).