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: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
index c5f5c6d..123ccf4 100644 (file)
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
@@ -33,7 +33,6 @@ struct rmnet_port {
        struct rmnet_endpoint muxed_ep[RMNET_MAX_LOGICAL_EP];
        u32 ingress_data_format;
        u32 egress_data_format;
-       struct net_device *rmnet_devices[RMNET_MAX_LOGICAL_EP];
        u8 nr_rmnet_devs;
        u8 rmnet_mode;
 };

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
index 4ca59a4..8b8497b 100644 (file)
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
@@ -105,12 +105,12 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,
        struct rmnet_priv *priv;
        int rc;
 
-       if (port->rmnet_devices[id])
+       if (port->muxed_ep[id].egress_dev)
                return -EINVAL;
 
        rc = register_netdevice(rmnet_dev);
        if (!rc) {
-               port->rmnet_devices[id] = rmnet_dev;
+               port->muxed_ep[id].egress_dev = rmnet_dev;
                port->nr_rmnet_devs++;
 
                rmnet_dev->rtnl_link_ops = &rmnet_link_ops;
@@ -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)
 {
-       if (id >= RMNET_MAX_LOGICAL_EP || !port->rmnet_devices[id])
+       if (id >= RMNET_MAX_LOGICAL_EP || !port->muxed_ep[id].egress_dev)
                return -EINVAL;
 
-       port->rmnet_devices[id] = NULL;
+       port->muxed_ep[id].egress_dev = NULL;
        port->nr_rmnet_devs--;
        return 0;
 }