]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "iwlwifi: move _agn statistics related structure"
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Jun 2010 17:55:37 +0000 (13:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Jun 2010 17:55:37 +0000 (13:55 -0400)
commit312ee61314f2befae8f9906d533b28da27d55d8f
treefea2e19e1c4c7d24cdf48c8bf32e30d5b26cd859
parented1244c0c3697c43bc36c1ee5d0940d89170a54b
Revert "iwlwifi: move _agn statistics related structure"

This reverts commit dca428cab110823bf9cd2f55de11abd5c0de7514.

when CONFIG_IWLAGN=n:

drivers/net/wireless/iwlwifi/iwl-rx.c:254: error: 'struct iwl_priv' has no member named '_agn'
drivers/net/wireless/iwlwifi/iwl-rx.c:303: error: 'struct iwl_priv' has no member named '_agn'
drivers/net/wireless/iwlwifi/iwl-rx.c:304: error: 'struct iwl_priv' has no member named '_agn'
drivers/net/wireless/iwlwifi/iwl-rx.c:305: error: 'struct iwl_priv' has no member named '_agn'
drivers/net/wireless/iwlwifi/iwl-rx.c:306: error: 'struct iwl_priv' has no member named '_agn'

and many more.

Conflicts:

drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-rx.c

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-rx.c