Commit 5451237f authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan Committed by David S. Miller

net: qualcomm: rmnet: Remove duplicate setting of rmnet_devices

The rmnet_devices information is already stored in muxed_ep, so
storing this in rmnet_devices[] again is redundant.
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56470c92
...@@ -33,7 +33,6 @@ struct rmnet_port { ...@@ -33,7 +33,6 @@ struct rmnet_port {
struct rmnet_endpoint muxed_ep[RMNET_MAX_LOGICAL_EP]; struct rmnet_endpoint muxed_ep[RMNET_MAX_LOGICAL_EP];
u32 ingress_data_format; u32 ingress_data_format;
u32 egress_data_format; u32 egress_data_format;
struct net_device *rmnet_devices[RMNET_MAX_LOGICAL_EP];
u8 nr_rmnet_devs; u8 nr_rmnet_devs;
u8 rmnet_mode; u8 rmnet_mode;
}; };
......
...@@ -105,12 +105,12 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev, ...@@ -105,12 +105,12 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,
struct rmnet_priv *priv; struct rmnet_priv *priv;
int rc; int rc;
if (port->rmnet_devices[id]) if (port->muxed_ep[id].egress_dev)
return -EINVAL; return -EINVAL;
rc = register_netdevice(rmnet_dev); rc = register_netdevice(rmnet_dev);
if (!rc) { if (!rc) {
port->rmnet_devices[id] = rmnet_dev; port->muxed_ep[id].egress_dev = rmnet_dev;
port->nr_rmnet_devs++; port->nr_rmnet_devs++;
rmnet_dev->rtnl_link_ops = &rmnet_link_ops; rmnet_dev->rtnl_link_ops = &rmnet_link_ops;
...@@ -127,10 +127,10 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev, ...@@ -127,10 +127,10 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,
int rmnet_vnd_dellink(u8 id, struct rmnet_port *port) int rmnet_vnd_dellink(u8 id, struct rmnet_port *port)
{ {
if (id >= RMNET_MAX_LOGICAL_EP || !port->rmnet_devices[id]) if (id >= RMNET_MAX_LOGICAL_EP || !port->muxed_ep[id].egress_dev)
return -EINVAL; return -EINVAL;
port->rmnet_devices[id] = NULL; port->muxed_ep[id].egress_dev = NULL;
port->nr_rmnet_devs--; port->nr_rmnet_devs--;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment