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

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

Merge "net: qualcomm: rmnet: Allow only one rmnet dev per muxid per real dev"

parents cf682bf5 e251202f

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

+2 −8
Original line number Diff line number Diff line
@@ -143,11 +143,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, 
			 struct nlattr *tb[], struct nlattr *data[],

			 struct netlink_ext_ack *extack)

{

	int ingress_format = RMNET_INGRESS_FORMAT_DEMUXING |

			     RMNET_INGRESS_FORMAT_DEAGGREGATION |

			     RMNET_INGRESS_FORMAT_MAP;

	int egress_format = RMNET_EGRESS_FORMAT_MUXING |

			    RMNET_EGRESS_FORMAT_MAP;

	int ingress_format = RMNET_INGRESS_FORMAT_DEAGGREGATION;

	struct net_device *real_dev;

	int mode = RMNET_EPMODE_VND;

	struct rmnet_endpoint *ep;
@@ -181,9 +177,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, 
	if (err)

		goto err2;



	netdev_dbg(dev, "data format [ingress 0x%08X] [egress 0x%08X]\n",

		   ingress_format, egress_format);

	port->egress_data_format = egress_format;

	netdev_dbg(dev, "data format [ingress 0x%08X]\n", ingress_format);

	port->ingress_data_format = ingress_format;

	port->rmnet_mode = mode;

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

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct rmnet_endpoint { 
struct rmnet_port {

	struct net_device *dev;

	u32 ingress_data_format;

	u32 egress_data_format;

	u8 nr_rmnet_devs;

	u8 rmnet_mode;

	struct hlist_head muxed_ep[RMNET_MAX_LOGICAL_EP];

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

+9 −23
Original line number Diff line number Diff line
@@ -133,20 +133,18 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 
	if (!map_header)

		goto fail;



	if (port->egress_data_format & RMNET_EGRESS_FORMAT_MUXING) {

	if (mux_id == 0xff)

		map_header->mux_id = 0;

	else

		map_header->mux_id = mux_id;

	}



	skb->protocol = htons(ETH_P_MAP);



	return RMNET_MAP_SUCCESS;

	return 0;



fail:

	kfree_skb(skb);

	return RMNET_MAP_CONSUMED;

	return -ENOMEM;

}



static void
@@ -178,7 +176,6 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb) 


	switch (port->rmnet_mode) {

	case RMNET_EPMODE_VND:

		if (port->ingress_data_format & RMNET_INGRESS_FORMAT_MAP)

		rmnet_map_ingress_handler(skb, port);

		break;

	case RMNET_EPMODE_BRIDGE:
@@ -212,20 +209,9 @@ void rmnet_egress_handler(struct sk_buff *skb) 
		return;

	}



	if (port->egress_data_format & RMNET_EGRESS_FORMAT_MAP) {

		switch (rmnet_map_egress_handler(skb, port, mux_id, orig_dev)) {

		case RMNET_MAP_CONSUMED:

	if (rmnet_map_egress_handler(skb, port, mux_id, orig_dev))

		return;



		case RMNET_MAP_SUCCESS:

			break;



		default:

			kfree_skb(skb);

			return;

		}

	}



	rmnet_vnd_tx_fixup(skb, orig_dev);



	dev_queue_xmit(skb);

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

+0 −9
Original line number Diff line number Diff line
@@ -30,15 +30,6 @@ struct rmnet_map_control_command { 
	};

}  __aligned(1);



enum rmnet_map_results {

	RMNET_MAP_SUCCESS,

	RMNET_MAP_CONSUMED,

	RMNET_MAP_GENERAL_FAILURE,

	RMNET_MAP_NOT_ENABLED,

	RMNET_MAP_FAILED_AGGREGATION,

	RMNET_MAP_FAILED_MUX

};



enum rmnet_map_commands {

	RMNET_MAP_COMMAND_NONE,

	RMNET_MAP_COMMAND_FLOW_DISABLE,

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

+2 −8
Original line number Diff line number Diff line
@@ -19,14 +19,8 @@ 
#define RMNET_TX_QUEUE_LEN         1000



/* Constants */

#define RMNET_EGRESS_FORMAT_MAP                 BIT(1)

#define RMNET_EGRESS_FORMAT_AGGREGATION         BIT(2)

#define RMNET_EGRESS_FORMAT_MUXING              BIT(3)



#define RMNET_INGRESS_FORMAT_MAP                BIT(1)

#define RMNET_INGRESS_FORMAT_DEAGGREGATION      BIT(2)

#define RMNET_INGRESS_FORMAT_DEMUXING           BIT(3)

#define RMNET_INGRESS_FORMAT_MAP_COMMANDS       BIT(4)

#define RMNET_INGRESS_FORMAT_DEAGGREGATION      BIT(0)

#define RMNET_INGRESS_FORMAT_MAP_COMMANDS       BIT(1)



/* Replace skb->dev to a virtual rmnet device and pass up the stack */

#define RMNET_EPMODE_VND (1)