diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-23 09:33:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-23 09:33:57 -0700 |
| commit | 00e31a09613619a2f99adcd1ea9fceda9365fa30 (patch) | |
| tree | c44947b7110ee1e6a46a00d1cacedb4d7448e06c /include/linux | |
| parent | 5556fdb0c2ea3a9ae18e2c457a25198673761ff7 (diff) | |
| parent | 0127cd5440e7cce2ef8582e15cef65d58890e4b9 (diff) | |
Merge branch 'net-ll_temac-Fix-and-enable-multicast-support'
Esben Haabendal says:
====================
net: ll_temac: Fix and enable multicast support
This patch series makes the necessary fixes to ll_temac driver to make
multicast work, and enables support for it.so that multicast support can
The main change is the change from mutex to spinlock of the lock used to
synchronize access to the shared indirect register access.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/xilinx-ll-temac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/platform_data/xilinx-ll-temac.h b/include/linux/platform_data/xilinx-ll-temac.h index 368530f98176..f4a68136afa6 100644 --- a/include/linux/platform_data/xilinx-ll-temac.h +++ b/include/linux/platform_data/xilinx-ll-temac.h @@ -4,6 +4,7 @@ #include <linux/if_ether.h> #include <linux/phy.h> +#include <linux/spinlock.h> struct ll_temac_platform_data { bool txcsum; /* Enable/disable TX checksum */ @@ -21,7 +22,7 @@ struct ll_temac_platform_data { * TEMAC IP block, the same mutex should be passed here, as * they share the same DCR bus bridge. */ - struct mutex *indirect_mutex; + spinlock_t *indirect_lock; /* DMA channel control setup */ u8 tx_irq_timeout; /* TX Interrupt Delay Time-out */ u8 tx_irq_count; /* TX Interrupt Coalescing Threshold Count */ |