Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122742
b: refs/heads/master
c: a22823e
h: refs/heads/master
v: v3
  • Loading branch information
Dai Haruki authored and David S. Miller committed Dec 16, 2008
1 parent 3888064 commit 82a1794
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2c2db48acb34735d8ef257f130c0c330c46c8f6a
refs/heads/master: a22823e72a4821ce1d4a248fbd8f5a81795af339
8 changes: 4 additions & 4 deletions trunk/drivers/net/gianfar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 82a1794

Please sign in to comment.