---

yaml --- r: 267673 b: refs/heads/master c: 94114a5 h: refs/heads/master i: 267671: 9b5cfa1 v: v3
git-mirror · Aug 24, 2011 · 7a6ce1c · 7a6ce1c
1 parent c2306a7
commit 7a6ce1c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 25 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf474281e98171b7491a8b759491f400bd6b1863
+refs/heads/master: 94114a5ad75c6c9dcc931170855d2a90eea53d97
diff --git a/trunk/drivers/staging/rtl8192e/rtllib.h b/trunk/drivers/staging/rtl8192e/rtllib.h
@@ -1095,9 +1095,6 @@ struct rtllib_rx_stats {
 	char   cck_adc_pwdb[4];
 	u16    Seq_Num;
 	u8     nTotalAggPkt;
-#ifdef TCP_CSUM_OFFLOAD_RX
-	u8	tcp_csum_valid;
-#endif
 #endif
 
 };
@@ -1398,9 +1395,6 @@ struct rtllib_rxb {
 	struct sk_buff *subframes[MAX_SUBFRAME_COUNT];
 	u8 dst[ETH_ALEN];
 	u8 src[ETH_ALEN];
-#ifdef TCP_CSUM_OFFLOAD_RX
-	u8 tcp_csum_valid;
-#endif
 }__attribute__((packed));
 
 typedef union _frameqos {

diff --git a/trunk/drivers/staging/rtl8192e/rtllib_rx.c b/trunk/drivers/staging/rtl8192e/rtllib_rx.c
@@ -846,15 +846,7 @@ void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prx
 				sub_skb->dev = ieee->dev;
 				sub_skb->dev->stats.rx_packets++;
 				sub_skb->dev->stats.rx_bytes += sub_skb->len;
-#ifdef TCP_CSUM_OFFLOAD_RX
-				if ( prxb->tcp_csum_valid)
-					sub_skb->ip_summed = CHECKSUM_UNNECESSARY;
-				else
-					sub_skb->ip_summed = CHECKSUM_NONE;
-
-#else
 				sub_skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */
-#endif
 				ieee->last_rx_ps_time = jiffies;
 				netif_rx(sub_skb);
 			}
@@ -1581,14 +1573,7 @@ void rtllib_rx_indicate_pkt_legacy(
 			sub_skb->dev = dev;
 			sub_skb->dev->stats.rx_packets++;
 			sub_skb->dev->stats.rx_bytes += sub_skb->len;
-#ifdef TCP_CSUM_OFFLOAD_RX
-			if ( rx_stats->tcp_csum_valid)
-				sub_skb->ip_summed = CHECKSUM_UNNECESSARY;
-			else
-				sub_skb->ip_summed = CHECKSUM_NONE;
-#else
 			sub_skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */
-#endif
 			netif_rx(sub_skb);
 		}
 	}
@@ -1749,9 +1734,6 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
 	if (ieee->pHTInfo->bCurRxReorderEnable == false ||pTS == NULL || bToOtherSTA){
 		rtllib_rx_indicate_pkt_legacy(ieee, rx_stats, rxb, dst, src);
 	}else{
-#ifdef TCP_CSUM_OFFLOAD_RX
-		rxb->tcp_csum_valid = rx_stats->tcp_csum_valid;
-#endif
 		RxReorderIndicatePacket(ieee, rxb, pTS, SeqNum);
 	}