Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b52f08fb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I229810c1,I25794baa,If037985c into msm-4.14 

* changes:
  net: qualcomm: rmnet: Export mux_id and flags to netlink
  net: qualcomm: rmnet: Remove unnecessary device assignment
  net: qualcomm: rmnet: Fix casting issues
parents 5f82defd 89df99e3

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

+25 −16
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ 


/* Local Definitions and Declarations */



static const struct nla_policy rmnet_policy[IFLA_RMNET_MAX + 1] = {

	[IFLA_RMNET_MUX_ID]	= { .type = NLA_U16 },

	[IFLA_RMNET_FLAGS]	= { .len = sizeof(struct ifla_rmnet_flags) },

};



static int rmnet_is_real_dev_registered(const struct net_device *real_dev)

{

	return rcu_access_pointer(real_dev->rx_handler) == rmnet_rx_handler;
@@ -131,7 +136,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, 
			 struct nlattr *tb[], struct nlattr *data[],

			 struct netlink_ext_ack *extack)

{

	u32 data_format = RMNET_INGRESS_FORMAT_DEAGGREGATION;

	u32 data_format = RMNET_FLAGS_INGRESS_DEAGGREGATION;

	struct net_device *real_dev;

	int mode = RMNET_EPMODE_VND;

	struct rmnet_endpoint *ep;
@@ -143,14 +148,14 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, 
	if (!real_dev || !dev)

		return -ENODEV;



	if (!data[IFLA_VLAN_ID])

	if (!data[IFLA_RMNET_MUX_ID])

		return -EINVAL;



	ep = kzalloc(sizeof(*ep), GFP_ATOMIC);

	if (!ep)

		return -ENOMEM;



	mux_id = nla_get_u16(data[IFLA_VLAN_ID]);

	mux_id = nla_get_u16(data[IFLA_RMNET_MUX_ID]);



	err = rmnet_register_real_device(real_dev);

	if (err)
@@ -165,10 +170,10 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, 


	hlist_add_head_rcu(&ep->hlnode, &port->muxed_ep[mux_id]);



