]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
iwlwifi: mvm: beautify code in rx_handlers
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 10 Feb 2013 11:25:25 +0000 (13:25 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 12 Feb 2013 15:52:26 +0000 (16:52 +0100)
Make the code more readable, and while at it also
add a missing "break" to avoid checking handlers
that cannot be used.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/iwlwifi/mvm/ops.c

index 983dca3f888a084c3a120c3c244ebe7b826ae4aa..aa59adf87db333f66b0a2e925ddd66afd574ae60 100644 (file)
@@ -536,25 +536,28 @@ static int iwl_mvm_rx_dispatch(struct iwl_op_mode *op_mode,
 
        for (i = 0; i < ARRAY_SIZE(iwl_mvm_rx_handlers); i++) {
                const struct iwl_rx_handlers *rx_h = &iwl_mvm_rx_handlers[i];
-               if (rx_h->cmd_id == pkt->hdr.cmd) {
-                       struct iwl_async_handler_entry *entry;
-                       if (!rx_h->async)
-                               return rx_h->fn(mvm, rxb, cmd);
-
-                       entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-                       /* we can't do much... */
-                       if (!entry)
-                               return 0;
-
-                       entry->rxb._page = rxb_steal_page(rxb);
-                       entry->rxb._offset = rxb->_offset;
-                       entry->rxb._rx_page_order = rxb->_rx_page_order;
-                       entry->fn = rx_h->fn;
-                       spin_lock(&mvm->async_handlers_lock);
-                       list_add_tail(&entry->list, &mvm->async_handlers_list);
-                       spin_unlock(&mvm->async_handlers_lock);
-                       schedule_work(&mvm->async_handlers_wk);
-               }
+               struct iwl_async_handler_entry *entry;
+
+               if (rx_h->cmd_id != pkt->hdr.cmd)
+                       continue;
+
+               if (!rx_h->async)
+                       return rx_h->fn(mvm, rxb, cmd);
+
+               entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
+               /* we can't do much... */
+               if (!entry)
+                       return 0;
+
+               entry->rxb._page = rxb_steal_page(rxb);
+               entry->rxb._offset = rxb->_offset;
+               entry->rxb._rx_page_order = rxb->_rx_page_order;
+               entry->fn = rx_h->fn;
+               spin_lock(&mvm->async_handlers_lock);
+               list_add_tail(&entry->list, &mvm->async_handlers_list);
+               spin_unlock(&mvm->async_handlers_lock);
+               schedule_work(&mvm->async_handlers_wk);
+               break;
        }
 
        return 0;