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

Commit 020c3455 authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan Committed by Gerrit - the friendly Code Review server
Browse files

net: qualcomm: rmnet: Remove padding from MAPv5 packets 



Remove the MAP padding from packets in checksum offload format.
Packets in coalescing format do not have padding.

CRs-Fixed: 2347014
Change-Id: Ie6c7994dd96695b6d553bc8b569fe7594e09d253
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent 2baec134

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

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ __rmnet_map_ingress_handler(struct sk_buff *skb, 
	if (qmap->next_hdr &&

	    (port->data_format & (RMNET_FLAGS_INGRESS_COALESCE |

				  RMNET_FLAGS_INGRESS_MAP_CKSUMV5))) {

		if (rmnet_map_process_next_hdr_packet(skb, &list))

		if (rmnet_map_process_next_hdr_packet(skb, &list, len))

			goto free_skb;

	} else {

		/* We only have the main QMAP header to worry about */

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

+2 −1
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, 
				      struct net_device *orig_dev,

				      int csum_type);

int rmnet_map_process_next_hdr_packet(struct sk_buff *skb,

				      struct sk_buff_head *list);

				      struct sk_buff_head *list,

				      u16 len);

int rmnet_map_tx_agg_skip(struct sk_buff *skb, int offset);

void rmnet_map_tx_aggregate(struct sk_buff *skb, struct rmnet_port *port);

void rmnet_map_tx_aggregate_init(struct rmnet_port *port);

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

+7 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,8 @@ static int rmnet_map_data_check_coal_header(struct sk_buff *skb, 


/* Process a QMAPv5 packet header */

int rmnet_map_process_next_hdr_packet(struct sk_buff *skb,

				      struct sk_buff_head *list)

				      struct sk_buff_head *list,

				      u16 len)

{

	struct rmnet_priv *priv = netdev_priv(skb->dev);

	u64 nlo_err_mask;
@@ -1027,6 +1028,11 @@ int rmnet_map_process_next_hdr_packet(struct sk_buff *skb, 
		pskb_pull(skb,

			  (sizeof(struct rmnet_map_header) +

			   sizeof(struct rmnet_map_v5_csum_header)));



		/* Remove padding only for csum offload packets.

		 * Coalesced packets should never have padding.

		 */

		pskb_trim(skb, len);

		__skb_queue_tail(list, skb);

		break;

	default: