From: Larry Finger Date: Wed, 13 Jul 2011 23:47:44 +0000 (-0500) Subject: staging: rtl8192e: Remove dead code associated with TCP_CSUM_OFFLOAD_RX X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=94114a5ad75c6c9dcc931170855d2a90eea53d97;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging: rtl8192e: Remove dead code associated with TCP_CSUM_OFFLOAD_RX Signed-off-by: Larry Finger --- diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index b9284a220e41..cb83fffd4a13 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/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/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 10ec50cf58b6..d2659d2b69c4 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/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); }