Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed33ebe4 authored by Amit S. Kale's avatar Amit S. Kale Committed by Jeff Garzik
Browse files

NetXen: Fix for PPC machines. 



Signed-off-by: default avatarAmit S. Kale <amitkale@netxen.com>

 netxen_nic.h      |    2 +-
 netxen_nic_init.c |   12 ++++++------
 netxen_nic_main.c |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 6c586644

drivers/net/netxen/netxen_nic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ 




#include "netxen_nic_hw.h"

#include "netxen_nic_hw.h"





#define NETXEN_NIC_BUILD_NO     "2"

#define NETXEN_NIC_BUILD_NO     "3"

#define _NETXEN_NIC_LINUX_MAJOR 3

#define _NETXEN_NIC_LINUX_MAJOR 3

#define _NETXEN_NIC_LINUX_MINOR 3

#define _NETXEN_NIC_LINUX_MINOR 3

#define _NETXEN_NIC_LINUX_SUBVERSION 2

#define _NETXEN_NIC_LINUX_SUBVERSION 2

drivers/net/netxen/netxen_nic_init.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -928,7 +928,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) 
		}

		}

		netxen_process_rcv(adapter, ctxid, desc);

		netxen_process_rcv(adapter, ctxid, desc);

		netxen_clear_sts_owner(desc);

		netxen_clear_sts_owner(desc);

		netxen_set_sts_owner(desc, STATUS_OWNER_PHANTOM);

		netxen_set_sts_owner(desc, cpu_to_le16(STATUS_OWNER_PHANTOM));

		consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);

		consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);

		count++;

		count++;

	}

	}
@@ -1138,13 +1138,13 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid) 
		 */

		 */

		dma = pci_map_single(pdev, skb->data, rcv_desc->dma_size,

		dma = pci_map_single(pdev, skb->data, rcv_desc->dma_size,

				     PCI_DMA_FROMDEVICE);

				     PCI_DMA_FROMDEVICE);

		pdesc->addr_buffer = dma;

		pdesc->addr_buffer = cpu_to_le64(dma);

		buffer->skb = skb;

		buffer->skb = skb;

		buffer->state = NETXEN_BUFFER_BUSY;

		buffer->state = NETXEN_BUFFER_BUSY;

		buffer->dma = dma;

		buffer->dma = dma;

		/* make a rcv descriptor  */

		/* make a rcv descriptor  */

		pdesc->reference_handle = buffer->ref_handle;

		pdesc->reference_handle = cpu_to_le16(buffer->ref_handle);

		pdesc->buffer_length = rcv_desc->dma_size;

		pdesc->buffer_length = cpu_to_le32(rcv_desc->dma_size);

		DPRINTK(INFO, "done writing descripter\n");

		DPRINTK(INFO, "done writing descripter\n");

		producer =

		producer =

		    get_next_index(producer, rcv_desc->max_rx_desc_count);

		    get_next_index(producer, rcv_desc->max_rx_desc_count);
@@ -1232,8 +1232,8 @@ void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, uint32_t ctx, 
					     PCI_DMA_FROMDEVICE);

					     PCI_DMA_FROMDEVICE);





		/* make a rcv descriptor  */

		/* make a rcv descriptor  */

		pdesc->reference_handle = le16_to_cpu(buffer->ref_handle);

		pdesc->reference_handle = cpu_to_le16(buffer->ref_handle);

		pdesc->buffer_length = le16_to_cpu(rcv_desc->dma_size);

		pdesc->buffer_length = cpu_to_le16(rcv_desc->dma_size);

		pdesc->addr_buffer = cpu_to_le64(buffer->dma);

		pdesc->addr_buffer = cpu_to_le64(buffer->dma);

		DPRINTK(INFO, "done writing descripter\n");

		DPRINTK(INFO, "done writing descripter\n");

		producer =

		producer =

drivers/net/netxen/netxen_nic_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -822,8 +822,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	/* Take skb->data itself */

	/* Take skb->data itself */

	pbuf = &adapter->cmd_buf_arr[producer];

	pbuf = &adapter->cmd_buf_arr[producer];

	if ((netdev->features & NETIF_F_TSO) && skb_shinfo(skb)->gso_size > 0) {

	if ((netdev->features & NETIF_F_TSO) && skb_shinfo(skb)->gso_size > 0) {

		pbuf->mss = skb_shinfo(skb)->gso_size;

		pbuf->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);

		hwdesc->mss = skb_shinfo(skb)->gso_size;

		hwdesc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);

	} else {

	} else {

		pbuf->mss = 0;

		pbuf->mss = 0;

		hwdesc->mss = 0;

		hwdesc->mss = 0;