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

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

Merge "rmnet_data: skip padding count for non linear skbs"

parents 52d55680 9d1769d1

net/rmnet_data/rmnet_data_handlers.c

+5 −2
Original line number Diff line number Diff line
@@ -480,8 +480,11 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 
		rmnet_stats_ul_checksum(ckresult);

	}



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

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

	if (((config->egress_data_format &

	    RMNET_EGRESS_FORMAT_MAP_CKSUMV4) &&

	    (!(config->egress_data_format &

	    RMNET_EGRESS_FORMAT_AGGREGATION))) ||

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

		map_header = rmnet_map_add_map_header

		(skb, additional_header_length, RMNET_MAP_NO_PAD_BYTES);

	else

net/rmnet_data/rmnet_map_data.c

+1 −7
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2013-2016, 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
@@ -102,12 +102,6 @@ struct rmnet_map_header_s *rmnet_map_add_map_header(struct sk_buff *skb, 
	if (padding == 0)

		goto done;



	if ((skb->dev->features & NETIF_F_GSO) &&

	    skb_is_nonlinear(skb) && unlikely((padding != 0))) {

		LOGE("pad:%d required for non linear skb", padding);

		BUG();

	}



	if (skb_tailroom(skb) < padding)

		return 0;