diff options
| author | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2017-10-11 18:43:55 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-11 20:05:30 -0700 |
| commit | 56470c927f1ba1e101b5e5a93e02d23a14fd99b7 (patch) | |
| tree | a785e8661de80219984ff90eeb8ccf669bfbc526 /drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | |
| parent | 9148963201a4627a632d2c769805c9278f6d22d7 (diff) | |
| download | linux-56470c927f1ba1e101b5e5a93e02d23a14fd99b7.tar.bz2 | |
net: qualcomm: rmnet: Remove duplicate setting of rmnet private info
The end point is set twice in the local_ep as well as the mux_id and
the real_dev in the rmnet private structure. Remove the local_ep.
While these elements are equivalent, rmnet_endpoint will be
used only as part of the rmnet_port for muxed scenarios in VND mode.
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c index 85fce9c4d234..96058bbccf71 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c @@ -67,13 +67,8 @@ rmnet_get_endpoint(struct net_device *dev, int config_id) struct rmnet_endpoint *ep; struct rmnet_port *port; - if (!rmnet_is_real_dev_registered(dev)) { - ep = rmnet_vnd_get_endpoint(dev); - } else { - port = rmnet_get_port_rtnl(dev); - - ep = &port->muxed_ep[config_id]; - } + port = rmnet_get_port_rtnl(dev); + ep = &port->muxed_ep[config_id]; return ep; } @@ -183,7 +178,6 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, port->rmnet_mode = mode; rmnet_set_endpoint_config(real_dev, mux_id, dev); - rmnet_set_endpoint_config(dev, mux_id, real_dev); return 0; err2: |