Browse Source

[PATCH] skge: handle VLAN checksum correctly on yukon rev 0

If using UDP over VLAN, with the skge driver there is a possibility
of generating an incorrect checksum. This is a unlikely occurrence
because it is only an issue on Yukon revision 0, and that revision
doesn't seem to exist on any current hardware (probably early prototype).

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Stephen Hemminger 19 năm trước cách đây
mục cha
commit
1096e87174
1 tập tin đã thay đổi với 1 bổ sung3 xóa
  1. 1 3
      drivers/net/skge.c

+ 1 - 3
drivers/net/skge.c

@@ -2300,14 +2300,12 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 	td->dma_hi = map >> 32;
 	td->dma_hi = map >> 32;
 
 
 	if (skb->ip_summed == CHECKSUM_HW) {
 	if (skb->ip_summed == CHECKSUM_HW) {
-		const struct iphdr *ip
-			= (const struct iphdr *) (skb->data + ETH_HLEN);
 		int offset = skb->h.raw - skb->data;
 		int offset = skb->h.raw - skb->data;
 
 
 		/* This seems backwards, but it is what the sk98lin
 		/* This seems backwards, but it is what the sk98lin
 		 * does.  Looks like hardware is wrong?
 		 * does.  Looks like hardware is wrong?
 		 */
 		 */
-		if (ip->protocol == IPPROTO_UDP
+		if (skb->h.ipih->protocol == IPPROTO_UDP
 	            && hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON)
 	            && hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON)
 			control = BMU_TCP_CHECK;
 			control = BMU_TCP_CHECK;
 		else
 		else