hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/staging/octeon/ethernet-rx.c
....@@ -23,22 +23,11 @@
2323 #include <net/xfrm.h>
2424 #endif /* CONFIG_XFRM */
2525
26
-#include <asm/octeon/octeon.h>
27
-
26
+#include "octeon-ethernet.h"
2827 #include "ethernet-defines.h"
2928 #include "ethernet-mem.h"
3029 #include "ethernet-rx.h"
31
-#include "octeon-ethernet.h"
3230 #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>
4231
4332 static atomic_t oct_rx_ready = ATOMIC_INIT(0);
4433
....@@ -71,7 +60,7 @@
7160 *
7261 * Returns Non-zero if the packet can be dropped, zero otherwise.
7362 */
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)
7564 {
7665 int port;
7766
....@@ -150,7 +139,7 @@
150139 return 1;
151140 }
152141
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)
154143 {
155144 int segments = work->word2.s.bufs;
156145 union cvmx_buf_ptr segment_ptr = work->packet_ptr;
....@@ -230,7 +219,7 @@
230219 struct sk_buff *skb = NULL;
231220 struct sk_buff **pskb = NULL;
232221 int skb_in_hw;
233
- cvmx_wqe_t *work;
222
+ struct cvmx_wqe *work;
234223 int port;
235224
236225 if (USE_ASYNC_IOBDMA && did_work_request)