diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-02 19:19:53 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-02 19:19:53 +0300 |
| commit | 76d674947c17d297d65b185aa6ce551f915c7e2e (patch) | |
| tree | 4df7d4391813771487132a4d01471064dbda15ce /include/linux | |
| parent | d64bf89a75b65f83f06be9fb8f978e60d53752db (diff) | |
| parent | 3e8db7e56082156a37b71d7334860c10fcea8025 (diff) | |
| download | linux-76d674947c17d297d65b185aa6ce551f915c7e2e.tar.xz | |
Merge branch 'SJA1105-DSA-locking-fixes-for-PTP'
Vladimir Oltean says:
====================
SJA1105 DSA locking fixes for PTP
This series fixes the locking API usage problems spotted when compiling
the kernel with CONFIG_DEBUG_ATOMIC_SLEEP=y and CONFIG_DEBUG_SPINLOCK=y.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dsa/sja1105.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/dsa/sja1105.h b/include/linux/dsa/sja1105.h index 79435cfc20eb..897e799dbcb9 100644 --- a/include/linux/dsa/sja1105.h +++ b/include/linux/dsa/sja1105.h @@ -31,6 +31,8 @@ #define SJA1105_META_SMAC 0x222222222222ull #define SJA1105_META_DMAC 0x0180C200000Eull +#define SJA1105_HWTS_RX_EN 0 + /* Global tagger data: each struct sja1105_port has a reference to * the structure defined in struct sja1105_private. */ @@ -42,7 +44,7 @@ struct sja1105_tagger_data { * from taggers running on multiple ports on SMP systems */ spinlock_t meta_lock; - bool hwts_rx_en; + unsigned long state; }; struct sja1105_skb_cb { |