2013-04-26 03:48:19

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: build failure after merge of the net-next tree

---

Hi all,

After merging the net-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/net/ethernet/emulex/benet/be_main.c: In function 'be_insert_vlan_in_pkt':
drivers/net/ethernet/emulex/benet/be_main.c:786:3: error: too few arguments to function '__vlan_put_tag'
include/linux/if_vlan.h:220:31: note: declared here
drivers/net/ethernet/emulex/benet/be_main.c:796:3: error: too few arguments to function '__vlan_put_tag'
include/linux/if_vlan.h:220:31: note: declared here

Caused by comt interaction of commit 86a9bad3ab6b ("net: vlan: add
protocol argument to packet tagging functions") from the net-next tree
and commit bc0c3405abbb ("be2net: fix a Tx stall bug caused by a specific
ipv6 packet") from the net tree.

I applied the following merge fix patch:

From: Stephen Rothwell <[email protected]>
Date: Fri, 26 Apr 2013 13:45:23 +1000
Subject: [PATCH] be2net: merge fix for __vlan_put_tag() API change

Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/net/ethernet/emulex/benet/be_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 768a7d1..d6ab777 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -783,7 +783,7 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
}

if (vlan_tag) {
- skb = __vlan_put_tag(skb, vlan_tag);
+ skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
if (unlikely(!skb))
return skb;

@@ -793,7 +793,7 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
/* Insert the outer VLAN, if any */
if (adapter->qnq_vid) {
vlan_tag = adapter->qnq_vid;
- skb = __vlan_put_tag(skb, vlan_tag);
+ skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
if (unlikely(!skb))
return skb;
if (skip_hw_vlan)
--
1.8.1

--
Cheers,
Stephen Rothwell [email protected]

---

Attachments:

(No filename) (1.98 kB)
(No filename) (836.00 B)
Download all attachments

2013-04-30 08:03:54

by David Miller

[permalink] [raw]

Subject: Re: linux-next: build failure after merge of the net-next tree

---

From: Stephen Rothwell <[email protected]>
Date: Fri, 26 Apr 2013 13:48:14 +1000

> Hi all,
>
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/net/ethernet/emulex/benet/be_main.c: In function 'be_insert_vlan_in_pkt':
> drivers/net/ethernet/emulex/benet/be_main.c:786:3: error: too few arguments to function '__vlan_put_tag'
> include/linux/if_vlan.h:220:31: note: declared here
> drivers/net/ethernet/emulex/benet/be_main.c:796:3: error: too few arguments to function '__vlan_put_tag'
> include/linux/if_vlan.h:220:31: note: declared here
>
> Caused by comt interaction of commit 86a9bad3ab6b ("net: vlan: add
> protocol argument to packet tagging functions") from the net-next tree
> and commit bc0c3405abbb ("be2net: fix a Tx stall bug caused by a specific
> ipv6 packet") from the net tree.
>
> I applied the following merge fix patch:

I fixed this in the merge commit when I merged net into net-next, thanks!