| .. | .. |
|---|
| 23 | 23 | #include <net/xfrm.h> |
|---|
| 24 | 24 | #endif /* CONFIG_XFRM */ |
|---|
| 25 | 25 | |
|---|
| 26 | | -#include <asm/octeon/octeon.h> |
|---|
| 27 | | - |
|---|
| 26 | +#include "octeon-ethernet.h" |
|---|
| 28 | 27 | #include "ethernet-defines.h" |
|---|
| 29 | 28 | #include "ethernet-mem.h" |
|---|
| 30 | 29 | #include "ethernet-rx.h" |
|---|
| 31 | | -#include "octeon-ethernet.h" |
|---|
| 32 | 30 | #include "ethernet-util.h" |
|---|
| 33 | | - |
|---|
| 34 | | -#include <asm/octeon/cvmx-helper.h> |
|---|
| 35 | | -#include <asm/octeon/cvmx-wqe.h> |
|---|
| 36 | | -#include <asm/octeon/cvmx-fau.h> |
|---|
| 37 | | -#include <asm/octeon/cvmx-pow.h> |
|---|
| 38 | | -#include <asm/octeon/cvmx-pip.h> |
|---|
| 39 | | -#include <asm/octeon/cvmx-scratch.h> |
|---|
| 40 | | - |
|---|
| 41 | | -#include <asm/octeon/cvmx-gmxx-defs.h> |
|---|
| 42 | 31 | |
|---|
| 43 | 32 | static atomic_t oct_rx_ready = ATOMIC_INIT(0); |
|---|
| 44 | 33 | |
|---|
| .. | .. |
|---|
| 71 | 60 | * |
|---|
| 72 | 61 | * Returns Non-zero if the packet can be dropped, zero otherwise. |
|---|
| 73 | 62 | */ |
|---|
| 74 | | -static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work) |
|---|
| 63 | +static inline int cvm_oct_check_rcv_error(struct cvmx_wqe *work) |
|---|
| 75 | 64 | { |
|---|
| 76 | 65 | int port; |
|---|
| 77 | 66 | |
|---|
| .. | .. |
|---|
| 150 | 139 | return 1; |
|---|
| 151 | 140 | } |
|---|
| 152 | 141 | |
|---|
| 153 | | -static void copy_segments_to_skb(cvmx_wqe_t *work, struct sk_buff *skb) |
|---|
| 142 | +static void copy_segments_to_skb(struct cvmx_wqe *work, struct sk_buff *skb) |
|---|
| 154 | 143 | { |
|---|
| 155 | 144 | int segments = work->word2.s.bufs; |
|---|
| 156 | 145 | union cvmx_buf_ptr segment_ptr = work->packet_ptr; |
|---|
| .. | .. |
|---|
| 230 | 219 | struct sk_buff *skb = NULL; |
|---|
| 231 | 220 | struct sk_buff **pskb = NULL; |
|---|
| 232 | 221 | int skb_in_hw; |
|---|
| 233 | | - cvmx_wqe_t *work; |
|---|
| 222 | + struct cvmx_wqe *work; |
|---|
| 234 | 223 | int port; |
|---|
| 235 | 224 | |
|---|
| 236 | 225 | if (USE_ASYNC_IOBDMA && did_work_request) |
|---|