Hi Bruce,
On 08/11/2014 10:44 PM, Bruce Richardson wrote:
> From: Olivier Matz <olivier.matz at 6wind.com>
>
> The initial role of rte_ctrlmbuf is to carry generic messages (data
> pointer + data length) but it's not used by the DPDK or it applications.
> Keeping it implies:
> - loosing 1 byte in the rte_mbuf structure
> - having some dead code rte_mbuf.[ch]
>
> This patch removes this feature. Thanks to it, it is now possible to
> simplify the rte_mbuf structure by merging the rte_pktmbuf structure
> in it. This is done in next commit.
>
> Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
>
> Conflicts:
> lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
>
> Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Same here, "git grep ctrlmbuf" finds results in
examples/ip_pipeline/cmdline.c and examples/ip_pipeline/init.c
You can also see it by doing
"make examples T=x86_64-native-linuxapp-gcc" from dpdk root.
> @@ -204,14 +182,10 @@ struct rte_mbuf {
> #else
> uint16_t refcnt_reserved; /**< Do not use this field */
> #endif
> - uint8_t type; /**< Type of mbuf. */
> - uint8_t reserved; /**< Unused field. Required for padding.
> */
> + uint16_t reserved; /**< Unused field. Required for padding.
> */
This line breaks the alignment of comments (this typo was already
present in my initial patch). By the way, there was also a patch
called "mbuf: cosmetic changes in rte_mbuf structure" to restore
the comments alignment for all the fields of the structure. Maybe
it should be integrated in your series.
Regards,
Olivier
