[patch 0/1] s390: qeth build fix for 2.6.27

[patch 0/1] s390: qeth build fix for 2.6.27

[frank.blaschka]

Hi Jeff,

here is a patch to fix the broken s390 qeth build

shortlog:
Frank Blaschka (1)
qeth: fix 2.6.27 build

Thanks,
        Frank

-- 

[patch 1/1] qeth: fix 2.6.27 build

[frank.blaschka]

[-- Attachment #1: qeth_fix_build.patch --]
[-- Type: text/plain, Size: 852 bytes --]

From: Frank Blaschka <frank.blaschka@de.ibm.com>

Remove obsolete setting of the VLAN magic. This will fix the build
error introduced by Commit 6aa895b047720f71ec4eb11452f7c3ce8426941f
(vlan: Don't store VLAN tag in cb)

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
 drivers/s390/net/qeth_l3_main.c |    1 -
 1 file changed, 1 deletion(-)

Index: git_linus/drivers/s390/net/qeth_l3_main.c
===================================================================
--- git_linus.orig/drivers/s390/net/qeth_l3_main.c	2008-07-21 13:35:25.000000000 +0200
+++ git_linus/drivers/s390/net/qeth_l3_main.c	2008-07-21 13:37:12.000000000 +0200
@@ -2651,7 +2651,6 @@
 			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;
 		}
 	}
 

-- 

Re: [patch 1/1] qeth: fix 2.6.27 build

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

frank.blaschka@de.ibm.com wrote:

 >                        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;

The intention appears to be to invalidate the tag (its used
later on again if present), so that doesn't look correct.



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1245 bytes --]

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>
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;
 		}
 	}