| Message ID | 1460541752-2280-1-git-send-email-matias.elo@nokia.com |
|---|---|
| State | Accepted |
| Commit | fc68b7d7277dc1a7b0034fbdf349c7028577d9b0 |
| Headers | show |
api-next head in on d2fb999 and this change is not needed, can you please check that your branch updated? Maxim. On 04/13/16 13:02, Matias Elo wrote: > DPDK pktio build is broken due to a merge error. > Deprecated dpdk_recv() function was already removed in > 'linux-generic: dpdk: remove old recv/send functions' > commit. Fix problem by removing the deprecated code. > > Signed-off-by: Matias Elo <matias.elo@nokia.com> > --- > platform/linux-generic/pktio/dpdk.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c > index 5cbf22d..4aff57c 100644 > --- a/platform/linux-generic/pktio/dpdk.c > +++ b/platform/linux-generic/pktio/dpdk.c > @@ -824,13 +824,6 @@ static int dpdk_recv_queue(pktio_entry_t *pktio_entry, > return nb_rx; > } > > -static int dpdk_recv(pktio_entry_t *pktio_entry, > - odp_packet_t pkt_table[], > - unsigned num) > -{ > - return dpdk_recv_queue(pktio_entry, 0, pkt_table, num); > -} > - > static int dpdk_send_queue(pktio_entry_t *pktio_entry, > int index, > odp_packet_t pkt_table[],
Merged, something wrong was with my local git branch, please skip previous message. Maxim. On 04/13/16 13:02, Matias Elo wrote: > DPDK pktio build is broken due to a merge error. > Deprecated dpdk_recv() function was already removed in > 'linux-generic: dpdk: remove old recv/send functions' > commit. Fix problem by removing the deprecated code. > > Signed-off-by: Matias Elo <matias.elo@nokia.com> > --- > platform/linux-generic/pktio/dpdk.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c > index 5cbf22d..4aff57c 100644 > --- a/platform/linux-generic/pktio/dpdk.c > +++ b/platform/linux-generic/pktio/dpdk.c > @@ -824,13 +824,6 @@ static int dpdk_recv_queue(pktio_entry_t *pktio_entry, > return nb_rx; > } > > -static int dpdk_recv(pktio_entry_t *pktio_entry, > - odp_packet_t pkt_table[], > - unsigned num) > -{ > - return dpdk_recv_queue(pktio_entry, 0, pkt_table, num); > -} > - > static int dpdk_send_queue(pktio_entry_t *pktio_entry, > int index, > odp_packet_t pkt_table[],
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 5cbf22d..4aff57c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -824,13 +824,6 @@ static int dpdk_recv_queue(pktio_entry_t *pktio_entry, return nb_rx; } -static int dpdk_recv(pktio_entry_t *pktio_entry, - odp_packet_t pkt_table[], - unsigned num) -{ - return dpdk_recv_queue(pktio_entry, 0, pkt_table, num); -} - static int dpdk_send_queue(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[],
DPDK pktio build is broken due to a merge error. Deprecated dpdk_recv() function was already removed in 'linux-generic: dpdk: remove old recv/send functions' commit. Fix problem by removing the deprecated code. Signed-off-by: Matias Elo <matias.elo@nokia.com> --- platform/linux-generic/pktio/dpdk.c | 7 ------- 1 file changed, 7 deletions(-)