Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

frank.blaschka@de.ibm.com and committed by
Jeff Garzik
2b4ff112 217d5a51

+1 -1
+1 -1
drivers/s390/net/qeth_l3_main.c
··· 2651 2651 tag = (u16 *)(new_skb->data + 12); 2652 2652 *tag = __constant_htons(ETH_P_8021Q); 2653 2653 *(tag + 1) = htons(vlan_tx_tag_get(new_skb)); 2654 - VLAN_TX_SKB_CB(new_skb)->magic = 0; 2654 + new_skb->vlan_tci = 0; 2655 2655 } 2656 2656 } 2657 2657