From 82a1794b0d6ab08d4d8b587f46b3a02dd30e953d Mon Sep 17 00:00:00 2001 From: Dai Haruki Date: Tue, 16 Dec 2008 15:32:11 -0800 Subject: [PATCH] --- yaml --- r: 122742 b: refs/heads/master c: a22823e72a4821ce1d4a248fbd8f5a81795af339 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fe0e5c919fb1..6da2990569a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c2db48acb34735d8ef257f130c0c330c46c8f6a +refs/heads/master: a22823e72a4821ce1d4a248fbd8f5a81795af339 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index 9057a1df8e94..40756dc68a10 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/drivers/net/gianfar.c @@ -1166,11 +1166,11 @@ static int gfar_enet_open(struct net_device *dev) return err; } -static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb, struct txbd8 *bdp) +static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb) { struct txfcb *fcb = (struct txfcb *)skb_push (skb, GMAC_FCB_LEN); - memset(fcb, 0, GMAC_FCB_LEN); + cacheable_memzero(fcb, GMAC_FCB_LEN); return fcb; } @@ -1233,14 +1233,14 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Set up checksumming */ if (CHECKSUM_PARTIAL == skb->ip_summed) { - fcb = gfar_add_fcb(skb, txbdp); + fcb = gfar_add_fcb(skb); status |= TXBD_TOE; gfar_tx_checksum(skb, fcb); } if (priv->vlgrp && vlan_tx_tag_present(skb)) { if (unlikely(NULL == fcb)) { - fcb = gfar_add_fcb(skb, txbdp); + fcb = gfar_add_fcb(skb); status |= TXBD_TOE; }