|
@@ -4450,9 +4450,8 @@ static inline int rtl8169_fragmented_frame(u32 status)
|
|
return (status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag);
|
|
return (status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag);
|
|
}
|
|
}
|
|
|
|
|
|
-static inline void rtl8169_rx_csum(struct sk_buff *skb, struct RxDesc *desc)
|
|
|
|
|
|
+static inline void rtl8169_rx_csum(struct sk_buff *skb, u32 opts1)
|
|
{
|
|
{
|
|
- u32 opts1 = le32_to_cpu(desc->opts1);
|
|
|
|
u32 status = opts1 & RxProtoMask;
|
|
u32 status = opts1 & RxProtoMask;
|
|
|
|
|
|
if (((status == RxProtoTCP) && !(opts1 & TCPFail)) ||
|
|
if (((status == RxProtoTCP) && !(opts1 & TCPFail)) ||
|
|
@@ -4546,8 +4545,6 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
- rtl8169_rx_csum(skb, desc);
|
|
|
|
-
|
|
|
|
if (rtl8169_try_rx_copy(&skb, tp, pkt_size, addr)) {
|
|
if (rtl8169_try_rx_copy(&skb, tp, pkt_size, addr)) {
|
|
pci_dma_sync_single_for_device(pdev, addr,
|
|
pci_dma_sync_single_for_device(pdev, addr,
|
|
pkt_size, PCI_DMA_FROMDEVICE);
|
|
pkt_size, PCI_DMA_FROMDEVICE);
|
|
@@ -4558,6 +4555,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
|
|
tp->Rx_skbuff[entry] = NULL;
|
|
tp->Rx_skbuff[entry] = NULL;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ rtl8169_rx_csum(skb, status);
|
|
skb_put(skb, pkt_size);
|
|
skb_put(skb, pkt_size);
|
|
skb->protocol = eth_type_trans(skb, dev);
|
|
skb->protocol = eth_type_trans(skb, dev);
|
|
|
|
|