qeth: l3 add vlan hdr in passthru frames
authorFrank Blaschka <frank.blaschka@de.ibm.com>
Wed, 8 Dec 2010 02:58:00 +0000 (02:58 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 22:28:48 +0000 (14:28 -0800)
OSA l3 mode is hw accelerated VLAN only for IPv4. Take care we
add the vlan hdr to a passthru frame in the device driver.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_l3_main.c

index d5e40c3..e227e46 100644 (file)
@@ -3115,7 +3115,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                skb_pull(new_skb, ETH_HLEN);
                }
 
-               if (ipv == 6 && card->vlangrp &&
+               if (ipv != 4 && card->vlangrp &&
                                vlan_tx_tag_present(new_skb)) {
                        skb_push(new_skb, VLAN_HLEN);
                        skb_copy_to_linear_data(new_skb, new_skb->data + 4, 4);