diff options
| author | David S. Miller <[email protected]> | 2015-12-07 16:35:51 -0500 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-12-07 16:35:51 -0500 |
| commit | 611d7df8866dabe4ae3b4f4fee4403c08dc87a67 (patch) | |
| tree | 795c5b3cb40f66415c0237c7602026b08ff78b18 /include | |
| parent | ad9360b3e5d428d859256390906dff64f2ddc290 (diff) | |
| parent | cda5c15b23fb9d683a491e8bd137d11d8552ac02 (diff) | |
Merge branch 'more-dsa-unbinding-fixes'
Neil Armstrong says:
====================
Further fix for dsa unbinding
This series fixes further issues for DSA dynamic unbinding.
The first patch completely removes the PHY link state polling.
The two following cleans up the dsa state upon removal.
The last patch moves slave destroy code as slave function and
adds missing netdev and phy cleanup calls.
v1: http://lkml.kernel.org/r/[email protected]
v2: http://lkml.kernel.org/r/[email protected]
remove phy fix and add missing calls in dsa_switch_destroy
then add dedicated dsa_slave_destroy
v3: remove polling instead of fixing it, make single patch for
dsa slave destroy
====================
Acked-by: Andrew Lunn <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dsa.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 3f23dd9d6a69..26a0e86e611e 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -117,13 +117,6 @@ struct dsa_switch_tree { s8 cpu_port; /* - * Link state polling. - */ - int link_poll_needed; - struct work_struct link_poll_work; - struct timer_list link_poll_timer; - - /* * Data for the individual switch chips. */ struct dsa_switch *ds[DSA_MAX_SWITCHES]; @@ -232,11 +225,6 @@ struct dsa_switch_driver { int regnum, u16 val); /* - * Link state polling and IRQ handling. - */ - void (*poll_link)(struct dsa_switch *ds); - - /* * Link state adjustment (called from libphy) */ void (*adjust_link)(struct dsa_switch *ds, int port, |