Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4dff52f authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan
Browse files

net: qualcomm: rmnet: Remove reference to extack 



There is no existing definition of struct netlink_ext_ack for
ndo_add_slave, so remove this reference.

CRs-Fixed: 2156182
Change-Id: I42b86dc004b6b4aa0f4aed5a0ea18fe3afc82ac3
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent a4be7b95

drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c

+3 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -399,8 +399,7 @@ struct rmnet_endpoint *rmnet_get_endpoint(struct rmnet_port *port, u8 mux_id) 
}



int rmnet_add_bridge(struct net_device *rmnet_dev,

		     struct net_device *slave_dev,

		     struct netlink_ext_ack *extack)

		     struct net_device *slave_dev)

{

	struct rmnet_priv *priv = netdev_priv(rmnet_dev);

	struct net_device *real_dev = priv->real_dev;
@@ -422,8 +421,7 @@ int rmnet_add_bridge(struct net_device *rmnet_dev, 
	if (err)

		return -EBUSY;



	err = netdev_master_upper_dev_link(slave_dev, rmnet_dev, NULL, NULL,

					   extack);

	err = netdev_master_upper_dev_link(slave_dev, rmnet_dev, NULL, NULL);

	if (err)

		return -EINVAL;

drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 2016-2018 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -64,8 +64,7 @@ struct rmnet_priv { 
struct rmnet_port *rmnet_get_port(struct net_device *real_dev);

struct rmnet_endpoint *rmnet_get_endpoint(struct rmnet_port *port, u8 mux_id);

int rmnet_add_bridge(struct net_device *rmnet_dev,

		     struct net_device *slave_dev,

		     struct netlink_ext_ack *extack);

		     struct net_device *slave_dev);

int rmnet_del_bridge(struct net_device *rmnet_dev,

		     struct net_device *slave_dev);

#endif /* _RMNET_CONFIG_H_ */