Title: [8194] trunk/drivers/net/bfin_mac.c: bfin_mac: use common ETH_FCS_LEN define rather than our own ETH_FCS_LENGTH
- Revision
- 8194
- Author
- vapier
- Date
- 2010-01-19 06:02:00 -0500 (Tue, 19 Jan 2010)
Log Message
bfin_mac: use common ETH_FCS_LEN define rather than our own ETH_FCS_LENGTH
Modified Paths
Diff
Modified: trunk/drivers/net/bfin_mac.c (8193 => 8194)
--- trunk/drivers/net/bfin_mac.c 2010-01-19 11:01:08 UTC (rev 8193)
+++ trunk/drivers/net/bfin_mac.c 2010-01-19 11:02:00 UTC (rev 8194)
@@ -1001,7 +1001,6 @@
return NETDEV_TX_OK;
}
-#define ETH_FCS_LENGTH 4
#define RX_ERROR_MASK (RX_LONG | RX_ALIGN | RX_CRC | RX_LEN | \
RX_FRAG | RX_ADDR | RX_DMAO | RX_PHY | RX_LATE | RX_RANGE)
@@ -1012,7 +1011,7 @@
struct bfin_mac_local *lp __maybe_unused = netdev_priv(dev);
#if defined(BFIN_MAC_CSUM_OFFLOAD)
unsigned int i;
- unsigned char fcs[ETH_FCS_LENGTH + 1];
+ unsigned char fcs[ETH_FCS_LEN + 1];
#endif
/* check if frame status word reports an error condition
* we which case we simply drop the packet
@@ -1047,7 +1046,7 @@
len = (unsigned short)((current_rx_ptr->status.status_word) & RX_FRLEN);
/* Deduce Ethernet FCS length from Ethernet payload length */
- len -= ETH_FCS_LENGTH;
+ len -= ETH_FCS_LEN;
skb_put(skb, len);
skb->protocol = eth_type_trans(skb, dev);
@@ -1065,13 +1064,13 @@
*/
if (skb->len % 2) {
fcs[0] = 0;
- for (i = 0; i < ETH_FCS_LENGTH; i++)
+ for (i = 0; i < ETH_FCS_LEN; i++)
fcs[i + 1] = ~skb->data[skb->len + i];
- skb->csum = csum_partial(fcs, ETH_FCS_LENGTH + 1, skb->csum);
+ skb->csum = csum_partial(fcs, ETH_FCS_LEN + 1, skb->csum);
} else {
- for (i = 0; i < ETH_FCS_LENGTH; i++)
+ for (i = 0; i < ETH_FCS_LEN; i++)
fcs[i] = ~skb->data[skb->len + i];
- skb->csum = csum_partial(fcs, ETH_FCS_LENGTH, skb->csum);
+ skb->csum = csum_partial(fcs, ETH_FCS_LEN, skb->csum);
}
skb->ip_summed = CHECKSUM_COMPLETE;
#endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
