ixgbe, xsk: Migrate to new MEM_TYPE_XSK_BUFF_POOL

[linux-2.6-microblaze.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_main.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index eab5934..45fc7ce 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -35,7 +35,7 @@
 #include <net/tc_act/tc_mirred.h>
 #include <net/vxlan.h>
 #include <net/mpls.h>
-#include <net/xdp_sock.h>
+#include <net/xdp_sock_drv.h>
 #include <net/xfrm.h>
 
 #include "ixgbe.h"
@@ -3745,8 +3745,7 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter,
 
        /* configure the packet buffer length */
        if (rx_ring->xsk_umem) {
-               u32 xsk_buf_len = rx_ring->xsk_umem->chunk_size_nohr -
-                                 XDP_PACKET_HEADROOM;
+               u32 xsk_buf_len = xsk_umem_get_rx_frame_size(rx_ring->xsk_umem);
 
                /* If the MAC support setting RXDCTL.RLPML, the
                 * SRRCTL[n].BSIZEPKT is set to PAGE_SIZE and
@@ -4093,11 +4092,10 @@ void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,
        xdp_rxq_info_unreg_mem_model(&ring->xdp_rxq);
        ring->xsk_umem = ixgbe_xsk_umem(adapter, ring);
        if (ring->xsk_umem) {
-               ring->zca.free = ixgbe_zca_free;
                WARN_ON(xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
-                                                  MEM_TYPE_ZERO_COPY,
-                                                  &ring->zca));
-
+                                                  MEM_TYPE_XSK_BUFF_POOL,
+                                                  NULL));
+               xsk_buff_set_rxq_info(ring->xsk_umem, &ring->xdp_rxq);
        } else {
                WARN_ON(xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
                                                   MEM_TYPE_PAGE_SHARED, NULL));
@@ -4153,8 +4151,7 @@ void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,
        }
 
        if (ring->xsk_umem && hw->mac.type != ixgbe_mac_82599EB) {
-               u32 xsk_buf_len = ring->xsk_umem->chunk_size_nohr -
-                                 XDP_PACKET_HEADROOM;
+               u32 xsk_buf_len = xsk_umem_get_rx_frame_size(ring->xsk_umem);
 
                rxdctl &= ~(IXGBE_RXDCTL_RLPMLMASK |
                            IXGBE_RXDCTL_RLPML_EN);