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

Commit 89f1e77d 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 the print format for addresses"

parents 241c08df 6748519e

net/rmnet_data/rmnet_data_handlers.c

+4 −3
Original line number Diff line number Diff line
@@ -112,9 +112,10 @@ void rmnet_print_packet(const struct sk_buff *skb, const char *dev, char dir) 
	if (!printlen)

		return;



	pr_err("[%s][%c] - PKT skb->len=%d skb->head=%p skb->data=%p skb->tail=%p skb->end=%p\n",

		dev, dir, skb->len, (void *)skb->head, (void *)skb->data,

		skb_tail_pointer(skb), skb_end_pointer(skb));

	pr_err("[%s][%c] - PKT skb->len=%d skb->head=%pK skb->data=%pK\n",

	       dev, dir, skb->len, (void *)skb->head, (void *)skb->data);

	pr_err("[%s][%c] - PKT skb->tail=%pK skb->end=%pK\n",

	       dev, dir, skb_tail_pointer(skb), skb_end_pointer(skb));



	if (skb->len > 0)

		len = skb->len;

net/rmnet_data/rmnet_data_trace.h

+5 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ DECLARE_EVENT_CLASS(rmnet_handler_template, 
		__assign_str(name, skb->dev->name);

	),



	TP_printk("dev=%s skbaddr=%p len=%u",

	TP_printk("dev=%s skbaddr=%pK len=%u",

		  __get_str(name), __entry->skbaddr, __entry->len)

)
@@ -128,8 +128,9 @@ DECLARE_EVENT_CLASS(rmnet_aggregation_template, 
		__entry->num = num_agg_pakcets;

	),



	TP_printk("dev=%s skbaddr=%p len=%u agg_count: %d",

		__get_str(name), __entry->skbaddr, __entry->len, __entry->num)

	TP_printk("dev=%s skbaddr=%pK len=%u agg_count: %d",

		  __get_str(name), __entry->skbaddr, __entry->len,

		  __entry->num)

)



DEFINE_EVENT(rmnet_aggregation_template, rmnet_map_aggregate,

net/rmnet_data/rmnet_data_vnd.c

+3 −3
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ static int _rmnet_vnd_update_flow_map(uint8_t action, 
				itm->tc_flow_valid[i] = 1;

				itm->tc_flow_id[i] = tc_flow;

				rc = RMNET_VND_UPDATE_FLOW_OK;

				LOGD("{%p}->tc_flow_id[%d]=%08X",

				LOGD("{%pK}->tc_flow_id[%d]=%08X",

				     itm, i, tc_flow);

				break;

			}
@@ -841,7 +841,7 @@ static int _rmnet_vnd_update_flow_map(uint8_t action, 
					itm->tc_flow_valid[i] = 0;

					itm->tc_flow_id[i] = 0;

					j++;

					LOGD("{%p}->tc_flow_id[%d]=0", itm, i);

					LOGD("{%pK}->tc_flow_id[%d]=0", itm, i);

				}

			} else {

				j++;
@@ -985,7 +985,7 @@ int rmnet_vnd_del_tc_flow(uint32_t id, uint32_t map_flow, uint32_t tc_flow) 


	if (r ==  RMNET_VND_UPDATE_FLOW_NO_VALID_LEFT) {

		if (itm)

			LOGD("Removed flow mapping [%s][0x%08X]@%p",

			LOGD("Removed flow mapping [%s][0x%08X]@%pK",

			     dev->name, itm->map_flow_id, itm);

		kfree(itm);

	}