Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

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

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index ef04105..d3465ab 100644 (file)
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -2030,11 +2030,6 @@ static void ucc_geth_set_multi(struct net_device *dev)
                        out_be32(&p_82xx_addr_filt->gaddr_l, 0x0);
 
                        netdev_for_each_mc_addr(ha, dev) {
-                               /* Only support group multicast for now.
-                                */
-                               if (!is_multicast_ether_addr(ha->addr))
-                                       continue;
-
                                /* Ask CPM to run CRC and set bit in
                                 * filter mask.
                                 */
@@ -3165,6 +3160,8 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        ugeth->txBd[txQ] = bd;
 
+       skb_tx_timestamp(skb);
+
        if (ugeth->p_scheduler) {
                ugeth->cpucount[txQ]++;
                /* Indicate to QE that there are more Tx bds ready for