diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-04 11:53:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-04 11:53:48 +0300 |
| commit | 7e89350c901923c48370ae7b922223c6c5a2b7fd (patch) | |
| tree | 69e64deb6d7ebe357a4b01beafd618f4930c9e92 /include/linux | |
| parent | b820c114eba7e105556429031656918ebdd50ab1 (diff) | |
| parent | f0653a892097ca16c90e32b6615cac5eba0df3a8 (diff) | |
| download | linux-7e89350c901923c48370ae7b922223c6c5a2b7fd.tar.xz | |
Merge branch 'dpaa2-switch-next'
Ioana Ciornei says:
====================
dpaa2-switch: integrate the MAC endpoint support
This patch set integrates the already available MAC support into the
dpaa2-switch driver as well.
The first 4 patches are fixing up some minor problems or optimizing the
code, while the remaining ones are actually integrating the dpaa2-mac
support into the switch driver by calling the dpaa2_mac_* provided
functions. While at it, we also export the MAC statistics in ethtool
like we do for dpaa2-eth.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsl/mc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h index 63b56aba925a..30ece3ae6df7 100644 --- a/include/linux/fsl/mc.h +++ b/include/linux/fsl/mc.h @@ -423,7 +423,8 @@ int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev); void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev); -struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev); +struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev, + u16 if_id); extern struct bus_type fsl_mc_bus_type; |