summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorqctecmdr <qctecmdr@localhost>2019-11-22 06:09:33 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-11-22 06:09:32 -0800
commit23d408837e7445cd3e4b01e72a021506f12128a7 (patch)
treedb5038f8a244b1ccc75b78ee1f392993eb3eb07f /drivers
parent54d5de5363df0a870494f47c631ecb46b63f51a4 (diff)
parent6f253f11dd58a548100890b1583ce3919cf442a9 (diff)
downloaddata-kernel-23d408837e7445cd3e4b01e72a021506f12128a7.tar.gz
Merge "drivers: rmnet_perf: Check for over pulling"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rmnet/perf/rmnet_perf_opt.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/rmnet/perf/rmnet_perf_opt.c b/drivers/rmnet/perf/rmnet_perf_opt.c
index b411483..d6b21f7 100644
--- a/drivers/rmnet/perf/rmnet_perf_opt.c
+++ b/drivers/rmnet/perf/rmnet_perf_opt.c
@@ -318,10 +318,12 @@ rmnet_perf_opt_add_flow_subfrags(struct rmnet_perf_opt_flow_node *flow_node)
new_frag = pkt_list[i].frag_desc;
/* Pull headers if they're there */
- if (new_frag->hdr_ptr == rmnet_frag_data_ptr(new_frag))
- rmnet_frag_pull(new_frag, perf->rmnet_port,
- flow_node->ip_len +
- flow_node->trans_len);
+ if (new_frag->hdr_ptr == rmnet_frag_data_ptr(new_frag)) {
+ if (!rmnet_frag_pull(new_frag, perf->rmnet_port,
+ flow_node->ip_len +
+ flow_node->trans_len))
+ continue;
+ }
/* Move the fragment onto the subfrags list */
list_move_tail(&new_frag->list, &head_frag->sub_frags);