lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qla3xxx: cleanup checksum offload code

Browse Source 
The code for checksum is more complex than needed when dealing with VLAN's;
the higher layers already pass down the location of the IP header.

Compile tested only, no hardware available.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Stephen Hemminger
2007-05-30 14:23:18 -07:00
committed by Jeff Garzik
parent 59b34c1260
commit 91e745aa46
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/qla3xxx.c
View File

@@ -2433,37 +2433,22 @@ static int ql_get_seg_count(struct ql3_adapter *qdev,
return -1; return -1;
} }
static void ql_hw_csum_setup(struct sk_buff *skb, static void ql_hw_csum_setup(const struct sk_buff *skb,
struct ob_mac_iocb_req *mac_iocb_ptr) struct ob_mac_iocb_req *mac_iocb_ptr)
{ {
struct ethhdr *eth; const struct iphdr *ip = ip_hdr(skb);
struct iphdr *ip = NULL;
u8 offset = ETH_HLEN;
eth = (struct ethhdr *)(skb->data); mac_iocb_ptr->ip_hdr_off = skb_network_offset(skb);
mac_iocb_ptr->ip_hdr_len = ip->ihl;
if (eth->h_proto == __constant_htons(ETH_P_IP)) { if (ip->protocol == IPPROTO_TCP) {
ip = (struct iphdr *)&skb->data[ETH_HLEN]; mac_iocb_ptr->flags1 |= OB_3032MAC_IOCB_REQ_TC |
} else if (eth->h_proto == htons(ETH_P_8021Q) && OB_3032MAC_IOCB_REQ_IC;
((struct vlan_ethhdr *)skb->data)-> } else {
h_vlan_encapsulated_proto == __constant_htons(ETH_P_IP)) { mac_iocb_ptr->flags1 |= OB_3032MAC_IOCB_REQ_UC |
ip = (struct iphdr *)&skb->data[VLAN_ETH_HLEN]; OB_3032MAC_IOCB_REQ_IC;
offset = VLAN_ETH_HLEN;
} }
if (ip) {
if (ip->protocol == IPPROTO_TCP) {
mac_iocb_ptr->flags1 |= OB_3032MAC_IOCB_REQ_TC |
OB_3032MAC_IOCB_REQ_IC;
mac_iocb_ptr->ip_hdr_off = offset;
mac_iocb_ptr->ip_hdr_len = ip->ihl;
} else if (ip->protocol == IPPROTO_UDP) {
mac_iocb_ptr->flags1 |= OB_3032MAC_IOCB_REQ_UC |
OB_3032MAC_IOCB_REQ_IC;
mac_iocb_ptr->ip_hdr_off = offset;
mac_iocb_ptr->ip_hdr_len = ip->ihl;
}
}
} }
/* /*