Skip to content

Commit b752eff

Browse files
Subash Abhinov Kasiviswanathandavem330
authored andcommitted
net: qualcomm: rmnet: Implement ndo_get_iflink
This makes it easier to find out the parent dev. Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> Cc: Dan Williams <dcbw@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 032ee46 commit b752eff

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev,
174174
goto err0;
175175

176176
r = rmnet_get_real_dev_info_rtnl(real_dev);
177-
err = rmnet_vnd_newlink(mux_id, dev, r);
177+
err = rmnet_vnd_newlink(mux_id, dev, r, real_dev);
178178
if (err)
179179
goto err1;
180180

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ extern struct rtnl_link_ops rmnet_link_ops;
4747
struct rmnet_priv {
4848
struct rmnet_endpoint local_ep;
4949
u8 mux_id;
50+
struct net_device *real_dev;
5051
};
5152

5253
struct rmnet_real_dev_info*

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,17 @@ static int rmnet_vnd_change_mtu(struct net_device *rmnet_dev, int new_mtu)
6363
return 0;
6464
}
6565

66+
static int rmnet_vnd_get_iflink(const struct net_device *dev)
67+
{
68+
struct rmnet_priv *priv = netdev_priv(dev);
69+
70+
return priv->real_dev->ifindex;
71+
}
72+
6673
static const struct net_device_ops rmnet_vnd_ops = {
6774
.ndo_start_xmit = rmnet_vnd_start_xmit,
6875
.ndo_change_mtu = rmnet_vnd_change_mtu,
76+
.ndo_get_iflink = rmnet_vnd_get_iflink,
6977
};
7078

7179
/* Called by kernel whenever a new rmnet<n> device is created. Sets MTU,
@@ -91,7 +99,8 @@ void rmnet_vnd_setup(struct net_device *rmnet_dev)
9199
/* Exposed API */
92100

93101
int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,
94-
struct rmnet_real_dev_info *r)
102+
struct rmnet_real_dev_info *r,
103+
struct net_device *real_dev)
95104
{
96105
struct rmnet_priv *priv;
97106
int rc;
@@ -107,6 +116,7 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,
107116

108117
priv = netdev_priv(rmnet_dev);
109118
priv->mux_id = id;
119+
priv->real_dev = real_dev;
110120

111121
netdev_dbg(rmnet_dev, "rmnet dev created\n");
112122
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
int rmnet_vnd_do_flow_control(struct net_device *dev, int enable);
2020
struct rmnet_endpoint *rmnet_vnd_get_endpoint(struct net_device *dev);
2121
int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,
22-
struct rmnet_real_dev_info *r);
22+
struct rmnet_real_dev_info *r,
23+
struct net_device *real_dev);
2324
int rmnet_vnd_dellink(u8 id, struct rmnet_real_dev_info *r);
2425
void rmnet_vnd_rx_fixup(struct sk_buff *skb, struct net_device *dev);
2526
void rmnet_vnd_tx_fixup(struct sk_buff *skb, struct net_device *dev);

0 commit comments

Comments
 (0)