Skip to content

Commit c71ce19

Browse files
Tomasz Bursztykanashif
authored andcommitted
net/pkt: Rename net_pkt_pull_new to net_pkt_pull
Now that legacy net_pkt_pull function has been removed, the new function can be renamed accordingly. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
1 parent 09b782a commit c71ce19

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

include/net/net_pkt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,7 @@ size_t net_pkt_remaining_data(struct net_pkt *pkt);
23702370
/**
23712371
* @brief Update the overall length of a packet
23722372
*
2373-
* Note: Unlike net_pkt_pull_new() below, this does not take packet cursor
2373+
* Note: Unlike net_pkt_pull() below, this does not take packet cursor
23742374
* into account. It's mainly a helper dedicated for ipv4 and ipv6
23752375
* input functions. It shrinks the overall length by given parameter.
23762376
*
@@ -2392,7 +2392,7 @@ int net_pkt_update_length(struct net_pkt *pkt, size_t length);
23922392
*
23932393
* @return 0 on success, negative errno code otherwise.
23942394
*/
2395-
int net_pkt_pull_new(struct net_pkt *pkt, size_t length);
2395+
int net_pkt_pull(struct net_pkt *pkt, size_t length);
23962396

23972397
/**
23982398
* @brief Get the actual offset in the packet from its cursor

subsys/net/ip/ipv6_fragment.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static void reassemble_packet(struct net_ipv6_reassembly *reass)
267267
NET_DBG("Removing %d bytes from start of pkt %p",
268268
removed_len, pkt->buffer);
269269

270-
if (net_pkt_pull_new(pkt, removed_len)) {
270+
if (net_pkt_pull(pkt, removed_len)) {
271271
NET_ERR("Failed to pull headers");
272272
reassembly_cancel(reass->id, &reass->src, &reass->dst);
273273
return;
@@ -305,7 +305,7 @@ static void reassemble_packet(struct net_ipv6_reassembly *reass)
305305

306306
next_hdr = ipv6.frag_hdr->nexthdr;
307307

308-
if (net_pkt_pull_new(pkt, sizeof(struct net_ipv6_frag_hdr))) {
308+
if (net_pkt_pull(pkt, sizeof(struct net_ipv6_frag_hdr))) {
309309
NET_ERR("Failed to remove fragment header");
310310
goto error;
311311
}

subsys/net/ip/net_pkt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2621,7 +2621,7 @@ int net_pkt_update_length(struct net_pkt *pkt, size_t length)
26212621
return !length ? 0 : -EINVAL;
26222622
}
26232623

2624-
int net_pkt_pull_new(struct net_pkt *pkt, size_t length)
2624+
int net_pkt_pull(struct net_pkt *pkt, size_t length)
26252625
{
26262626
struct net_pkt_cursor *c_op = &pkt->cursor;
26272627
struct net_pkt_cursor backup;
@@ -2651,7 +2651,7 @@ int net_pkt_pull_new(struct net_pkt *pkt, size_t length)
26512651

26522652
/* For now, empty buffer are not freed, and there is no
26532653
* compaction done either.
2654-
* net_pkt_pull_new() is currently used only in very specific
2654+
* net_pkt_pull() is currently used only in very specific
26552655
* places where such memory optimization would not make
26562656
* that much sense. Let's see in future if it's worth do to it.
26572657
*/

0 commit comments

Comments
 (0)