diff --git a/[refs] b/[refs] index 96886fb0f7b7..6ac30ec01f50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ff75b7cf3b06efb72a50e26008d09b259b1231b +refs/heads/master: a0087a3619e1b137e7dbc91a1b2b5f15c0382412 diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c index 965fe90e1c20..7ae3f2814200 100644 --- a/trunk/drivers/net/fec.c +++ b/trunk/drivers/net/fec.c @@ -324,10 +324,10 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev) fep->cur_tx = bdp; - spin_unlock_irqrestore(&fep->hw_lock, flags); - skb_tx_timestamp(skb); + spin_unlock_irqrestore(&fep->hw_lock, flags); + return NETDEV_TX_OK; }