From: frank.blaschka@de.ibm.com
To: jgarzik@pobox.com
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
bunk@kernel.org, kaber@trash.net
Subject: [patch 1/1] qeth: fix build error caused by VLAN changes
Date: Tue, 22 Jul 2008 09:39:25 +0200 [thread overview]
Message-ID: <20080722074014.988096000@de.ibm.com> (raw)
In-Reply-To: 20080722073924.165257000@de.ibm.com
[-- Attachment #1: qeth_fix_build.patch --]
[-- Type: text/plain, Size: 1380 bytes --]
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>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_l3_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: git_linus/drivers/s390/net/qeth_l3_main.c
===================================================================
--- git_linus.orig/drivers/s390/net/qeth_l3_main.c 2008-07-22 09:25:13.000000000 +0200
+++ git_linus/drivers/s390/net/qeth_l3_main.c 2008-07-22 09:27:04.000000000 +0200
@@ -2651,7 +2651,7 @@
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;
}
}
--
next prev parent reply other threads:[~2008-07-22 7:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 7:39 [patch 0/1] [RESEND] s390: qeth build fix for 2.6.27 frank.blaschka
2008-07-22 7:39 ` frank.blaschka [this message]
2008-07-22 20:09 ` [patch 1/1] qeth: fix build error caused by VLAN changes Jeff Garzik
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=20080722074014.988096000@de.ibm.com \
--to=frank.blaschka@de.ibm.com \
--cc=bunk@kernel.org \
--cc=jgarzik@pobox.com \
--cc=kaber@trash.net \
--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).