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

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

Merge "net: rmnet_data: Skip UL aggregation for non linear packets"

parents a39dadaa c64a7803

net/rmnet_data/rmnet_data_handlers.c

+7 −3
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 
{

	int required_headroom, additional_header_length, ckresult;

	struct rmnet_map_header_s *map_header;

	int non_linear_skb;



	additional_header_length = 0;
@@ -565,9 +566,11 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 
		rmnet_stats_ul_checksum(ckresult);

	}



	non_linear_skb = (orig_dev->features & NETIF_F_GSO) &&

			 skb_is_nonlinear(skb);



	if ((!(config->egress_data_format &

	    RMNET_EGRESS_FORMAT_AGGREGATION)) ||

	    ((orig_dev->features & NETIF_F_GSO) && skb_is_nonlinear(skb)))

	    RMNET_EGRESS_FORMAT_AGGREGATION)) || non_linear_skb)

		map_header = rmnet_map_add_map_header

		(skb, additional_header_length, RMNET_MAP_NO_PAD_BYTES);

	else
@@ -589,7 +592,8 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 


	skb->protocol = htons(ETH_P_MAP);



	if (config->egress_data_format & RMNET_EGRESS_FORMAT_AGGREGATION) {

	if ((config->egress_data_format & RMNET_EGRESS_FORMAT_AGGREGATION) &&

	    !non_linear_skb) {

		rmnet_map_aggregate(skb, config);

		return RMNET_MAP_CONSUMED;

	}