| Message ID | 1512853110-4893-6-git-send-email-subashab@codeaurora.org |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next,v2,1/6] net: qualcomm: rmnet: Remove the rmnet_map_results enum | expand |
From: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> Date: Sat, 9 Dec 2017 13:58:29 -0700 > @@ -312,7 +321,8 @@ static int rmnet_rtnl_validate(struct nlattr *tb[], struct nlattr *data[], > > static size_t rmnet_get_size(const struct net_device *dev) > { > - return nla_total_size(2); /* IFLA_VLAN_ID */ > + return nla_total_size(2) /* IFLA_VLAN_ID */ + > + nla_total_size(sizeof(struct ifla_vlan_flags)); /* IFLA_VLAN_FLAGS */ > } > Please indent this return statement properly, the second line of the expression definitely should not start at the same column as the 'return'. Thank you.
On Sat, 2017-12-09 at 13:58 -0700, Subash Abhinov Kasiviswanathan wrote: > Add an option to configure the rmnet aggregation and command features > on device creation. This is achieved by using the vlan flags option. Still seems kinda odd to overload IFLA_VLAN_FLAGS to carry RMNET_INGRESS/EGRESS_FORMAT_* flags, but I'll leave that decision to others... Dan > Signed-off-by: Subash Abhinov Kasiviswanathan > <subashab@codeaurora.org> > --- > drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 16 > +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c > b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c > index 5e530db..2f5f661 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c > @@ -177,11 +177,20 @@ static int rmnet_newlink(struct net *src_net, > struct net_device *dev, > if (err) > goto err2; > > - netdev_dbg(dev, "data format [ingress 0x%08X]\n", > ingress_format); > - port->ingress_data_format = ingress_format; > port->rmnet_mode = mode; > > hlist_add_head_rcu(&ep->hlnode, &port->muxed_ep[mux_id]); > + > + if (data[IFLA_VLAN_FLAGS]) { > + struct ifla_vlan_flags *flags; > + > + flags = nla_data(data[IFLA_VLAN_FLAGS]); > + ingress_format = flags->flags & flags->mask; > + } > + > + netdev_dbg(dev, "data format [ingress 0x%08X]\n", > ingress_format); > + port->ingress_data_format = ingress_format; > + > return 0; > > err2: > @@ -312,7 +321,8 @@ static int rmnet_rtnl_validate(struct nlattr > *tb[], struct nlattr *data[], > > static size_t rmnet_get_size(const struct net_device *dev) > { > - return nla_total_size(2); /* IFLA_VLAN_ID */ > + return nla_total_size(2) /* IFLA_VLAN_ID */ + > + nla_total_size(sizeof(struct ifla_vlan_flags)); /* > IFLA_VLAN_FLAGS */ > } > > struct rtnl_link_ops rmnet_link_ops __read_mostly = {
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c index 5e530db..2f5f661 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c @@ -177,11 +177,20 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, if (err) goto err2; - netdev_dbg(dev, "data format [ingress 0x%08X]\n", ingress_format); - port->ingress_data_format = ingress_format; port->rmnet_mode = mode; hlist_add_head_rcu(&ep->hlnode, &port->muxed_ep[mux_id]); + + if (data[IFLA_VLAN_FLAGS]) { + struct ifla_vlan_flags *flags; + + flags = nla_data(data[IFLA_VLAN_FLAGS]); + ingress_format = flags->flags & flags->mask; + } + + netdev_dbg(dev, "data format [ingress 0x%08X]\n", ingress_format); + port->ingress_data_format = ingress_format; + return 0; err2: @@ -312,7 +321,8 @@ static int rmnet_rtnl_validate(struct nlattr *tb[], struct nlattr *data[], static size_t rmnet_get_size(const struct net_device *dev) { - return nla_total_size(2); /* IFLA_VLAN_ID */ + return nla_total_size(2) /* IFLA_VLAN_ID */ + + nla_total_size(sizeof(struct ifla_vlan_flags)); /* IFLA_VLAN_FLAGS */ } struct rtnl_link_ops rmnet_link_ops __read_mostly = {
Add an option to configure the rmnet aggregation and command features on device creation. This is achieved by using the vlan flags option. Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> --- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)