diff options
author | Mandy Lavi <mandy.lavi@freescale.com> | 2013-12-16 13:37:24 (GMT) |
---|---|---|
committer | Jose Rivera <German.Rivera@freescale.com> | 2014-03-05 13:52:16 (GMT) |
commit | 3a0b169daa0244bd6c2eb38784174d34edb03bad (patch) | |
tree | 1da4b02986e449bd501ea0979bd62464faf522b3 /drivers/net | |
parent | 4376b89e78db40c173640cc05b9046707d9ddb58 (diff) | |
download | linux-fsl-qoriq-3a0b169daa0244bd6c2eb38784174d34edb03bad.tar.xz |
fmd: add PPP header type to the list of headers to be handled
Change-Id: I7347668005c7979c2c64a97cbf05c16faddff49a
Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/7945
Tested-by: Richard Schmitt <richard.schmitt@freescale.com>
Reviewed-by: Nir Erez <nir.erez@freescale.com>
Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
(cherry picked from commit 978622644e30299070942ff53c9908c1c01e59e4)
Change-Id: I7347668005c7979c2c64a97cbf05c16faddff49a
Reviewed-on: http://git.am.freescale.net:8181/9383
Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Tested-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_kg.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_kg.c b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_kg.c index 5570bb1..4b0edc2 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_kg.c +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_kg.c @@ -1520,8 +1520,9 @@ static t_Error BuildSchemeRegs(t_FmPcdKgScheme *p_Scheme, swDefault = GetGenericSwDefault(swDefaults, numOfSwDefaults, code); if (swDefault == e_FM_PCD_KG_DFLT_ILLEGAL) DBG(WARNING, ("No sw default configured")); + else + genTmp |= swDefault << KG_SCH_GEN_DEF_SHIFT; - genTmp |= swDefault << KG_SCH_GEN_DEF_SHIFT; genTmp |= KG_SCH_GEN_MASK; p_SchemeRegs->kgse_gec[currGenId] = genTmp; /* save in driver structure */ diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h b/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h index d23c1d0..0d7bf55 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h @@ -584,6 +584,7 @@ switch (hdr) \ case (HEADER_TYPE_LLC_SNAP): num = 1; break; \ case (HEADER_TYPE_VLAN): num = 2; break; \ case (HEADER_TYPE_PPPoE): num = 3; break; \ + case (HEADER_TYPE_PPP): num = 3; break; \ case (HEADER_TYPE_MPLS): num = 4; break; \ case (HEADER_TYPE_IPv4): num = 5; break; \ case (HEADER_TYPE_IPv6): num = 6; break; \ |