Re: [stable] [PATCH 2/2] iwlwifi: unify iwl_setup_rxon_timing

[Greg KH <greg@kroah.com>]

On Tue, Dec 15, 2009 at 03:02:17PM +0800, Ike Panhc wrote:
> Greg KH wrote:
> > On Tue, Dec 15, 2009 at 11:45:10AM +0800, Ike Panhc wrote:
> >> This patch unifies setup_rxon_timing funcions
> >> of AGN and 3945. HWs differ only in supported maximal
> >> beacon interval. This is reflected in hw_paras.max_beacon_itrvl
> >>
> >> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> >> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
> >> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> >> (cherry picked from commit 2c2f3b33888419fb9e7d015b9dc67b9db4437efa)
> >>
> >> Conflicts:
> >>
> >> 	drivers/net/wireless/iwlwifi/iwl-dev.h
> > 
> > What does this mean?
> > 
> After cherry-pick:
> 
> --- a/drivers/net/wireless/iwlwifi/iwl-dev.h
> +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
> @@@ -625,7 -608,7 +625,11 @@@ struct iwl_hw_params 
> 	u8  max_stations;
> 	u8  bcast_sta_id;
> 	u8 fat_channel;
> ++<<<<<<< HEAD:drivers/net/wireless/iwlwifi/iwl-dev.h
>  +	u8 sw_crypto;
> ++=======
> +	u8  max_beacon_itrvl;   /* in 1024 ms */
> ++>>>>>>> 2c2f3b3... iwlwifi: unify iwl_setup_rxon_timing:drivers/net/wireless/iwlwifi/iwl-dev.h
> 	u32 max_inst_size;
> 	u32 max_data_size;
> 	u32 max_bsm_size;
> 
> The sw_crypto is removed in the prior commit (90e8e4), and the commit
> is not in the stable tree. We still need sw_crypto.
> 
> So, the patch is modified to keep sw_crypto.

And why would we care?  We've never used this kind of marking before in
the kernel changelogs that I know of.

> >> CC: stable@kernel.org
> >> Signed-off-by: Ike Panhc <ike.pan@canonical.com>
> >>
> >> BugLink: http://bugs.launchpad.net/bugs/496496
> > 
> > What are you expecting this patch to be applied to?
> > 
> > confused,
> Please consider applying to linux-2.6.31.y

I need the subsystem maintainer to agree with this, have they?

thanks,

greg k-h