@@ -1301,14 +1301,11 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq)
struct net_device *netdev = enic->netdev;
struct sk_buff *skb;
unsigned int len = netdev->mtu + VLAN_ETH_HLEN;
- unsigned int os_buf_index = 0;
dma_addr_t dma_addr;
struct vnic_rq_buf *buf = rq->to_use;
if (buf->os_buf) {
- enic_queue_rq_desc(rq, buf->os_buf, os_buf_index, buf->dma_addr,
- buf->len);
-
+ enic_queue_rq_desc(rq, buf->os_buf, buf->dma_addr, buf->len);
return 0;
}
skb = netdev_alloc_skb_ip_align(netdev, len);
@@ -1324,8 +1321,7 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq)
return -ENOMEM;
}
- enic_queue_rq_desc(rq, skb, os_buf_index,
- dma_addr, len);
+ enic_queue_rq_desc(rq, skb, dma_addr, len);
return 0;
}
@@ -107,19 +107,15 @@ static inline void enic_queue_wq_desc_tso(struct vnic_wq *wq,
}
static inline void enic_queue_rq_desc(struct vnic_rq *rq,
- void *os_buf, unsigned int os_buf_index,
- dma_addr_t dma_addr, unsigned int len)
+ void *os_buf, dma_addr_t dma_addr, unsigned int len)
{
struct rq_enet_desc *desc = vnic_rq_next_desc(rq);
- u64 wrid = 0;
- u8 type = os_buf_index ?
- RQ_ENET_TYPE_NOT_SOP : RQ_ENET_TYPE_ONLY_SOP;
rq_enet_desc_enc(desc,
(u64)dma_addr | VNIC_PADDR_TARGET,
- type, (u16)len);
+ RQ_ENET_TYPE_ONLY_SOP, (u16)len);
- vnic_rq_post(rq, os_buf, os_buf_index, dma_addr, len, wrid);
+ vnic_rq_post(rq, os_buf, 0, dma_addr, len, 0);
}
struct enic;