1 files changed, 9 insertions, 2 deletions

diff --git a/net/l3mdev/l3mdev.c b/net/l3mdev/l3mdev.c
index 8e5ead366e7f..e925037fa0df 100644
--- a/net/l3mdev/l3mdev.c
+++ b/net/l3mdev/l3mdev.c
@@ -17,7 +17,7 @@
  *      @dev: targeted interface
  */
 
-int l3mdev_master_ifindex_rcu(struct net_device *dev)
+int l3mdev_master_ifindex_rcu(const struct net_device *dev)
 {
         int ifindex = 0;
 
@@ -28,8 +28,15 @@ int l3mdev_master_ifindex_rcu(struct net_device *dev)
                 ifindex = dev->ifindex;
         } else if (netif_is_l3_slave(dev)) {
                 struct net_device *master;
+                struct net_device *_dev = (struct net_device *)dev;
 
-                master = netdev_master_upper_dev_get_rcu(dev);
+                /* netdev_master_upper_dev_get_rcu calls
+                 * list_first_or_null_rcu to walk the upper dev list.
+                 * list_first_or_null_rcu does not handle a const arg. We aren't
+                 * making changes, just want the master device from that list so
+                 * typecast to remove the const
+                 */
+                master = netdev_master_upper_dev_get_rcu(_dev);
                 if (master)
                         ifindex = master->ifindex;
         }