You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
22 lines
776 B
Diff
22 lines
776 B
Diff
From c51ed10a001d3fd5b80b7bb92f2d5182f1d9fa5a Mon Sep 17 00:00:00 2001
|
|
From: Stuart Yoder <stuart.yoder@nxp.com>
|
|
Date: Thu, 25 Aug 2016 16:10:12 -0500
|
|
Subject: [PATCH 222/226] dpaa2-ethsw: fix compile error on backport to 4.4
|
|
|
|
Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
|
|
---
|
|
drivers/staging/fsl-dpaa2/ethsw/switch.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/staging/fsl-dpaa2/ethsw/switch.c
|
|
+++ b/drivers/staging/fsl-dpaa2/ethsw/switch.c
|
|
@@ -1625,7 +1625,7 @@ ethsw_probe(struct fsl_mc_device *sw_dev
|
|
|
|
rtnl_lock();
|
|
|
|
- err = netdev_master_upper_dev_link(port_netdev, netdev, NULL, NULL);
|
|
+ err = netdev_master_upper_dev_link(port_netdev, netdev);
|
|
if (err) {
|
|
dev_err(dev, "netdev_master_upper_dev_link error %d\n",
|
|
err);
|