wl1251: rename reg.h to wl1251_reg.h

[safe/jmp/linux-2.6] / drivers / net / veth.c

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 015db1c..190f784 100644 (file)
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -171,13 +171,12 @@ static int veth_xmit(struct sk_buff *skb, struct net_device *dev)
        if (skb->len > (rcv->mtu + MTU_PAD))
                goto rx_drop;
 
+        skb->tstamp.tv64 = 0;
        skb->pkt_type = PACKET_HOST;
        skb->protocol = eth_type_trans(skb, rcv);
        if (dev->features & NETIF_F_NO_CSUM)
                skb->ip_summed = rcv_priv->ip_summed;
 
-       dst_release(skb->dst);
-       skb->dst = NULL;
        skb->mark = 0;
        secpath_reset(skb);
        nf_reset(skb);
@@ -191,17 +190,17 @@ static int veth_xmit(struct sk_buff *skb, struct net_device *dev)
        rcv_stats->rx_packets++;
 
        netif_rx(skb);
-       return 0;
+       return NETDEV_TX_OK;
 
 tx_drop:
        kfree_skb(skb);
        stats->tx_dropped++;
-       return 0;
+       return NETDEV_TX_OK;
 
 rx_drop:
        kfree_skb(skb);
        rcv_stats->rx_dropped++;
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 /*