lkml.org 
[lkml]   [2014]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 59/72] vlan: Set hard_header_len according to available acceleration
    Date
    From: Vlad Yasevich <vyasevic@redhat.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    [ Upstream commit fc0d48b8fb449ca007b2057328abf736cb516168 ]

    Currently, if the card supports CTAG acceleration we do not
    account for the vlan header even if we are configuring an
    8021AD vlan. This may not be best since we'll do software
    tagging for 8021AD which will cause data copy on skb head expansion
    Configure the length based on available hw offload capabilities and
    vlan protocol.

    CC: Patrick McHardy <kaber@trash.net>
    Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    net/8021q/vlan.c | 4 +++-
    net/8021q/vlan_dev.c | 3 ++-
    2 files changed, 5 insertions(+), 2 deletions(-)

    diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
    index 61fc573f1142..856499fdb10f 100644
    --- a/net/8021q/vlan.c
    +++ b/net/8021q/vlan.c
    @@ -307,9 +307,11 @@ static void vlan_sync_address(struct net_device *dev,
    static void vlan_transfer_features(struct net_device *dev,
    struct net_device *vlandev)
    {
    + struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);
    +
    vlandev->gso_max_size = dev->gso_max_size;

    - if (dev->features & NETIF_F_HW_VLAN_CTAG_TX)
    + if (vlan_hw_offload_capable(dev->features, vlan->vlan_proto))
    vlandev->hard_header_len = dev->hard_header_len;
    else
    vlandev->hard_header_len = dev->hard_header_len + VLAN_HLEN;
    diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
    index dc7d8da441dd..d1537dcd4df8 100644
    --- a/net/8021q/vlan_dev.c
    +++ b/net/8021q/vlan_dev.c
    @@ -611,7 +611,8 @@ static int vlan_dev_init(struct net_device *dev)
    #endif

    dev->needed_headroom = real_dev->needed_headroom;
    - if (real_dev->features & NETIF_F_HW_VLAN_CTAG_TX) {
    + if (vlan_hw_offload_capable(real_dev->features,
    + vlan_dev_priv(dev)->vlan_proto)) {
    dev->header_ops = &vlan_passthru_header_ops;
    dev->hard_header_len = real_dev->hard_header_len;
    } else {
    --
    1.9.2


    \
     
     \ /
      Last update: 2014-04-18 12:01    [W:4.220 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site