Attachment 234421 Details for Bug 236869 – Netxen backport to 2.6.21

Netxen backport to 2.6.21

netxen-2.6.21-backport.patch (text/plain), 3.59 KB, created by IBM Bug Proxy on 2007-10-22 20:20:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2007-10-22 20:20:51 UTC

Size: 3.59 KB

patch

obsolete

>Netxen driver backports from 2.6.20 netdev tree to 2.6.16-rt22
>
>Biggest changes in the driver for the backport are:
>1. ip_hdr/ip_hdrlen/tcp_hdrlen macro removal
>2. skb_transport_offset macro
>3. revert changes from driver core: pdev->revision
>
>Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
>
>Index: linux-rt-2.6.21.4-ibmrt1.1-view/drivers/net/netxen/netxen_nic_hw.c
>===================================================================
>--- linux-rt-2.6.21.4-ibmrt1.1-view.orig/drivers/net/netxen/netxen_nic_hw.c	2007-09-27 10:38:25.000000000 -0700
>+++ linux-rt-2.6.21.4-ibmrt1.1-view/drivers/net/netxen/netxen_nic_hw.c	2007-09-27 10:38:25.000000000 -0700
>@@ -545,20 +545,21 @@
> 		      struct cmd_desc_type0 *desc, struct sk_buff *skb)
> {
> 	if (desc->mss) {
>-		desc->total_hdr_length = (sizeof(struct ethhdr) +
>-					  ip_hdrlen(skb) + tcp_hdrlen(skb));
>+		desc->total_hdr_length = sizeof(struct ethhdr) +
>+		    ((skb->nh.iph)->ihl * sizeof(u32)) +
>+		    ((skb->h.th)->doff * sizeof(u32));
> 		netxen_set_cmd_desc_opcode(desc, TX_TCP_LSO);
> 	} else if (skb->ip_summed == CHECKSUM_PARTIAL) {
>-		if (ip_hdr(skb)->protocol == IPPROTO_TCP) {
>+		if (skb->nh.iph->protocol == IPPROTO_TCP) {
> 			netxen_set_cmd_desc_opcode(desc, TX_TCP_PKT);
>-		} else if (ip_hdr(skb)->protocol == IPPROTO_UDP) {
>+		} else if (skb->nh.iph->protocol == IPPROTO_UDP) {
> 			netxen_set_cmd_desc_opcode(desc, TX_UDP_PKT);
> 		} else {
> 			return;
> 		}
> 	}
>-	desc->tcp_hdr_offset = skb_transport_offset(skb);
>-	desc->ip_hdr_offset = skb_network_offset(skb);
>+	desc->tcp_hdr_offset = skb->h.raw - skb->data;
>+	desc->ip_hdr_offset = skb->nh.raw - skb->data;
> }
> 
> int netxen_is_flash_supported(struct netxen_adapter *adapter)
>Index: linux-rt-2.6.21.4-ibmrt1.1-view/drivers/net/netxen/netxen_nic_main.c
>===================================================================
>--- linux-rt-2.6.21.4-ibmrt1.1-view.orig/drivers/net/netxen/netxen_nic_main.c	2007-09-27 10:38:25.000000000 -0700
>+++ linux-rt-2.6.21.4-ibmrt1.1-view/drivers/net/netxen/netxen_nic_main.c	2007-09-27 10:49:12.000000000 -0700
>@@ -54,6 +54,8 @@
> #define NETXEN_ADAPTER_UP_MAGIC 777
> #define NETXEN_NIC_PEG_TUNE 0
> 
>+u8 nx_p2_id = NX_P2_C0;
>+
> #define DMA_32BIT_MASK	0x00000000ffffffffULL
> #define DMA_35BIT_MASK	0x00000007ffffffffULL
> 
>@@ -305,7 +307,8 @@
> 		goto err_out_disable_pdev;
> 
> 	pci_set_master(pdev);
>-	if (pdev->revision == NX_P2_C1 &&
>+	pci_read_config_byte(pdev, PCI_REVISION_ID, &nx_p2_id);
>+	if (nx_p2_id == NX_P2_C1 &&
> 	    (pci_set_dma_mask(pdev, DMA_35BIT_MASK) == 0) &&
> 	    (pci_set_consistent_dma_mask(pdev, DMA_35BIT_MASK) == 0)) {
> 		pci_using_dac = 1;
>@@ -548,7 +551,7 @@
> 	INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
> 	adapter->ahw.pdev = pdev;
> 	adapter->proc_cmd_buf_counter = 0;
>-	adapter->ahw.revision_id = pdev->revision;
>+	adapter->ahw.revision_id = nx_p2_id;
> 
> 	/* make sure Window == 1 */
> 	netxen_nic_pci_change_crbwindow(adapter, 1);
>@@ -1029,8 +1032,9 @@
> 		if (skb_shinfo(skb)->gso_size > 0) {
> 
> 			no_of_desc++;
>-			if ((ip_hdrlen(skb) + tcp_hdrlen(skb) +
>-			     sizeof(struct ethhdr)) >
>+			if (((skb->nh.iph)->ihl * sizeof(u32)) +
>+			    ((skb->h.th)->doff * sizeof(u32)) +
>+			    sizeof(struct ethhdr) >
> 			    (sizeof(struct cmd_desc_type0) - 2)) {
> 				no_of_desc++;
> 			}
>@@ -1164,10 +1168,8 @@
> 			/* copy the next 64 bytes - should be enough except
> 			 * for pathological case
> 			 */
>-			skb_copy_from_linear_data_offset(skb, first_hdr_len,
>-							 hwdesc,
>-							 (hdr_len -
>-							  first_hdr_len));
>+			memcpy((void *)hwdesc, (void *)(skb->data) +
>+			       first_hdr_len, hdr_len - first_hdr_len);
> 			producer = get_next_index(producer, max_tx_desc_count);
> 		}
> 	}

Actions: View

Attachments on bug 236869: 158374 | 158378 | 158823 | 234421 | 234431