diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
| commit | ec665af5dd517c60ea1fbe791f6c8ecc443a61b6 (patch) | |
| tree | adfe7a2578ecde6d65e927afe65b289efb458ab1 /drivers/net/ethernet/broadcom/bcmsysport.h | |
| parent | 46543af4c9edc5701729b24dd395c23a40871aa9 (diff) | |
| parent | f952480a8fc14ea24a4de9582e425924f98c92d3 (diff) | |
Merge tag 'v4.14.58' into linux-linaro-lsk-v4.14lsk-v4.14-18.07
This is the 4.14.58 stable release
Diffstat (limited to 'drivers/net/ethernet/broadcom/bcmsysport.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h index a2006f5fc26f..86ae751ccb5c 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.h +++ b/drivers/net/ethernet/broadcom/bcmsysport.h @@ -277,7 +277,8 @@ struct bcm_rsb { #define GIB_GTX_CLK_EXT_CLK (0 << GIB_GTX_CLK_SEL_SHIFT) #define GIB_GTX_CLK_125MHZ (1 << GIB_GTX_CLK_SEL_SHIFT) #define GIB_GTX_CLK_250MHZ (2 << GIB_GTX_CLK_SEL_SHIFT) -#define GIB_FCS_STRIP (1 << 6) +#define GIB_FCS_STRIP_SHIFT 6 +#define GIB_FCS_STRIP (1 << GIB_FCS_STRIP_SHIFT) #define GIB_LCL_LOOP_EN (1 << 7) #define GIB_LCL_LOOP_TXEN (1 << 8) #define GIB_RMT_LOOP_EN (1 << 9) |