s390: qeth build fix for 2.6.27
Subsystems (4)
cover s390: qeth build fix for 2.6.27
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
PATCH 1/1 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.
--- drivers/s390/net/qeth_l3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_l3_main.c +1 -1
@@ -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 ; } }
Jeff Garzik
AppliedRe: [patch 1/1] qeth: fix build error caused by VLAN changes
Quoted 11 lines · [email protected] 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
Quoted 8 lines
The intention of the driver appears to be to invalidate the VLAN tag. Change it to set
skb->vlan_tcito zero, which has the same effect.Signed-off-by Patrick McHardy <[email protected]>Signed-off-by Frank Blaschka <[email protected]>--- drivers/s390/net/qeth_l3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
applied