7222-dpaa2-ethsw-fix-compile-error-on-backport-to-4.4.patch 776 B

123456789101112131415161718192021
  1. From c51ed10a001d3fd5b80b7bb92f2d5182f1d9fa5a Mon Sep 17 00:00:00 2001
  2. From: Stuart Yoder <stuart.yoder@nxp.com>
  3. Date: Thu, 25 Aug 2016 16:10:12 -0500
  4. Subject: [PATCH 222/226] dpaa2-ethsw: fix compile error on backport to 4.4
  5. Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
  6. ---
  7. drivers/staging/fsl-dpaa2/ethsw/switch.c | 2 +-
  8. 1 file changed, 1 insertion(+), 1 deletion(-)
  9. --- a/drivers/staging/fsl-dpaa2/ethsw/switch.c
  10. +++ b/drivers/staging/fsl-dpaa2/ethsw/switch.c
  11. @@ -1625,7 +1625,7 @@ ethsw_probe(struct fsl_mc_device *sw_dev
  12. rtnl_lock();
  13. - err = netdev_master_upper_dev_link(port_netdev, netdev, NULL, NULL);
  14. + err = netdev_master_upper_dev_link(port_netdev, netdev);
  15. if (err) {
  16. dev_err(dev, "netdev_master_upper_dev_link error %d\n",
  17. err);