diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2019-02-14 17:46:56 +0100 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2019-02-14 17:46:56 +0100 |
commit | 338618ad2a01b821a34e089a6607143fb283dee3 (patch) | |
tree | adf9aff96a5a087c820251f3eb09928b3271b007 /drivers/net/ethernet/cadence/macb.h | |
parent | i2c: rcar: refactor TCYC handling (diff) | |
parent | Linux 5.0-rc6 (diff) | |
download | linux-338618ad2a01b821a34e089a6607143fb283dee3.tar.xz linux-338618ad2a01b821a34e089a6607143fb283dee3.zip |
Merge branch 'i2c/for-current' into i2c/for-5.1
Diffstat (limited to 'drivers/net/ethernet/cadence/macb.h')
-rw-r--r-- | drivers/net/ethernet/cadence/macb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 3d45f4c92cf6..9bbaad9f3d63 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -643,6 +643,7 @@ #define MACB_CAPS_JUMBO 0x00000020 #define MACB_CAPS_GEM_HAS_PTP 0x00000040 #define MACB_CAPS_BD_RD_PREFETCH 0x00000080 +#define MACB_CAPS_NEEDS_RSTONUBR 0x00000100 #define MACB_CAPS_FIFO_MODE 0x10000000 #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 #define MACB_CAPS_SG_DISABLED 0x40000000 @@ -1214,6 +1215,8 @@ struct macb { int rx_bd_rd_prefetch; int tx_bd_rd_prefetch; + + u32 rx_intr_mask; }; #ifdef CONFIG_MACB_USE_HWSTAMP |