diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2014-06-25 01:19:12 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-27 04:14:03 +0400 |
| commit | 6e5eed042fcac4166874d25cf9fb89bee841eb26 (patch) | |
| tree | 73cf827b588bc990ba5558807b75ab7b671a026b /drivers/net/ethernet/amd/xgbe/xgbe-dev.c | |
| parent | d0a8ba6cba0a05ce79df100a3d99502b94117d88 (diff) | |
| download | linux-6e5eed042fcac4166874d25cf9fb89bee841eb26.tar.xz | |
amd-xgbe: VLAN Tx tag insertion fix
The MAC_VLAN_Incl register (0x0060) must be set to indicate
that the VLAN tag to be inserted comes from a Tx context
descriptor and not the MAC_VLAN_Incl register. Also, even
though it is the default, explicitly set the type of tag to
be inserted as a CTAG.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/xgbe/xgbe-dev.c')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c index 864af2da54cd..b239b216e191 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c @@ -1541,6 +1541,10 @@ static void xgbe_config_checksum_offload(struct xgbe_prv_data *pdata) static void xgbe_config_vlan_support(struct xgbe_prv_data *pdata) { + /* Indicate that VLAN Tx CTAGs come from context descriptors */ + XGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, CSVL, 0); + XGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, VLTI, 1); + if (pdata->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) xgbe_enable_rx_vlan_stripping(pdata); else |