X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fnetmap_compat%2Flib%2Fcompat_netmap.h;h=76b2d2b4cf4fcf8aadce53d1b2149a40a88c5a55;hb=f8244c6399d9fae6afab6770ae367aef38742ea5;hp=0971443402866aee720e6633fcc7a0c1539c7eee;hpb=06371afe394d465e588392c045dd2be74b7cc2ac;p=dpdk.git diff --git a/examples/netmap_compat/lib/compat_netmap.h b/examples/netmap_compat/lib/compat_netmap.h index 0971443402..76b2d2b4cf 100644 --- a/examples/netmap_compat/lib/compat_netmap.h +++ b/examples/netmap_compat/lib/compat_netmap.h @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -56,8 +56,6 @@ struct rte_netmap_conf { struct rte_netmap_port_conf { struct rte_eth_conf *eth_conf; - struct rte_eth_txconf *tx_conf; - struct rte_eth_rxconf *rx_conf; struct rte_mempool *pool; int32_t socket_id; uint16_t nr_tx_rings; @@ -69,11 +67,11 @@ struct rte_netmap_port_conf { }; int rte_netmap_init(const struct rte_netmap_conf *conf); -int rte_netmap_init_port(uint8_t portid, +int rte_netmap_init_port(uint16_t portid, const struct rte_netmap_port_conf *conf); int rte_netmap_close(int fd); -int rte_netmap_ioctl(int fd, int op, void *param); +int rte_netmap_ioctl(int fd, uint32_t op, void *param); int rte_netmap_open(const char *pathname, int flags); int rte_netmap_poll(struct pollfd *fds, nfds_t nfds, int timeout); void *rte_netmap_mmap(void *addr, size_t length, int prot, int flags, int fd,