From: Patrick McHardy <kaber@trash.net>
To: frank.blaschka@de.ibm.com
Cc: jgarzik@pobox.com, netdev@vger.kernel.org,
linux-s390@vger.kernel.org, bunk@kernel.org
Subject: Re: [patch 1/1] qeth: fix 2.6.27 build
Date: Mon, 21 Jul 2008 14:48:36 +0200 [thread overview]
Message-ID: <488485A4.9030305@trash.net> (raw)
In-Reply-To: <20080721115507.647845000@de.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
frank.blaschka@de.ibm.com wrote:
> tag = (u16 *)(new_skb->data + 12);
> *tag = __constant_htons(ETH_P_8021Q);
> *(tag + 1) = htons(vlan_tx_tag_get(new_skb));
>- VLAN_TX_SKB_CB(new_skb)->magic = 0;
The intention appears to be to invalidate the tag (its used
later on again if present), so that doesn't look correct.
[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1245 bytes --]
qeth: fix build error caused by VLAN changes
Adrian Bunk reports this build error:
CC drivers/s390/net/qeth_l3_main.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_hard_start_xmit':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c:2654: error: implicit declaration of function 'VLAN_TX_SKB_CB'
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c:2654: error: invalid type argument of '->' (have 'int')
make[3]: *** [drivers/s390/net/qeth_l3_main.o] Error 1
The intention of the driver appears to be to invalidate the VLAN tag.
Change it to set skb->vlan_tci to zero, which has the same effect.
Signed-off-by: Patrick McHardy <kaber@trash.net>
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index b29afef..38de31b 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2651,7 +2651,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
tag = (u16 *)(new_skb->data + 12);
*tag = __constant_htons(ETH_P_8021Q);
*(tag + 1) = htons(vlan_tx_tag_get(new_skb));
- VLAN_TX_SKB_CB(new_skb)->magic = 0;
+ new_skb->vlan_tci = 0;
}
}
prev parent reply other threads:[~2008-07-21 12:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-21 11:54 [patch 0/1] s390: qeth build fix for 2.6.27 frank.blaschka
2008-07-21 11:54 ` [patch 1/1] qeth: fix 2.6.27 build frank.blaschka
2008-07-21 12:48 ` Patrick McHardy [this message]
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=488485A4.9030305@trash.net \
--to=kaber@trash.net \
--cc=bunk@kernel.org \
--cc=frank.blaschka@de.ibm.com \
--cc=jgarzik@pobox.com \
--cc=linux-s390@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).