diff options
author | Amit S. Kale <amitkale@netxen.com> | 2006-12-18 08:53:59 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-26 16:46:39 -0500 |
commit | ed33ebe464d973ab656cfc9ff0ca40a4c1e38238 (patch) | |
tree | 659beb4a19c9d04d395a1285c15e1f958be17c02 /drivers/net/netxen | |
parent | 6c5866441669ab71f6297556ea281a6bcbfd13db (diff) |
NetXen: Fix for PPC machines.
Signed-off-by: Amit 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: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic.h | 2 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 12 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index 86dcd52683da..31b2553072ae 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
@@ -63,7 +63,7 @@ | |||
63 | 63 | ||
64 | #include "netxen_nic_hw.h" | 64 | #include "netxen_nic_hw.h" |
65 | 65 | ||
66 | #define NETXEN_NIC_BUILD_NO "2" | 66 | #define NETXEN_NIC_BUILD_NO "3" |
67 | #define _NETXEN_NIC_LINUX_MAJOR 3 | 67 | #define _NETXEN_NIC_LINUX_MAJOR 3 |
68 | #define _NETXEN_NIC_LINUX_MINOR 3 | 68 | #define _NETXEN_NIC_LINUX_MINOR 3 |
69 | #define _NETXEN_NIC_LINUX_SUBVERSION 2 | 69 | #define _NETXEN_NIC_LINUX_SUBVERSION 2 |
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index c147943a9f54..c0cbc30964ab 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
@@ -928,7 +928,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) | |||
928 | } | 928 | } |
929 | netxen_process_rcv(adapter, ctxid, desc); | 929 | netxen_process_rcv(adapter, ctxid, desc); |
930 | netxen_clear_sts_owner(desc); | 930 | netxen_clear_sts_owner(desc); |
931 | netxen_set_sts_owner(desc, STATUS_OWNER_PHANTOM); | 931 | netxen_set_sts_owner(desc, cpu_to_le16(STATUS_OWNER_PHANTOM)); |
932 | consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1); | 932 | consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1); |
933 | count++; | 933 | count++; |
934 | } | 934 | } |
@@ -1138,13 +1138,13 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid) | |||
1138 | */ | 1138 | */ |
1139 | dma = pci_map_single(pdev, skb->data, rcv_desc->dma_size, | 1139 | dma = pci_map_single(pdev, skb->data, rcv_desc->dma_size, |
1140 | PCI_DMA_FROMDEVICE); | 1140 | PCI_DMA_FROMDEVICE); |
1141 | pdesc->addr_buffer = dma; | 1141 | pdesc->addr_buffer = cpu_to_le64(dma); |
1142 | buffer->skb = skb; | 1142 | buffer->skb = skb; |
1143 | buffer->state = NETXEN_BUFFER_BUSY; | 1143 | buffer->state = NETXEN_BUFFER_BUSY; |
1144 | buffer->dma = dma; | 1144 | buffer->dma = dma; |
1145 | /* make a rcv descriptor */ | 1145 | /* make a rcv descriptor */ |
1146 | pdesc->reference_handle = buffer->ref_handle; | 1146 | pdesc->reference_handle = cpu_to_le16(buffer->ref_handle); |
1147 | pdesc->buffer_length = rcv_desc->dma_size; | 1147 | pdesc->buffer_length = cpu_to_le32(rcv_desc->dma_size); |
1148 | DPRINTK(INFO, "done writing descripter\n"); | 1148 | DPRINTK(INFO, "done writing descripter\n"); |
1149 | producer = | 1149 | producer = |
1150 | get_next_index(producer, rcv_desc->max_rx_desc_count); | 1150 | 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, | |||
1232 | PCI_DMA_FROMDEVICE); | 1232 | PCI_DMA_FROMDEVICE); |
1233 | 1233 | ||
1234 | /* make a rcv descriptor */ | 1234 | /* make a rcv descriptor */ |
1235 | pdesc->reference_handle = le16_to_cpu(buffer->ref_handle); | 1235 | pdesc->reference_handle = cpu_to_le16(buffer->ref_handle); |
1236 | pdesc->buffer_length = le16_to_cpu(rcv_desc->dma_size); | 1236 | pdesc->buffer_length = cpu_to_le16(rcv_desc->dma_size); |
1237 | pdesc->addr_buffer = cpu_to_le64(buffer->dma); | 1237 | pdesc->addr_buffer = cpu_to_le64(buffer->dma); |
1238 | DPRINTK(INFO, "done writing descripter\n"); | 1238 | DPRINTK(INFO, "done writing descripter\n"); |
1239 | producer = | 1239 | producer = |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index bc08d21adc47..aecc07d5170c 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -822,8 +822,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
822 | /* Take skb->data itself */ | 822 | /* Take skb->data itself */ |
823 | pbuf = &adapter->cmd_buf_arr[producer]; | 823 | pbuf = &adapter->cmd_buf_arr[producer]; |
824 | if ((netdev->features & NETIF_F_TSO) && skb_shinfo(skb)->gso_size > 0) { | 824 | if ((netdev->features & NETIF_F_TSO) && skb_shinfo(skb)->gso_size > 0) { |
825 | pbuf->mss = skb_shinfo(skb)->gso_size; | 825 | pbuf->mss = cpu_to_le16(skb_shinfo(skb)->gso_size); |
826 | hwdesc->mss = skb_shinfo(skb)->gso_size; | 826 | hwdesc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size); |
827 | } else { | 827 | } else { |
828 | pbuf->mss = 0; | 828 | pbuf->mss = 0; |
829 | hwdesc->mss = 0; | 829 | hwdesc->mss = 0; |