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

Commit 416dc16a 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: Change aggregation copy mode for compat"

parents 9d6f5b3d 313dca20

net/rmnet_data/rmnet_data_handlers.c

+2 −1
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ static rx_handler_result_t __rmnet_deliver_skb(struct sk_buff *skb, 


		case RX_HANDLER_PASS:

			skb->pkt_type = PACKET_HOST;

			return  RX_HANDLER_ANOTHER;

			netif_receive_skb(skb);

			return RX_HANDLER_CONSUMED;

		}

		return RX_HANDLER_PASS;

net/rmnet_data/rmnet_map_data.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct rmnet_map_header_s *rmnet_map_add_map_header(struct sk_buff *skb, 
 * @config:     Physical endpoint configuration of the ingress device

 *

 * Source skb is cloned with skb_clone(). The new skb data and tail pointers are

 * modified to contain a single MAP frame. Clone happens with GFP_KERNEL flags

 * modified to contain a single MAP frame. Clone happens with GFP_ATOMIC flags

 * set. User should keep calling deaggregate() on the source skb until 0 is

 * returned, indicating that there are no more packets to deaggregate.

 *
@@ -111,7 +111,7 @@ struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, 
		return 0;

	}



	skbn = skb_clone(skb, GFP_ATOMIC);

	skbn = skb_copy(skb, GFP_ATOMIC);

	if (!skbn)

		return 0;