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

Commit 079dc130 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: qualcomm: rmnet: Reuse port information when adding header"

parents 5b73bea2 ad821b63

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

+2 −1
Original line number Diff line number Diff line
@@ -395,7 +395,8 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 
	if (csum_type)

		rmnet_map_checksum_uplink_packet(skb, orig_dev, csum_type);



	map_header = rmnet_map_add_map_header(skb, additional_header_len, 0);

	map_header = rmnet_map_add_map_header(skb, additional_header_len, 0,

					      port);

	if (!map_header)

		return -ENOMEM;

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

+2 −1
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ static inline bool rmnet_map_get_csum_valid(struct sk_buff *skb) 
struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb,

				      struct rmnet_port *port);

struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb,

						  int hdrlen, int pad);

						  int hdrlen, int pad,

						  struct rmnet_port *port);

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

int rmnet_map_checksum_downlink_packet(struct sk_buff *skb, u16 len);

void rmnet_map_checksum_uplink_packet(struct sk_buff *skb,

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

+2 −2
Original line number Diff line number Diff line
@@ -279,10 +279,10 @@ rmnet_map_ipv6_ul_csum_header(void *ip6hdr, 
 * initialized to 0.

 */

struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb,

						  int hdrlen, int pad)

						  int hdrlen, int pad,

						  struct rmnet_port *port)

{

	struct rmnet_map_header *map_header;

	struct rmnet_port *port = rmnet_get_port(skb->dev);

	u32 padding, map_datalen;

	u8 *padbytes;