diff options
| author | Frank Blaschka <frank.blaschka@de.ibm.com> | 2010-12-08 02:58:00 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-10 14:28:48 -0800 |
| commit | 91d4576bfe87980b1b86305c29912d96b96ce98e (patch) | |
| tree | 169eac668fe5ba83cfec30de3b756dc669beb0f1 /drivers/s390/net | |
| parent | f154b79cd7db221240ab6e8e4d844d3a3f10b04c (diff) | |
| download | kernel_samsung_aries-91d4576bfe87980b1b86305c29912d96b96ce98e.zip kernel_samsung_aries-91d4576bfe87980b1b86305c29912d96b96ce98e.tar.gz kernel_samsung_aries-91d4576bfe87980b1b86305c29912d96b96ce98e.tar.bz2 | |
qeth: l3 add vlan hdr in passthru frames
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>
Diffstat (limited to 'drivers/s390/net')
| -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 d5e40c3..e227e46 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -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); |