Attachment 158374 Details for Bug 236869 – driver_backports-21.patch

driver_backports-21.patch

driver_backports-21.patch (text/plain), 2.45 KB, created by IBM Bug Proxy on 2007-07-02 20:15:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2007-07-02 20:15:31 UTC

Size: 2.45 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
>
>Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
>
>Index: netxen-git/netxen_nic_hw.c
>===================================================================
>--- netxen-git.orig/netxen_nic_hw.c
>+++ netxen-git/netxen_nic_hw.c
>@@ -545,20 +545,21 @@ void netxen_tso_check(struct netxen_adap
> 		      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: netxen-git/netxen_nic_main.c
>===================================================================
>--- netxen-git.orig/netxen_nic_main.c
>+++ netxen-git/netxen_nic_main.c
>@@ -939,8 +939,9 @@ static int netxen_nic_xmit_frame(struct 
> 		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++;
> 			}
>@@ -1074,10 +1075,8 @@ static int netxen_nic_xmit_frame(struct 
> 			/* 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