ACK: [Oneiric][SRU][LBM][PATCH 1/1] UBUNTU: Enable iwlwifi for compat-wireless-3.2

[Brad Figg]

On 02/01/2012 08:56 AM, leann.ogasawara at canonical.com wrote:
> From: Leann Ogasawara<leann.ogasawara at canonical.com>
>
> BugLink: http://bugs.launchpad.net/bugs/923900
>
> Per LP:918351 we provided the v3.2 compat-wireless stack via LBM for
> Oneiric. Unfortunately the iwlwifi drivers were not enabled. This is due
> to the fact that in v3.2, iwlagn was renamed to iwlwifi and the
> corresponding config names were also updated to reflect this re-name,
> ie:
>
>    commit 3c607d27c818cf4a5d28f2c73b18a88f8fbdfa33
>    Author: Don Fry<donald.h.fry at intel.com>
>    Date: Fri Sep 30 11:40:20 2011 -0700
>
>      iwlagn: rename iwlagn module iwlwifi and alias to iwlagn.
>
>      Rename the iwlagn module as iwlwifi in preparation for future
>      changes. Add an alias to iwlagn for backward compatibility.
>
> As a result, the v3.2 compat-wirless stack enables iwlwifi if
> CONFIG_IWLWIFI. However, because CONFIG_IWLWIFI does not exist for
> Oneiric, the v3.2 compat-wireless version of iwlwifi was/is never built.
>
> Update the Makefiles to check for CONFIG_IWLAGN instead of
> CONFIG_IWLWIFI.
>
> Signed-off-by: Leann Ogasawara<leann.ogasawara at canonical.com>
> ---
>   updates/cw-3.2/drivers/net/wireless/Makefile       |    2 +-
>   .../cw-3.2/drivers/net/wireless/iwlwifi/Makefile   |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/updates/cw-3.2/drivers/net/wireless/Makefile b/updates/cw-3.2/drivers/net/wireless/Makefile
> index 619aed7..2338ea6 100644
> --- a/updates/cw-3.2/drivers/net/wireless/Makefile
> +++ b/updates/cw-3.2/drivers/net/wireless/Makefile
> @@ -26,7 +26,7 @@ obj-$(CONFIG_ADM8211)	+= adm8211.o
>
>   obj-$(CONFIG_MWL8K)	+= mwl8k.o
>
> -obj-$(CONFIG_IWLWIFI)	+= iwlwifi/
> +obj-$(CONFIG_IWLAGN)	+= iwlwifi/
>   obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwlegacy/
>   obj-$(CONFIG_RT2X00)	+= rt2x00/
>
> diff --git a/updates/cw-3.2/drivers/net/wireless/iwlwifi/Makefile b/updates/cw-3.2/drivers/net/wireless/iwlwifi/Makefile
> index c73e5ed..f406143 100644
> --- a/updates/cw-3.2/drivers/net/wireless/iwlwifi/Makefile
> +++ b/updates/cw-3.2/drivers/net/wireless/iwlwifi/Makefile
> @@ -1,5 +1,5 @@
>   # WIFI
> -obj-$(CONFIG_IWLWIFI)	+= iwlwifi.o
> +obj-$(CONFIG_IWLAGN)	+= iwlwifi.o
>   iwlwifi-objs		:= iwl-agn.o iwl-agn-rs.o
>   iwlwifi-objs		+= iwl-agn-ucode.o iwl-agn-tx.o
>   iwlwifi-objs		+= iwl-agn-lib.o iwl-agn-calib.o iwl-io.o


-- 
Brad Figg brad.figg at canonical.com http://www.canonical.com