|
41 | 41 | #include <etherfabric/memreg.h> |
42 | 42 | #include <etherfabric/capabilities.h> |
43 | 43 | #include <etherfabric/checksum.h> |
44 | | -#include <ci/net/ethernet.h> |
45 | 44 | #include <onload/extensions.h> |
46 | 45 | #include "utils.h" |
47 | 46 |
|
|
51 | 50 | #include <net/if.h> |
52 | 51 | #include <sys/types.h> |
53 | 52 | #include <sys/socket.h> |
| 53 | +#include <linux/if_ether.h> |
54 | 54 | #include <netinet/in.h> |
55 | 55 | #include <netinet/tcp.h> |
56 | 56 | #include <ifaddrs.h> |
|
62 | 62 | #define N_TX_BUFS 1u |
63 | 63 | #define FIRST_TX_BUF 0u |
64 | 64 | #define PKT_BUF_SIZE 2048 |
| 65 | +#define PAGE_SIZE 4096 |
65 | 66 |
|
66 | 67 | static bool cfg_delegated; |
67 | 68 | static int cfg_rx_size = 300; |
@@ -221,7 +222,7 @@ static void delegated_prepare(struct client_state* s) |
221 | 222 | onload_delegated_send_tcp_update(&(s->ods), s->msg_len, 1); |
222 | 223 | if( s->use_ctpio ) { |
223 | 224 | /* for CPTIO we need to fill in the IP and TCP checksums */ |
224 | | - struct ci_ether_hdr* eth = ((void*) s->ods.headers); |
| 225 | + struct ethhdr* eth = ((void*) s->ods.headers); |
225 | 226 | struct iphdr* ip4 = (void*) ((char*) eth + ETH_HLEN); |
226 | 227 | struct tcphdr* tcp = (void*) (ip4 + 1); |
227 | 228 |
|
@@ -387,7 +388,7 @@ static void ef_vi_init(struct client_state* cs) |
387 | 388 |
|
388 | 389 | int bytes = N_TX_BUFS * PKT_BUF_SIZE; |
389 | 390 | void* p; |
390 | | - TEST( posix_memalign(&p, CI_PAGE_SIZE, bytes) == 0 ); |
| 391 | + TEST( posix_memalign(&p, PAGE_SIZE, bytes) == 0 ); |
391 | 392 | TRY( ef_memreg_alloc(&cs->memreg, cs->dh, |
392 | 393 | &cs->pd, cs->dh, p, bytes) ); |
393 | 394 | int i; |
|
0 commit comments