Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Side by Side Diff: chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-dev.h

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /****************************************************************************** 1 /******************************************************************************
2 * 2 *
3 * Copyright(c) 2003 - 2010 Intel Corporation. All rights reserved. 3 * Copyright(c) 2003 - 2010 Intel Corporation. All rights reserved.
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of version 2 of the GNU General Public License as 6 * under the terms of version 2 of the GNU General Public License as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, but WITHOUT 9 * This program is distributed in the hope that it will be useful, but WITHOUT
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
(...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 #define IWL_MAX_PLCP_ERR_THRESHOLD_DEF (50) 1042 #define IWL_MAX_PLCP_ERR_THRESHOLD_DEF (50)
1043 #define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF (100) 1043 #define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF (100)
1044 #define IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF (200) 1044 #define IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF (200)
1045 #define IWL_MAX_PLCP_ERR_THRESHOLD_MAX (255) 1045 #define IWL_MAX_PLCP_ERR_THRESHOLD_MAX (255)
1046 #define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE (0) 1046 #define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE (0)
1047 1047
1048 #define IWL_DELAY_NEXT_FORCE_RF_RESET (HZ*3) 1048 #define IWL_DELAY_NEXT_FORCE_RF_RESET (HZ*3)
1049 #define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5) 1049 #define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)
1050 1050
1051 /* timer constants use to monitor and recover stuck tx queues in mSecs */ 1051 /* timer constants use to monitor and recover stuck tx queues in mSecs */
1052 #define IWL_MONITORING_PERIOD (1000) 1052 #define IWL_DEF_MONITORING_PERIOD» (1000)
1053 #define IWL_LONG_MONITORING_PERIOD» (5000)
1053 #define IWL_ONE_HUNDRED_MSECS (100) 1054 #define IWL_ONE_HUNDRED_MSECS (100)
1054 #define IWL_SIXTY_SECS (60000) 1055 #define IWL_SIXTY_SECS (60000)
1055 1056
1056 enum iwl_reset { 1057 enum iwl_reset {
1057 IWL_RF_RESET = 0, 1058 IWL_RF_RESET = 0,
1058 IWL_FW_RESET, 1059 IWL_FW_RESET,
1059 IWL_MAX_FORCE_RESET, 1060 IWL_MAX_FORCE_RESET,
1060 }; 1061 };
1061 1062
1062 struct iwl_force_reset { 1063 struct iwl_force_reset {
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1495 __free_pages(page, priv->hw_params.rx_page_order); 1496 __free_pages(page, priv->hw_params.rx_page_order);
1496 priv->alloc_rxb_page--; 1497 priv->alloc_rxb_page--;
1497 } 1498 }
1498 1499
1499 static inline void iwl_free_pages(struct iwl_priv *priv, unsigned long page) 1500 static inline void iwl_free_pages(struct iwl_priv *priv, unsigned long page)
1500 { 1501 {
1501 free_pages(page, priv->hw_params.rx_page_order); 1502 free_pages(page, priv->hw_params.rx_page_order);
1502 priv->alloc_rxb_page--; 1503 priv->alloc_rxb_page--;
1503 } 1504 }
1504 #endif /* __iwl_dev_h__ */ 1505 #endif /* __iwl_dev_h__ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698