lkml.org 
[lkml]   [2013]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 14/48] via-rhine: fix VLAN priority field (PCP, IEEE 802.1p)
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Roger Luethi <rl@hellgate.ch>

    [ Upstream commit 207070f5221e2a901d56a49df9cde47d9b716cd7 ]

    Outgoing packets sent by via-rhine have their VLAN PCP field off by one
    (when hardware acceleration is enabled). The TX descriptor expects only VID
    and PCP (without a CFI/DEI bit).

    Peter Boström noticed and reported the bug.

    Signed-off-by: Roger Luethi <rl@hellgate.ch>
    Cc: Peter Boström <peter.bostrom@netrounds.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/via/via-rhine.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/via/via-rhine.c
    +++ b/drivers/net/ethernet/via/via-rhine.c
    @@ -32,7 +32,7 @@
    #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

    #define DRV_NAME "via-rhine"
    -#define DRV_VERSION "1.5.0"
    +#define DRV_VERSION "1.5.1"
    #define DRV_RELDATE "2010-10-09"

    #include <linux/types.h>
    @@ -1684,7 +1684,12 @@ static netdev_tx_t rhine_start_tx(struct
    cpu_to_le32(TXDESC | (skb->len >= ETH_ZLEN ? skb->len : ETH_ZLEN));

    if (unlikely(vlan_tx_tag_present(skb))) {
    - rp->tx_ring[entry].tx_status = cpu_to_le32((vlan_tx_tag_get(skb)) << 16);
    + u16 vid_pcp = vlan_tx_tag_get(skb);
    +
    + /* drop CFI/DEI bit, register needs VID and PCP */
    + vid_pcp = (vid_pcp & VLAN_VID_MASK) |
    + ((vid_pcp & VLAN_PRIO_MASK) >> 1);
    + rp->tx_ring[entry].tx_status = cpu_to_le32((vid_pcp) << 16);
    /* request tagging */
    rp->tx_ring[entry].desc_length |= cpu_to_le32(0x020000);
    }

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2013-10-12 00:41    [W:4.580 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site