diff --git a/[refs] b/[refs] index f26ab2e98717..a24483da7156 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f501b173f2d69973497599f5358fb4c30922d67 +refs/heads/master: 6989f5122f84046ba286efe8ce8be2fec42a1b7c diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c index a44b4eef1808..1087c4da84a5 100644 --- a/trunk/drivers/net/fec.c +++ b/trunk/drivers/net/fec.c @@ -341,7 +341,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) if (bdp->cbd_bufaddr & 0x3) { unsigned int index; index = bdp - fep->tx_bd_base; - memcpy(fep->tx_bounce[index], (void *) bdp->cbd_bufaddr, bdp->cbd_datlen); + memcpy(fep->tx_bounce[index], (void *)skb->data, skb->len); bdp->cbd_bufaddr = __pa(fep->tx_bounce[index]); }