patch 'net/af_packet: fix indentation' has been queued to stable release 24.11.7
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Thu Jun 11 15:19:28 CEST 2026
Hi,
FYI, your patch has been queued to stable release 24.11.7
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/13/26. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/898f8ef2dc7ea86338a2f4fd8cf2fa992ce91cb8
Thanks.
Luca Boccassi
---
>From 898f8ef2dc7ea86338a2f4fd8cf2fa992ce91cb8 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Wed, 29 Apr 2026 11:19:00 -0700
Subject: [PATCH] net/af_packet: fix indentation
[ upstream commit 3216387d58c86202c2adf22b6eefed9014ab4061 ]
DPDK code is supposed to be indented with TABS not spaces.
Also, used "unsigned int" to keep checkpatch happy.
Fixes: 364e08f2bbc0 ("af_packet: add PMD for AF_PACKET-based virtual devices")
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
drivers/net/af_packet/rte_eth_af_packet.c | 64 +++++++++++------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 6ea1c6c945..816d748305 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -75,7 +75,7 @@ struct __rte_cache_aligned pkt_tx_queue {
};
struct pmd_internals {
- unsigned nb_queues;
+ unsigned int nb_queues;
int if_index;
char *if_name;
@@ -500,7 +500,7 @@ eth_dev_close(struct rte_eth_dev *dev)
static int
eth_link_update(struct rte_eth_dev *dev,
- int wait_to_complete __rte_unused)
+ int wait_to_complete __rte_unused)
{
const struct pmd_internals *internals = dev->data->dev_private;
struct rte_eth_link *dev_link = &dev->data->dev_link;
@@ -520,11 +520,11 @@ eth_link_update(struct rte_eth_dev *dev,
static int
eth_rx_queue_setup(struct rte_eth_dev *dev,
- uint16_t rx_queue_id,
- uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
- const struct rte_eth_rxconf *rx_conf __rte_unused,
- struct rte_mempool *mb_pool)
+ uint16_t rx_queue_id,
+ uint16_t nb_rx_desc __rte_unused,
+ unsigned int socket_id __rte_unused,
+ const struct rte_eth_rxconf *rx_conf __rte_unused,
+ struct rte_mempool *mb_pool)
{
struct pmd_internals *internals = dev->data->dev_private;
struct pkt_rx_queue *pkt_q = &internals->rx_queue[rx_queue_id];
@@ -555,10 +555,10 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
static int
eth_tx_queue_setup(struct rte_eth_dev *dev,
- uint16_t tx_queue_id,
- uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
- const struct rte_eth_txconf *tx_conf __rte_unused)
+ uint16_t tx_queue_id,
+ uint16_t nb_tx_desc __rte_unused,
+ unsigned int socket_id __rte_unused,
+ const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct pmd_internals *internals = dev->data->dev_private;
@@ -685,8 +685,8 @@ static const struct eth_dev_ops ops = {
*/
static int
open_packet_iface(const char *key __rte_unused,
- const char *value __rte_unused,
- void *extra_args)
+ const char *value __rte_unused,
+ void *extra_args)
{
int *sockfd = extra_args;
@@ -702,16 +702,16 @@ open_packet_iface(const char *key __rte_unused,
static int
rte_pmd_init_internals(struct rte_vdev_device *dev,
- const int sockfd,
- const unsigned nb_queues,
- unsigned int blocksize,
- unsigned int blockcnt,
- unsigned int framesize,
- unsigned int framecnt,
+ const int sockfd,
+ const unsigned int nb_queues,
+ unsigned int blocksize,
+ unsigned int blockcnt,
+ unsigned int framesize,
+ unsigned int framecnt,
unsigned int qdisc_bypass,
- struct pmd_internals **internals,
- struct rte_eth_dev **eth_dev,
- struct rte_kvargs *kvlist)
+ struct pmd_internals **internals,
+ struct rte_eth_dev **eth_dev,
+ struct rte_kvargs *kvlist)
{
const char *name = rte_vdev_device_name(dev);
const unsigned int numa_node = dev->device.numa_node;
@@ -739,7 +739,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
if (pair == NULL) {
PMD_LOG(ERR,
"%s: no interface specified for AF_PACKET ethdev",
- name);
+ name);
return -1;
}
@@ -748,7 +748,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
name, numa_node);
*internals = rte_zmalloc_socket(name, sizeof(**internals),
- 0, numa_node);
+ 0, numa_node);
if (*internals == NULL)
return -1;
@@ -990,8 +990,8 @@ free_internals:
static int
rte_eth_from_packet(struct rte_vdev_device *dev,
- int const *sockfd,
- struct rte_kvargs *kvlist)
+ int const *sockfd,
+ struct rte_kvargs *kvlist)
{
const char *name = rte_vdev_device_name(dev);
struct pmd_internals *internals = NULL;
@@ -1021,7 +1021,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
if (qpairs < 1) {
PMD_LOG(ERR,
"%s: invalid qpairs value",
- name);
+ name);
return -1;
}
continue;
@@ -1031,7 +1031,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
if (!blocksize) {
PMD_LOG(ERR,
"%s: invalid blocksize value",
- name);
+ name);
return -1;
}
continue;
@@ -1041,7 +1041,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
if (!framesize) {
PMD_LOG(ERR,
"%s: invalid framesize value",
- name);
+ name);
return -1;
}
continue;
@@ -1051,7 +1051,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
if (!framecount) {
PMD_LOG(ERR,
"%s: invalid framecount value",
- name);
+ name);
return -1;
}
continue;
@@ -1071,7 +1071,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
if (framesize > blocksize) {
PMD_LOG(ERR,
"%s: AF_PACKET MMAP frame size exceeds block size!",
- name);
+ name);
return -1;
}
@@ -1140,7 +1140,7 @@ rte_pmd_af_packet_probe(struct rte_vdev_device *dev)
if (rte_kvargs_count(kvlist, ETH_AF_PACKET_IFACE_ARG) == 1) {
ret = rte_kvargs_process(kvlist, ETH_AF_PACKET_IFACE_ARG,
- &open_packet_iface, &sockfd);
+ &open_packet_iface, &sockfd);
if (ret < 0)
goto exit;
}
--
2.47.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-06-11 14:20:02.114383721 +0100
+++ 0019-net-af_packet-fix-indentation.patch 2026-06-11 14:20:01.182745205 +0100
@@ -1 +1 @@
-From 3216387d58c86202c2adf22b6eefed9014ab4061 Mon Sep 17 00:00:00 2001
+From 898f8ef2dc7ea86338a2f4fd8cf2fa992ce91cb8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3216387d58c86202c2adf22b6eefed9014ab4061 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 0ee94e71ea..8303ff5ca9 100644
+index 6ea1c6c945..816d748305 100644
@@ -21 +22 @@
-@@ -79,7 +79,7 @@ struct __rte_cache_aligned pkt_tx_queue {
+@@ -75,7 +75,7 @@ struct __rte_cache_aligned pkt_tx_queue {
@@ -30 +31 @@
-@@ -602,7 +602,7 @@ eth_dev_close(struct rte_eth_dev *dev)
+@@ -500,7 +500,7 @@ eth_dev_close(struct rte_eth_dev *dev)
@@ -39 +40 @@
-@@ -622,11 +622,11 @@ eth_link_update(struct rte_eth_dev *dev,
+@@ -520,11 +520,11 @@ eth_link_update(struct rte_eth_dev *dev,
@@ -56 +57 @@
-@@ -660,10 +660,10 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -555,10 +555,10 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
@@ -71 +72 @@
-@@ -790,8 +790,8 @@ static const struct eth_dev_ops ops = {
+@@ -685,8 +685,8 @@ static const struct eth_dev_ops ops = {
@@ -82 +83 @@
-@@ -854,17 +854,17 @@ get_fanout(const char *fanout_mode, int if_index)
+@@ -702,16 +702,16 @@ open_packet_iface(const char *key __rte_unused,
@@ -99 +99,0 @@
- const char *fanout_mode,
@@ -109 +109 @@
-@@ -890,7 +890,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -739,7 +739,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
@@ -118 +118 @@
-@@ -899,7 +899,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -748,7 +748,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
@@ -127 +127 @@
-@@ -1140,8 +1140,8 @@ free_internals:
+@@ -990,8 +990,8 @@ free_internals:
@@ -138 +138 @@
-@@ -1172,7 +1172,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
+@@ -1021,7 +1021,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
@@ -147 +147 @@
-@@ -1182,7 +1182,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
+@@ -1031,7 +1031,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
@@ -156 +156 @@
-@@ -1192,7 +1192,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
+@@ -1041,7 +1041,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
@@ -165 +165 @@
-@@ -1202,7 +1202,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
+@@ -1051,7 +1051,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
@@ -174 +174 @@
-@@ -1226,7 +1226,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
+@@ -1071,7 +1071,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
@@ -183 +183 @@
-@@ -1301,7 +1301,7 @@ rte_pmd_af_packet_probe(struct rte_vdev_device *dev)
+@@ -1140,7 +1140,7 @@ rte_pmd_af_packet_probe(struct rte_vdev_device *dev)
More information about the stable
mailing list