Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / ps3_gelic_net.c

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 5bf229bb34c26e55879ddc62e13be82183e028c7..022317db46738dbadaffac7990b1d3eacf591bac 100644 (file)
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -327,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);
 
@@ -547,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;
@@ -581,9 +581,9 @@ void gelic_net_set_multi(struct net_device *netdev)
        }
 
        /* set multicast addresses */
-       netdev_for_each_mc_addr(mc, netdev) {
+       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++;
@@ -1435,7 +1435,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;