Merge branch 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab...

[pandora-kernel.git] / drivers / net / veth.c

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 4b6db3b..7f78db7 100644 (file)
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -30,7 +30,6 @@ struct veth_net_stats {
        u64                     rx_bytes;
        u64                     tx_bytes;
        u64                     rx_dropped;
-       u64                     tx_dropped;
        struct u64_stats_sync   syncp;
 };
 
@@ -126,9 +125,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
        stats = this_cpu_ptr(priv->stats);
        rcv_stats = this_cpu_ptr(rcv_priv->stats);
 
-       if (!(rcv->flags & IFF_UP))
-               goto tx_drop;
-
        /* don't change ip_summed == CHECKSUM_PARTIAL, as that
           will cause bad checksum on forwarded packets */
        if (skb->ip_summed == CHECKSUM_NONE &&
@@ -151,13 +147,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
 
        return NETDEV_TX_OK;
 
-tx_drop:
-       kfree_skb(skb);
-       u64_stats_update_begin(&stats->syncp);
-       stats->tx_dropped++;
-       u64_stats_update_end(&stats->syncp);
-       return NETDEV_TX_OK;
-
 rx_drop:
        u64_stats_update_begin(&rcv_stats->syncp);
        rcv_stats->rx_dropped++;
@@ -178,7 +167,7 @@ static struct rtnl_link_stats64 *veth_get_stats64(struct net_device *dev,
        for_each_possible_cpu(cpu) {
                struct veth_net_stats *stats = per_cpu_ptr(priv->stats, cpu);
                u64 rx_packets, rx_bytes, rx_dropped;
-               u64 tx_packets, tx_bytes, tx_dropped;
+               u64 tx_packets, tx_bytes;
                unsigned int start;
 
                do {
@@ -188,14 +177,12 @@ static struct rtnl_link_stats64 *veth_get_stats64(struct net_device *dev,
                        rx_bytes = stats->rx_bytes;
                        tx_bytes = stats->tx_bytes;
                        rx_dropped = stats->rx_dropped;
-                       tx_dropped = stats->tx_dropped;
                } while (u64_stats_fetch_retry_bh(&stats->syncp, start));
                tot->rx_packets += rx_packets;
                tot->tx_packets += tx_packets;
                tot->rx_bytes   += rx_bytes;
                tot->tx_bytes   += tx_bytes;
                tot->rx_dropped += rx_dropped;
-               tot->tx_dropped += tx_dropped;
        }
 
        return tot;