Revert "ath9k: Group Key fix for VAPs"

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

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 0c76859..87d6b8f 100644 (file)
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -30,6 +30,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -326,7 +327,7 @@ static int gelic_descr_prepare_rx(struct gelic_card *card,
        unsigned int bufsize;
 
        if (gelic_descr_get_status(descr) !=  GELIC_DESCR_DMA_NOT_IN_USE)
-               dev_info(ctodev(card), "%s: ERROR status \n", __func__);
+               dev_info(ctodev(card), "%s: ERROR status\n", __func__);
        /* we need to round up the buffer size to a multiple of 128 */
        bufsize = ALIGN(GELIC_NET_MAX_MTU, GELIC_NET_RXBUF_ALIGN);
 
@@ -546,7 +547,7 @@ out:
 void gelic_net_set_multi(struct net_device *netdev)
 {
        struct gelic_card *card = netdev_card(netdev);
-       struct dev_mc_list *mc;
+       struct netdev_hw_addr *ha;
        unsigned int i;
        uint8_t *p;
        u64 addr;
@@ -568,7 +569,7 @@ void gelic_net_set_multi(struct net_device *netdev)
                        status);
 
        if ((netdev->flags & IFF_ALLMULTI) ||
-           (netdev->mc_count > GELIC_NET_MC_COUNT_MAX)) {
+           (netdev_mc_count(netdev) > GELIC_NET_MC_COUNT_MAX)) {
                status = lv1_net_add_multicast_address(bus_id(card),
                                                       dev_id(card),
                                                       0, 1);
@@ -580,9 +581,9 @@ void gelic_net_set_multi(struct net_device *netdev)
        }
 
        /* set multicast addresses */
-       for (mc = netdev->mc_list; mc; mc = mc->next) {
+       netdev_for_each_mc_addr(ha, netdev) {
                addr = 0;
-               p = mc->dmi_addr;
+               p = ha->addr;
                for (i = 0; i < ETH_ALEN; i++) {
                        addr <<= 8;
                        addr |= *p++;
@@ -902,9 +903,6 @@ int gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
                gelic_descr_release_tx(card, descr->next);
                card->tx_chain.tail = descr->next->next;
                dev_info(ctodev(card), "%s: kick failure\n", __func__);
-       } else {
-               /* OK, DMA started/reserved */
-               netdev->trans_start = jiffies;
        }
 
        spin_unlock_irqrestore(&card->tx_lock, flags);
@@ -1434,7 +1432,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work)
                container_of(work, struct gelic_card, tx_timeout_task);
        struct net_device *netdev = card->netdev[GELIC_PORT_ETHERNET_0];
 
-       dev_info(ctodev(card), "%s:Timed out. Restarting... \n", __func__);
+       dev_info(ctodev(card), "%s:Timed out. Restarting...\n", __func__);
 
        if (!(netdev->flags & IFF_UP))
                goto out;