	if (data[IFLA_VLAN_FLAGS]) {

		struct ifla_vlan_flags *flags;

	if (data[IFLA_RMNET_FLAGS]) {

		struct ifla_rmnet_flags *flags;



		flags = nla_data(data[IFLA_VLAN_FLAGS]);

		flags = nla_data(data[IFLA_RMNET_FLAGS]);

		data_format = flags->flags & flags->mask;

	}
@@ -276,10 +281,10 @@ static int rmnet_rtnl_validate(struct nlattr *tb[], struct nlattr *data[], 
{

	u16 mux_id;



	if (!data || !data[IFLA_VLAN_ID])

	if (!data || !data[IFLA_RMNET_MUX_ID])

		return -EINVAL;



	mux_id = nla_get_u16(data[IFLA_VLAN_ID]);

	mux_id = nla_get_u16(data[IFLA_RMNET_MUX_ID]);

	if (mux_id > (RMNET_MAX_LOGICAL_EP - 1))

		return -ERANGE;
@@ -304,8 +309,8 @@ static int rmnet_changelink(struct net_device *dev, struct nlattr *tb[], 


	port = rmnet_get_port_rtnl(real_dev);



	if (data[IFLA_VLAN_ID]) {

		mux_id = nla_get_u16(data[IFLA_VLAN_ID]);

	if (data[IFLA_RMNET_MUX_ID]) {

		mux_id = nla_get_u16(data[IFLA_RMNET_MUX_ID]);

		ep = rmnet_get_endpoint(port, priv->mux_id);



		hlist_del_init_rcu(&ep->hlnode);
@@ -315,10 +320,10 @@ static int rmnet_changelink(struct net_device *dev, struct nlattr *tb[], 
		priv->mux_id = mux_id;

	}



	if (data[IFLA_VLAN_FLAGS]) {

		struct ifla_vlan_flags *flags;

	if (data[IFLA_RMNET_FLAGS]) {

		struct ifla_rmnet_flags *flags;



		flags = nla_data(data[IFLA_VLAN_FLAGS]);

		flags = nla_data(data[IFLA_RMNET_FLAGS]);

		port->data_format = flags->flags & flags->mask;

	}
@@ -327,13 +332,16 @@ static int rmnet_changelink(struct net_device *dev, struct nlattr *tb[], 


static size_t rmnet_get_size(const struct net_device *dev)

{

	return nla_total_size(2) /* IFLA_VLAN_ID */ +

	  nla_total_size(sizeof(struct ifla_vlan_flags)); /* IFLA_VLAN_FLAGS */

	return

		/* IFLA_RMNET_MUX_ID */

		nla_total_size(2) +

		/* IFLA_RMNET_FLAGS */

		nla_total_size(sizeof(struct ifla_rmnet_flags));

}



struct rtnl_link_ops rmnet_link_ops __read_mostly = {

	.kind		= "rmnet",

	.maxtype	= __IFLA_VLAN_MAX,

	.maxtype	= __IFLA_RMNET_MAX,

	.priv_size	= sizeof(struct rmnet_priv),

	.setup		= rmnet_vnd_setup,

	.validate	= rmnet_rtnl_validate,
@@ -341,6 +349,7 @@ struct rtnl_link_ops rmnet_link_ops __read_mostly = { 
	.dellink	= rmnet_dellink,

	.get_size	= rmnet_get_size,

	.changelink     = rmnet_changelink,

	.policy		= rmnet_policy,

};



/* Needs either rcu_read_lock() or rtnl lock */

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

+6 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -92,7 +92,7 @@ __rmnet_map_ingress_handler(struct sk_buff *skb, 
	u8 mux_id;



	if (RMNET_MAP_GET_CD_BIT(skb)) {

		if (port->data_format & RMNET_INGRESS_FORMAT_MAP_COMMANDS)

		if (port->data_format & RMNET_FLAGS_INGRESS_MAP_COMMANDS)

			return rmnet_map_command(skb, port);



		goto free_skb;
@@ -115,7 +115,7 @@ __rmnet_map_ingress_handler(struct sk_buff *skb, 
	skb_pull(skb, sizeof(struct rmnet_map_header));

	rmnet_set_skb_proto(skb);



	if (port->data_format & RMNET_INGRESS_FORMAT_MAP_CKSUMV4) {

	if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4) {

		if (!rmnet_map_checksum_downlink_packet(skb, len + pad))

			skb->ip_summed = CHECKSUM_UNNECESSARY;

	}
@@ -143,7 +143,7 @@ rmnet_map_ingress_handler(struct sk_buff *skb, 
		skb_push(skb, ETH_HLEN);

	}



	if (port->data_format & RMNET_INGRESS_FORMAT_DEAGGREGATION) {

	if (port->data_format & RMNET_FLAGS_INGRESS_DEAGGREGATION) {

		while ((skbn = rmnet_map_deaggregate(skb, port)) != NULL)

			__rmnet_map_ingress_handler(skbn, port);
@@ -163,7 +163,7 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 
	additional_header_len = 0;

	required_headroom = sizeof(struct rmnet_map_header);



	if (port->data_format & RMNET_EGRESS_FORMAT_MAP_CKSUMV4) {

	if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) {

		additional_header_len = sizeof(struct rmnet_map_ul_csum_header);

		required_headroom += additional_header_len;

	}
@@ -173,7 +173,7 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 
			goto fail;

	}



	if (port->data_format & RMNET_EGRESS_FORMAT_MAP_CKSUMV4)

	if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4)

		rmnet_map_checksum_uplink_packet(skb, orig_dev);



	map_header = rmnet_map_add_map_header(skb, additional_header_len, 0);

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

+4 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -23,8 +23,8 @@ struct rmnet_map_control_command { 
		struct {

			u16 ip_family:2;

			u16 reserved:14;

			u16 flow_control_seq_num;

			u32 qos_id;

			__be16 flow_control_seq_num;

			__be32 qos_id;

		} flow_control;

		u8 data[0];

	};
@@ -44,7 +44,7 @@ struct rmnet_map_header { 
	u8  reserved_bit:1;

	u8  cd_bit:1;

	u8  mux_id;

	u16 pkt_len;

	__be16 pkt_len;

}  __aligned(1);



struct rmnet_map_dl_csum_trailer {

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void rmnet_map_send_ack(struct sk_buff *skb, 
	struct rmnet_map_control_command *cmd;

	int xmit_status;



	if (port->data_format & RMNET_INGRESS_FORMAT_MAP_CKSUMV4) {

	if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4) {

		if (skb->len < sizeof(struct rmnet_map_header) +

		    RMNET_MAP_GET_LENGTH(skb) +

		    sizeof(struct rmnet_map_dl_csum_trailer)) {

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

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -309,7 +309,7 @@ struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, 
	maph = (struct rmnet_map_header *)skb->data;

	packet_len = ntohs(maph->pkt_len) + sizeof(struct rmnet_map_header);



	if (port->data_format & RMNET_INGRESS_FORMAT_MAP_CKSUMV4)

	if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4)

		packet_len += sizeof(struct rmnet_map_dl_csum_trailer);



	if (((int)skb->len - (int)packet_len) < 0)
@@ -323,7 +323,6 @@ struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, 
	if (!skbn)

		return NULL;



	skbn->dev = skb->dev;

	skb_reserve(skbn, RMNET_MAP_DEAGGR_HEADROOM);

	skb_put(skbn, packet_len);

	memcpy(skbn->data, skb->data, packet_len);