Skip to content

Commit

Permalink
Merge branch 'net-ll_temac-Fix-and-enable-multicast-support'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed May 23, 2019
2 parents 5556fdb + 0127cd5 commit 00e31a0
Show file tree
Hide file tree
Showing 4 changed files with 184 additions and 99 deletions.
5 changes: 3 additions & 2 deletions drivers/net/ethernet/xilinx/ll_temac.h
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ struct temac_local {
/* For synchronization of indirect register access. Must be
* shared mutex between interfaces in same TEMAC block.
*/
struct mutex *indirect_mutex;
spinlock_t *indirect_lock;
u32 options; /* Current options word */
int last_link;
unsigned int temac_features;
Expand All @@ -388,8 +388,9 @@ struct temac_local {
/* xilinx_temac.c */
int temac_indirect_busywait(struct temac_local *lp);
u32 temac_indirect_in32(struct temac_local *lp, int reg);
u32 temac_indirect_in32_locked(struct temac_local *lp, int reg);
void temac_indirect_out32(struct temac_local *lp, int reg, u32 value);

void temac_indirect_out32_locked(struct temac_local *lp, int reg, u32 value);

/* xilinx_temac_mdio.c */
int temac_mdio_setup(struct temac_local *lp, struct platform_device *pdev);
Expand Down
Loading

0 comments on commit 00e31a0

Please sign in to comment.