X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.c;h=387434c5225ea16a3da18faae7f850075cc6529a;hp=b883dc2b37444bbab642ee4f89c70713b863ffa9;hb=9d5b3d673822292ba149d3b15a6649e5b6c75f4a;hpb=b34adbb08f135af4f8291fb3583fdcb8d7fedcf7

diff --git a/jme.c b/jme.c
index b883dc2..387434c 100644
--- a/jme.c
+++ b/jme.c
@@ -994,6 +994,16 @@ jme_rxsum_ok(struct jme_adapter *jme, u16 flags, struct sk_buff *skb)
 	if (!(flags & (RXWBFLAG_TCPON | RXWBFLAG_UDPON | RXWBFLAG_IPV4)))
 		return false;
 
+		/*		Hardware Workaround	, packet is IPv6 but checksum fail 		*/
+	if (flags & RXWBFLAG_IPV6) {
+	
+		printk("this is IPV6  packet : len=%d ", skb->len);
+		if ((flags & RXWBFLAG_TCPON) && (!(flags & RXWBFLAG_TCPCS)))
+			return false;
+		if ((flags & RXWBFLAG_UDPON) && (!(flags & RXWBFLAG_UDPCS)))
+			return false;
+	}
+	
 	if (unlikely((flags & (RXWBFLAG_MF | RXWBFLAG_TCPON | RXWBFLAG_TCPCS))
 			== RXWBFLAG_TCPON)) {
 		if (flags & RXWBFLAG_IPV4)
@@ -1058,7 +1068,8 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
 #else
 			skb_checksum_none_assert(skb);
 #endif
-
+		printk("flag=%04x , skb->ip_summed =%d \n",le16_to_cpu(rxdesc->descwb.flags), skb->ip_summed);
+		
 		if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
 			if (jme->vlgrp) {
 				jme->jme_vlan_rx(skb, jme->vlgrp,
@@ -1765,7 +1776,7 @@ jme_phy_off(struct jme_adapter *jme)
 	jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr);
 
 	if (new_phy_power_ctrl(jme->chip_main_rev))
-		jme_new_phy_off(jme);
+		jme_new_phy_off(jme); 
 }
 
 static int
@@ -2448,6 +2459,8 @@ jme_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
 	p32 += 0x100 >> 2;
 	mmapio_memcpy(jme, p32, JME_MISC, JME_MISC_LEN);
 
+        printk("===jread32=%x===\n",jread32(jme, JME_EXGP2));
+
 	p32 += 0x100 >> 2;
 	mmapio_memcpy(jme, p32, JME_RSS, JME_RSS_LEN);
 
@@ -3032,7 +3045,7 @@ jme_init_one(struct pci_dev *pdev,
 	struct net_device *netdev;
 	struct jme_adapter *jme;
 	u16 bmcr, bmsr;
-	u32 apmc;
+	u32 apmc, phy_gp2;
 
 	/*
 	 * set up PCI device basics
@@ -3248,6 +3261,11 @@ jme_init_one(struct pci_dev *pdev,
 	}
 	jme_load_macaddr(netdev);
 
+	phy_gp2 = jread32(jme, JME_EXGP2)|FIX_IPV6_CHECKSUM;
+	jwrite32(jme, JME_EXGP2,phy_gp2);
+	wmb();
+	printk("==%x=====\n", jread32(jme, JME_EXGP2));	
+
 	/*
 	 * Tell stack that we are not ready to work until open()
 	 */