diff options
| author | frank.blaschka@de.ibm.com <frank.blaschka@de.ibm.com> | 2008-07-22 09:39:25 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-22 16:09:01 -0400 |
| commit | 2b4ff112a0b3fe90de561a77f2e66000c028ca54 (patch) | |
| tree | c7c16f3c1392b576ae42a52dfaacfa4df6ed4a35 /drivers/s390 | |
| parent | 217d5a51953143046cf2972eebdefe2b2db05718 (diff) | |
| download | kernel_samsung_crespo-2b4ff112a0b3fe90de561a77f2e66000c028ca54.zip kernel_samsung_crespo-2b4ff112a0b3fe90de561a77f2e66000c028ca54.tar.gz kernel_samsung_crespo-2b4ff112a0b3fe90de561a77f2e66000c028ca54.tar.bz2 | |
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>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |