* [patch 0/1] [RESEND] s390: qeth build fix for 2.6.27
@ 2008-07-22 7:39 frank.blaschka
2008-07-22 7:39 ` [patch 1/1] qeth: fix build error caused by VLAN changes frank.blaschka
0 siblings, 1 reply; 3+ messages in thread
From: frank.blaschka @ 2008-07-22 7:39 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-s390, bunk, kaber
Hi Jeff,
a better patch from Patrick to fix the broken s390 qeth build
(Thanks to Patrik)
shortlog:
Patrick McHardy (1)
qeth: fix build error caused by VLAN changes
Thanks,
Frank
--
^ permalink raw reply [flat|nested] 3+ messages in thread* [patch 1/1] qeth: fix build error caused by VLAN changes
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
2008-07-22 20:09 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: frank.blaschka @ 2008-07-22 7:39 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-s390, bunk, kaber
[-- 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;
}
}
--
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 1/1] qeth: fix build error caused by VLAN changes
2008-07-22 7:39 ` [patch 1/1] qeth: fix build error caused by VLAN changes frank.blaschka
@ 2008-07-22 20:09 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2008-07-22 20:09 UTC (permalink / raw)
To: frank.blaschka; +Cc: netdev, linux-s390, bunk, kaber
frank.blaschka@de.ibm.com wrote:
> 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(-)
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-07-22 20:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-22 7:39 [patch 0/1] [RESEND] s390: qeth build fix for 2.6.27 frank.blaschka
2008-07-22 7:39 ` [patch 1/1] qeth: fix build error caused by VLAN changes frank.blaschka
2008-07-22 20:09 ` Jeff Garzik
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).