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

[karo-tx-linux.git] / drivers / staging / slicoss / slicoss.c

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 09a9d759c61264ae29abff16e5ca451c4eca47aa..7daeced317c4ac050701cd8ab653e8f665ffc32a 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -658,8 +658,7 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
                        if (copy_from_user(data, rq->ifr_data, 28)) {
                                PRINT_ERROR
-                                   ("slic: copy_from_user FAILED getting \
-                                    initial simba param\n");
+                                   ("slic: copy_from_user FAILED getting initial simba param\n");
                                return -EFAULT;
                        }
 
@@ -674,8 +673,7 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                   (tracemon_request ==
                                    SLIC_DUMP_IN_PROGRESS)) {
                                PRINT_ERROR
-                                   ("ATK Diagnostic Trace Dump Requested but \
-                                    already in progress... ignore\n");
+                                   ("ATK Diagnostic Trace Dump Requested but already in progress... ignore\n");
                        } else {
                                PRINT_ERROR
                                    ("ATK Diagnostic Trace Dump Requested\n");
@@ -1368,25 +1366,17 @@ static void slic_mcast_set_list(struct net_device *dev)
 {
        struct adapter *adapter = netdev_priv(dev);
        int status = STATUS_SUCCESS;
-       int i;
        char *addresses;
-       struct dev_mc_list *mc_list = dev->mc_list;
-       int mc_count = dev->mc_count;
+       struct dev_mc_list *mc_list;
 
        ASSERT(adapter);
 
-       for (i = 1; i <= mc_count; i++) {
+       netdev_for_each_mc_addr(mc_list, dev) {
                addresses = (char *) &mc_list->dmi_addr;
-               if (mc_list->dmi_addrlen == 6) {
-                       status = slic_mcast_add_list(adapter, addresses);
-                       if (status != STATUS_SUCCESS)
-                               break;
-               } else {
-                       status = -EINVAL;
+               status = slic_mcast_add_list(adapter, addresses);
+               if (status != STATUS_SUCCESS)
                        break;
-               }
                slic_mcast_set_bit(adapter, addresses);
-               mc_list = mc_list->next;
        }
 
        if (adapter->devflags_prev != dev->flags) {
@@ -1866,6 +1856,9 @@ static int slic_card_download_gbrcv(struct adapter *adapter)
        return 0;
 }
 
+MODULE_FIRMWARE("slicoss/oasisrcvucode.sys");
+MODULE_FIRMWARE("slicoss/gbrcvucode.sys");
+
 static int slic_card_download(struct adapter *adapter)
 {
        const struct firmware *fw;
@@ -1977,6 +1970,9 @@ static int slic_card_download(struct adapter *adapter)
        return STATUS_SUCCESS;
 }
 
+MODULE_FIRMWARE("slicoss/oasisdownload.sys");
+MODULE_FIRMWARE("slicoss/gbdownload.sys");
+
 static void slic_adapter_set_hwaddr(struct adapter *adapter)
 {
        struct sliccard *card = adapter->card;