[PATCH 1/2] compat-wireless: backport pm_qos_{add,remove,update}_request

[PATCH 1/2] compat-wireless: backport pm_qos_{add,remove,update}_request

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
I have not found a way to backport these changes without using these ifdef.
 patches/28-pm-qos-params.patch |   89 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)
 create mode 100644 patches/28-pm-qos-params.patch

diff --git a/patches/28-pm-qos-params.patch b/patches/28-pm-qos-params.patch
new file mode 100644
index 0000000..4c3966a
--- /dev/null
+++ b/patches/28-pm-qos-params.patch
@@ -0,0 +1,89 @@
+--- a/drivers/net/wireless/ipw2x00/ipw2100.c
++++ b/drivers/net/wireless/ipw2x00/ipw2100.c
+@@ -174,7 +174,9 @@ that only one external action is invoked
+ #define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 2100 Network Driver"
+ #define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ struct pm_qos_request_list *ipw2100_pm_qos_req;
++#endif
+ 
+ /* Debugging stuff */
+ #ifdef CONFIG_IPW2100_DEBUG
+@@ -1741,7 +1743,11 @@ static int ipw2100_up(struct ipw2100_pri
+ 	/* the ipw2100 hardware really doesn't want power management delays
+ 	 * longer than 175usec
+ 	 */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ 	pm_qos_update_request(ipw2100_pm_qos_req, 175);
++#else
++	pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100", 175);
++#endif
+ 
+ 	/* If the interrupt is enabled, turn it off... */
+ 	spin_lock_irqsave(&priv->low_lock, flags);
+@@ -1889,7 +1895,12 @@ static void ipw2100_down(struct ipw2100_
+ 	ipw2100_disable_interrupts(priv);
+ 	spin_unlock_irqrestore(&priv->low_lock, flags);
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ 	pm_qos_update_request(ipw2100_pm_qos_req, PM_QOS_DEFAULT_VALUE);
++#else
++	pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
++			PM_QOS_DEFAULT_VALUE);
++#endif
+ 
+ 	/* We have to signal any supplicant if we are disassociating */
+ 	if (associated)
+@@ -6674,7 +6685,11 @@ static int __init ipw2100_init(void)
+ 	if (ret)
+ 		goto out;
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ 	ipw2100_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
++#else
++	pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
++#endif
+ 			PM_QOS_DEFAULT_VALUE);
+ #ifdef CONFIG_IPW2100_DEBUG
+ 	ipw2100_debug_level = debug;
+@@ -6697,7 +6712,11 @@ static void __exit ipw2100_exit(void)
+ 			   &driver_attr_debug_level);
+ #endif
+ 	pci_unregister_driver(&ipw2100_pci_driver);
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ 	pm_qos_remove_request(ipw2100_pm_qos_req);
++#else
++	pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100");
++#endif
+ }
+ 
+ module_init(ipw2100_init);
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -509,7 +509,11 @@ void ieee80211_recalc_ps(struct ieee8021
+ 		s32 beaconint_us;
+ 
+ 		if (latency < 0)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ 			latency = pm_qos_request(PM_QOS_NETWORK_LATENCY);
++#else
++			latency = pm_qos_requirement(PM_QOS_NETWORK_LATENCY);
++#endif
+ 
+ 		beaconint_us = ieee80211_tu_to_usec(
+ 					found->vif.bss_conf.beacon_int);
+--- a/net/mac80211/scan.c
++++ b/net/mac80211/scan.c
+@@ -510,7 +510,11 @@ static int ieee80211_scan_state_decision
+ 		bad_latency = time_after(jiffies +
+ 				ieee80211_scan_get_channel_time(next_chan),
+ 				local->leave_oper_channel_time +
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ 				usecs_to_jiffies(pm_qos_request(PM_QOS_NETWORK_LATENCY)));
++#else
++				usecs_to_jiffies(pm_qos_requirement(PM_QOS_NETWORK_LATENCY)));
++#endif
+ 
+ 		listen_int_exceeded = time_after(jiffies +
+ 				ieee80211_scan_get_channel_time(next_chan),
-- 
1.7.0.4

[PATCH 2/2] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/07-change-default-rate-alg.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/07-change-default-rate-alg.patch b/patches/07-change-default-rate-alg.patch
index af65207..f0ccbce 100644
--- a/patches/07-change-default-rate-alg.patch
+++ b/patches/07-change-default-rate-alg.patch
@@ -21,7 +21,7 @@ at compilation time.
  module_param(ieee80211_default_rc_algo, charp, 0644);
  MODULE_PARM_DESC(ieee80211_default_rc_algo,
  		 "Default rate control algorithm for mac80211 to use");
-@@ -118,8 +118,8 @@ ieee80211_rate_control_ops_get(const cha
+@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
  		ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
  
  	/* try built-in one if specific alg requested but not found */
@@ -29,6 +29,6 @@ at compilation time.
 -		ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
 +	if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
 +		ops = ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT);
+ 	kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
  
  	return ops;
- }
-- 
1.7.0.4

Re: [PATCH 2/2] compat-wireless: make patches apply again

[Bruno Randolf]

On Tuesday 11 May 2010 06:24:10 Hauke Mehrtens wrote:
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
>  patches/07-change-default-rate-alg.patch |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/patches/07-change-default-rate-alg.patch
> b/patches/07-change-default-rate-alg.patch index af65207..f0ccbce 100644
> --- a/patches/07-change-default-rate-alg.patch
> +++ b/patches/07-change-default-rate-alg.patch
> @@ -21,7 +21,7 @@ at compilation time.
>   module_param(ieee80211_default_rc_algo, charp, 0644);
>   MODULE_PARM_DESC(ieee80211_default_rc_algo,
>   		 "Default rate control algorithm for mac80211 to use");
> -@@ -118,8 +118,8 @@ ieee80211_rate_control_ops_get(const cha
> +@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
>   		ops = 
ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
> 
>   	/* try built-in one if specific alg requested but not found */
> @@ -29,6 +29,6 @@ at compilation time.
>  -		ops = 
ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
>  +	if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
>  +		ops =
> ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT); +
> 	kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
> 
>   	return ops;
> - }

this is somehow messed up and doesn't apply. here is a fixed version of the 
patch (not a patch for a patch)...

---

Your current kernels configuration (.config and linux/autoconf.h)
are always respected when compiling external modules. Because
of this if you are using an old kernel which preferred the
PID rate control algorithm we cannot force it to use minstrel
instead. Minstrel is now the default rate control algorithm
and we want you to use it. To let you use it we redefine here
the CONFIG_MAC80211_RC_DEFAULT to CONFIG_COMPAT_MAC80211_RC_DEFAULT
and define CONFIG_COMPAT_MAC80211_RC_DEFAULT on config.mk.
Through the compat autoconf we then get it also defined there
at compilation time.

--- a/net/mac80211/rate.c	2010-05-12 16:27:02.245747971 +0900
+++ b/net/mac80211/rate.c	2010-05-12 17:00:45.855748158 +0900
@@ -23,7 +23,7 @@
 static LIST_HEAD(rate_ctrl_algs);
 static DEFINE_MUTEX(rate_ctrl_mutex);
 
-static char *ieee80211_default_rc_algo = CONFIG_MAC80211_RC_DEFAULT;
+static char *ieee80211_default_rc_algo = CONFIG_COMPAT_MAC80211_RC_DEFAULT;
 module_param(ieee80211_default_rc_algo, charp, 0644);
 MODULE_PARM_DESC(ieee80211_default_rc_algo,
 		 "Default rate control algorithm for mac80211 to use");
@@ -118,8 +118,8 @@
 		ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
 
 	/* try built-in one if specific alg requested but not found */
-	if (!ops && strlen(CONFIG_MAC80211_RC_DEFAULT))
-		ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
+	if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
+		ops = 
ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT);
 
 	return ops;
 }

Re: [PATCH 2/2] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Wed, May 12, 2010 at 1:20 AM, Bruno Randolf <br1@einfach.org> wrote:
> On Tuesday 11 May 2010 06:24:10 Hauke Mehrtens wrote:
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> ---
>>  patches/07-change-default-rate-alg.patch |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/patches/07-change-default-rate-alg.patch
>> b/patches/07-change-default-rate-alg.patch index af65207..f0ccbce 100644
>> --- a/patches/07-change-default-rate-alg.patch
>> +++ b/patches/07-change-default-rate-alg.patch
>> @@ -21,7 +21,7 @@ at compilation time.
>>   module_param(ieee80211_default_rc_algo, charp, 0644);
>>   MODULE_PARM_DESC(ieee80211_default_rc_algo,
>>                "Default rate control algorithm for mac80211 to use");
>> -@@ -118,8 +118,8 @@ ieee80211_rate_control_ops_get(const cha
>> +@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
>>               ops =
> ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
>>
>>       /* try built-in one if specific alg requested but not found */
>> @@ -29,6 +29,6 @@ at compilation time.
>>  -            ops =
> ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
>>  +    if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
>>  +            ops =
>> ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT); +
>>       kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
>>
>>       return ops;
>> - }
>
> this is somehow messed up and doesn't apply. here is a fixed version of the
> patch (not a patch for a patch)...

Odd, it applied, here with git am and all. Hm, oh well.

  Luis

Re: [PATCH 2/2] compat-wireless: make patches apply again

[Bruno Randolf]

On Thursday 13 May 2010 01:28:18 Luis R. Rodriguez wrote:
> On Wed, May 12, 2010 at 1:20 AM, Bruno Randolf <br1@einfach.org> wrote:
> > On Tuesday 11 May 2010 06:24:10 Hauke Mehrtens wrote:
> >> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> >> ---
> >>  patches/07-change-default-rate-alg.patch |    4 ++--
> >>  1 files changed, 2 insertions(+), 2 deletions(-)
> >> 
> >> diff --git a/patches/07-change-default-rate-alg.patch
> >> b/patches/07-change-default-rate-alg.patch index af65207..f0ccbce 100644
> >> --- a/patches/07-change-default-rate-alg.patch
> >> +++ b/patches/07-change-default-rate-alg.patch
> >> @@ -21,7 +21,7 @@ at compilation time.
> >>   module_param(ieee80211_default_rc_algo, charp, 0644);
> >>   MODULE_PARM_DESC(ieee80211_default_rc_algo,
> >>                "Default rate control algorithm for mac80211 to use");
> >> -@@ -118,8 +118,8 @@ ieee80211_rate_control_ops_get(const cha
> >> +@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
> >>               ops =
> > 
> > ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
> > 
> >>       /* try built-in one if specific alg requested but not found */
> >> @@ -29,6 +29,6 @@ at compilation time.
> >>  -            ops =
> > 
> > ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
> > 
> >>  +    if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
> >>  +            ops =
> >> ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT); +
> >>       kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
> >> 
> >>       return ops;
> >> - }
> > 
> > this is somehow messed up and doesn't apply. here is a fixed version of
> > the patch (not a patch for a patch)...
> 
> Odd, it applied, here with git am and all. Hm, oh well.

sorry, i wasn't clear about it. the patch from the mail obviously applied and 
i got it by git pull. but the resulting patch "07-change-default-rate-
alg.patch" does not apply any more, so i sent a fixed up version of that file.

bruno

Re: [PATCH 2/2] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Wed, May 12, 2010 at 06:00:57PM -0700, Bruno Randolf wrote:
> On Thursday 13 May 2010 01:28:18 Luis R. Rodriguez wrote:
> > On Wed, May 12, 2010 at 1:20 AM, Bruno Randolf <br1@einfach.org> wrote:
> > > On Tuesday 11 May 2010 06:24:10 Hauke Mehrtens wrote:
> > >> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> > >> ---
> > >>  patches/07-change-default-rate-alg.patch |    4 ++--
> > >>  1 files changed, 2 insertions(+), 2 deletions(-)
> > >> 
> > >> diff --git a/patches/07-change-default-rate-alg.patch
> > >> b/patches/07-change-default-rate-alg.patch index af65207..f0ccbce 100644
> > >> --- a/patches/07-change-default-rate-alg.patch
> > >> +++ b/patches/07-change-default-rate-alg.patch
> > >> @@ -21,7 +21,7 @@ at compilation time.
> > >>   module_param(ieee80211_default_rc_algo, charp, 0644);
> > >>   MODULE_PARM_DESC(ieee80211_default_rc_algo,
> > >>                "Default rate control algorithm for mac80211 to use");
> > >> -@@ -118,8 +118,8 @@ ieee80211_rate_control_ops_get(const cha
> > >> +@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
> > >>               ops =
> > > 
> > > ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
> > > 
> > >>       /* try built-in one if specific alg requested but not found */
> > >> @@ -29,6 +29,6 @@ at compilation time.
> > >>  -            ops =
> > > 
> > > ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
> > > 
> > >>  +    if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
> > >>  +            ops =
> > >> ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT); +
> > >>       kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
> > >> 
> > >>       return ops;
> > >> - }
> > > 
> > > this is somehow messed up and doesn't apply. here is a fixed version of
> > > the patch (not a patch for a patch)...
> > 
> > Odd, it applied, here with git am and all. Hm, oh well.
> 
> sorry, i wasn't clear about it. the patch from the mail obviously applied and 
> i got it by git pull. but the resulting patch "07-change-default-rate-
> alg.patch" does not apply any more, so i sent a fixed up version of that file.

Sorry I'm still a little lost still, can you post any pending patch on a
new e-mail ?

  Luis

Re: [PATCH 1/2] compat-wireless: backport pm_qos_{add,remove,update}_request

[Luis R. Rodriguez]

You rock dude, thanks a lot! All 4 patches applied and pushed.

  Luis

On Mon, May 10, 2010 at 2:24 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> I have not found a way to backport these changes without using these ifdef.
>  patches/28-pm-qos-params.patch |   89 ++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 89 insertions(+), 0 deletions(-)
>  create mode 100644 patches/28-pm-qos-params.patch
>
> diff --git a/patches/28-pm-qos-params.patch b/patches/28-pm-qos-params.patch
> new file mode 100644
> index 0000000..4c3966a
> --- /dev/null
> +++ b/patches/28-pm-qos-params.patch
> @@ -0,0 +1,89 @@
> +--- a/drivers/net/wireless/ipw2x00/ipw2100.c
> ++++ b/drivers/net/wireless/ipw2x00/ipw2100.c
> +@@ -174,7 +174,9 @@ that only one external action is invoked
> + #define DRV_DESCRIPTION       "Intel(R) PRO/Wireless 2100 Network Driver"
> + #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation"
> +
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
> + struct pm_qos_request_list *ipw2100_pm_qos_req;
> ++#endif
> +
> + /* Debugging stuff */
> + #ifdef CONFIG_IPW2100_DEBUG
> +@@ -1741,7 +1743,11 @@ static int ipw2100_up(struct ipw2100_pri
> +       /* the ipw2100 hardware really doesn't want power management delays
> +        * longer than 175usec
> +        */
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
> +       pm_qos_update_request(ipw2100_pm_qos_req, 175);
> ++#else
> ++      pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100", 175);
> ++#endif
> +
> +       /* If the interrupt is enabled, turn it off... */
> +       spin_lock_irqsave(&priv->low_lock, flags);
> +@@ -1889,7 +1895,12 @@ static void ipw2100_down(struct ipw2100_
> +       ipw2100_disable_interrupts(priv);
> +       spin_unlock_irqrestore(&priv->low_lock, flags);
> +
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
> +       pm_qos_update_request(ipw2100_pm_qos_req, PM_QOS_DEFAULT_VALUE);
> ++#else
> ++      pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
> ++                      PM_QOS_DEFAULT_VALUE);
> ++#endif
> +
> +       /* We have to signal any supplicant if we are disassociating */
> +       if (associated)
> +@@ -6674,7 +6685,11 @@ static int __init ipw2100_init(void)
> +       if (ret)
> +               goto out;
> +
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
> +       ipw2100_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
> ++#else
> ++      pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
> ++#endif
> +                       PM_QOS_DEFAULT_VALUE);
> + #ifdef CONFIG_IPW2100_DEBUG
> +       ipw2100_debug_level = debug;
> +@@ -6697,7 +6712,11 @@ static void __exit ipw2100_exit(void)
> +                          &driver_attr_debug_level);
> + #endif
> +       pci_unregister_driver(&ipw2100_pci_driver);
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
> +       pm_qos_remove_request(ipw2100_pm_qos_req);
> ++#else
> ++      pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100");
> ++#endif
> + }
> +
> + module_init(ipw2100_init);
> +--- a/net/mac80211/mlme.c
> ++++ b/net/mac80211/mlme.c
> +@@ -509,7 +509,11 @@ void ieee80211_recalc_ps(struct ieee8021
> +               s32 beaconint_us;
> +
> +               if (latency < 0)
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
> +                       latency = pm_qos_request(PM_QOS_NETWORK_LATENCY);
> ++#else
> ++                      latency = pm_qos_requirement(PM_QOS_NETWORK_LATENCY);
> ++#endif
> +
> +               beaconint_us = ieee80211_tu_to_usec(
> +                                       found->vif.bss_conf.beacon_int);
> +--- a/net/mac80211/scan.c
> ++++ b/net/mac80211/scan.c
> +@@ -510,7 +510,11 @@ static int ieee80211_scan_state_decision
> +               bad_latency = time_after(jiffies +
> +                               ieee80211_scan_get_channel_time(next_chan),
> +                               local->leave_oper_channel_time +
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
> +                               usecs_to_jiffies(pm_qos_request(PM_QOS_NETWORK_LATENCY)));
> ++#else
> ++                              usecs_to_jiffies(pm_qos_requirement(PM_QOS_NETWORK_LATENCY)));
> ++#endif
> +
> +               listen_int_exceeded = time_after(jiffies +
> +                               ieee80211_scan_get_channel_time(next_chan),
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

[PATCH 1/2] compat-wireless: backport sock_recv_ts_and_drops in compat

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/16-bluetooth.patch |   60 +++++++++++++------------------------------
 1 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 8bdc530..e58ccc6 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -56,19 +56,7 @@ here still, but for now we keep this here.
  		bt_sock_reclassify_lock(sock, proto);
  		module_put(bt_proto[proto]->owner);
  	}
-@@ -257,7 +265,11 @@ int bt_sock_recvmsg(struct kiocb *iocb, 
- 	skb_reset_transport_header(skb);
- 	err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
- 	if (err == 0)
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))
- 		sock_recv_ts_and_drops(msg, sk, skb);
-+#else
-+		sock_recv_timestamp(msg, sk, skb);
-+#endif
- 
- 	skb_free_datagram(sk, skb);
- 
-@@ -336,7 +348,11 @@ int bt_sock_ioctl(struct socket *sock, u
+@@ -445,7 +457,11 @@ int bt_sock_ioctl(struct socket *sock, u
  		if (sk->sk_state == BT_LISTEN)
  			return -EINVAL;
  
@@ -138,7 +126,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/hci_sysfs.c
 +++ b/net/bluetooth/hci_sysfs.c
-@@ -71,7 +71,11 @@ static struct attribute_group bt_link_gr
+@@ -69,7 +69,11 @@ static struct attribute_group bt_link_gr
  	.attrs = bt_link_attrs,
  };
  
@@ -150,7 +138,7 @@ here still, but for now we keep this here.
  	&bt_link_group,
  	NULL
  };
-@@ -129,7 +133,11 @@ static void del_conn(struct work_struct 
+@@ -127,7 +131,11 @@ static void del_conn(struct work_struct 
  		dev = device_find_child(&conn->dev, NULL, __match_tty);
  		if (!dev)
  			break;
@@ -162,7 +150,7 @@ here still, but for now we keep this here.
  		put_device(dev);
  	}
  
-@@ -381,7 +389,11 @@ static struct attribute_group bt_host_gr
+@@ -377,7 +385,11 @@ static struct attribute_group bt_host_gr
  	.attrs = bt_host_attrs,
  };
  
@@ -287,7 +275,7 @@ here still, but for now we keep this here.
  static int hidp_parse(struct hid_device *hid)
  {
  	struct hidp_session *session = hid->driver_data;
-@@ -815,6 +896,7 @@ fault:
+@@ -811,6 +892,7 @@ fault:
  
  	return err;
  }
@@ -295,7 +283,7 @@ here still, but for now we keep this here.
  
  int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock)
  {
-@@ -833,6 +915,39 @@ int hidp_add_connection(struct hidp_conn
+@@ -829,6 +911,39 @@ int hidp_add_connection(struct hidp_conn
  
  	BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size);
  
@@ -335,7 +323,7 @@ here still, but for now we keep this here.
  	down_write(&hidp_session_sem);
  
  	s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst);
-@@ -860,6 +975,7 @@ int hidp_add_connection(struct hidp_conn
+@@ -856,6 +971,7 @@ int hidp_add_connection(struct hidp_conn
  	session->flags   = req->flags & (1 << HIDP_BLUETOOTH_VENDOR_ID);
  	session->idle_to = req->idle_to;
  
@@ -343,7 +331,7 @@ here still, but for now we keep this here.
  	if (req->rd_size > 0) {
  		err = hidp_setup_hid(session, req);
  		if (err && err != -ENODEV)
-@@ -871,6 +987,16 @@ int hidp_add_connection(struct hidp_conn
+@@ -867,6 +983,16 @@ int hidp_add_connection(struct hidp_conn
  		if (err < 0)
  			goto purge;
  	}
@@ -360,7 +348,7 @@ here still, but for now we keep this here.
  
  	__hidp_link_session(session);
  
-@@ -902,6 +1028,7 @@ unlink:
+@@ -898,6 +1024,7 @@ unlink:
  		session->input = NULL;
  	}
  
@@ -368,7 +356,7 @@ here still, but for now we keep this here.
  	if (session->hid) {
  		hid_destroy_device(session->hid);
  		session->hid = NULL;
-@@ -913,10 +1040,15 @@ unlink:
+@@ -909,10 +1036,15 @@ unlink:
  purge:
  	skb_queue_purge(&session->ctrl_transmit);
  	skb_queue_purge(&session->intr_transmit);
@@ -384,7 +372,7 @@ here still, but for now we keep this here.
  	input_free_device(session->input);
  	kfree(session);
  	return err;
-@@ -1006,6 +1138,7 @@ int hidp_get_conninfo(struct hidp_connin
+@@ -1002,6 +1134,7 @@ int hidp_get_conninfo(struct hidp_connin
  	return err;
  }
  
@@ -392,7 +380,7 @@ here still, but for now we keep this here.
  static const struct hid_device_id hidp_table[] = {
  	{ HID_BLUETOOTH_DEVICE(HID_ANY_ID, HID_ANY_ID) },
  	{ }
-@@ -1015,6 +1148,7 @@ static struct hid_driver hidp_driver = {
+@@ -1011,6 +1144,7 @@ static struct hid_driver hidp_driver = {
  	.name = "generic-bluetooth",
  	.id_table = hidp_table,
  };
@@ -400,7 +388,7 @@ here still, but for now we keep this here.
  
  static int __init hidp_init(void)
  {
-@@ -1024,11 +1158,14 @@ static int __init hidp_init(void)
+@@ -1020,11 +1154,14 @@ static int __init hidp_init(void)
  
  	BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION);
  
@@ -415,7 +403,7 @@ here still, but for now we keep this here.
  	if (ret)
  		goto err_drv;
  
-@@ -1036,13 +1173,16 @@ static int __init hidp_init(void)
+@@ -1032,13 +1169,16 @@ static int __init hidp_init(void)
  err_drv:
  	hid_unregister_driver(&hidp_driver);
  err:
@@ -448,19 +436,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
  
-@@ -711,7 +716,11 @@ static int rfcomm_sock_recvmsg(struct ki
- 		copied += chunk;
- 		size   -= chunk;
- 
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))
- 		sock_recv_ts_and_drops(msg, sk, skb);
-+#else
-+		sock_recv_timestamp(msg, sk, skb);
-+#endif
- 
- 		if (!(flags & MSG_PEEK)) {
- 			atomic_sub(chunk, &sk->sk_rmem_alloc);
-@@ -774,7 +783,11 @@ static int rfcomm_sock_setsockopt_old(st
+@@ -682,7 +687,11 @@ static int rfcomm_sock_setsockopt_old(st
  	return err;
  }
  
@@ -474,7 +450,7 @@ here still, but for now we keep this here.
  	struct bt_security sec;
 --- a/net/bluetooth/rfcomm/tty.c
 +++ b/net/bluetooth/rfcomm/tty.c
-@@ -731,8 +731,12 @@ static int rfcomm_tty_open(struct tty_st
+@@ -729,8 +729,12 @@ static int rfcomm_tty_open(struct tty_st
  	remove_wait_queue(&dev->wait, &wait);
  
  	if (err == 0)
@@ -487,7 +463,7 @@ here still, but for now we keep this here.
  
  	rfcomm_tty_copy_pending(dev);
  
-@@ -752,7 +756,11 @@ static void rfcomm_tty_close(struct tty_
+@@ -750,7 +754,11 @@ static void rfcomm_tty_close(struct tty_
  
  	if (atomic_dec_and_test(&dev->opened)) {
  		if (dev->tty_dev->parent)
@@ -598,7 +574,7 @@ here still, but for now we keep this here.
  		return -EPERM;
  
  	sock->ops = &l2cap_sock_ops;
-@@ -2022,7 +2030,11 @@ static int l2cap_sock_setsockopt_old(str
+@@ -2042,7 +2050,11 @@ static int l2cap_sock_setsockopt_old(str
  	return err;
  }
  
-- 
1.7.0.4

[PATCH 2/2] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 crap/0002-ath9k-Add-pktlog-support.patch |   50 +++++++++++++++---------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index ada8850..0cecf34 100644
--- a/crap/0002-ath9k-Add-pktlog-support.patch
+++ b/crap/0002-ath9k-Add-pktlog-support.patch
@@ -105,7 +105,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  /*
   * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
-@@ -564,6 +565,7 @@ struct ath_ant_comb {
+@@ -563,6 +564,7 @@ struct ath_ant_comb {
  #define SC_OP_BT_PRIORITY_DETECTED   BIT(12)
  #define SC_OP_BT_SCAN		     BIT(13)
  #define SC_OP_ANI_RUN		     BIT(14)
@@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  /* Powersave flags */
  #define PS_WAIT_FOR_BEACON        BIT(0)
-@@ -642,6 +644,10 @@ struct ath_softc {
+@@ -639,6 +641,10 @@ struct ath_softc {
  #ifdef CONFIG_ATH9K_DEBUGFS
  	struct ath9k_debug debug;
  #endif
@@ -126,7 +126,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	struct ath_btcoex btcoex;
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1078,6 +1078,9 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -984,6 +984,9 @@ int ath9k_init_debug(struct ath_hw *ah)
  			sc, &fops_regdump))
  		goto err;
  
@@ -136,7 +136,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	return 0;
  err:
  	ath9k_exit_debug(ah);
-@@ -1089,6 +1092,7 @@ void ath9k_exit_debug(struct ath_hw *ah)
+@@ -995,6 +998,7 @@ void ath9k_exit_debug(struct ath_hw *ah)
  	struct ath_common *common = ath9k_hw_common(ah);
  	struct ath_softc *sc = (struct ath_softc *) common->priv;
  
@@ -161,7 +161,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2155,7 +2155,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 
+@@ -2129,7 +2129,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 
  		phybits |= AR_PHY_ERR_RADAR;
  	if (bits & ATH9K_RX_FILTER_PHYERR)
  		phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;
@@ -172,7 +172,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		REG_WRITE(ah, AR_RXCFG,
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -584,7 +584,7 @@ struct ath_hw_ops {
+@@ -573,7 +573,7 @@ struct ath_hw_ops {
  			    const void *ds0, dma_addr_t buf_addr,
  			    unsigned int qcu);
  	int (*proc_txdesc)(struct ath_hw *ah, void *ds,
@@ -181,7 +181,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	void (*set11n_txdesc)(struct ath_hw *ah, void *ds,
  			      u32 pktLen, enum ath9k_pkt_type type,
  			      u32 txPower, u32 keyIx,
-@@ -807,6 +807,8 @@ struct ath_hw {
+@@ -796,6 +796,8 @@ struct ath_hw {
  	 * this register when in sleep states.
  	 */
  	u32 WARegVal;
@@ -1223,7 +1223,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
 +#endif
 --- a/drivers/net/wireless/ath/ath9k/rc.c
 +++ b/drivers/net/wireless/ath/ath9k/rc.c
-@@ -610,7 +610,7 @@ static u8 ath_rc_setvalid_htrates(struct
+@@ -599,7 +599,7 @@ static u8 ath_rc_setvalid_htrates(struct
  static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
  			         struct ath_rate_priv *ath_rc_priv,
  				 const struct ath_rate_table *rate_table,
@@ -1232,7 +1232,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  {
  	u32 best_thruput, this_thruput, now_msec;
  	u8 rate, next_rate, best_rate, maxindex, minindex;
-@@ -701,6 +701,8 @@ static u8 ath_rc_get_highest_rix(struct 
+@@ -690,6 +690,8 @@ static u8 ath_rc_get_highest_rix(struct 
  
  	rate = ath_rc_priv->valid_rate_index[0];
  
@@ -1241,16 +1241,16 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	return rate;
  }
  
-@@ -792,7 +794,7 @@ static void ath_get_rate(void *priv, str
+@@ -781,7 +783,7 @@ static void ath_get_rate(void *priv, str
  	try_per_rate = 4;
  
- 	rate_table = sc->cur_rate_table;
+ 	rate_table = ath_rc_priv->rate_table;
 -	rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table, &is_probe);
 +	rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table, &is_probe, skb_get_queue_mapping(skb));
  
  	/*
  	 * If we're in HT mode and both us and our peer supports LDPC.
-@@ -1032,7 +1034,8 @@ static bool ath_rc_update_per(struct ath
+@@ -1031,7 +1033,8 @@ static void ath_debug_stat_retries(struc
  static void ath_rc_update_ht(struct ath_softc *sc,
  			     struct ath_rate_priv *ath_rc_priv,
  			     struct ieee80211_tx_info *tx_info,
@@ -1260,8 +1260,8 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  {
  	u32 now_msec = jiffies_to_msecs(jiffies);
  	int rate;
-@@ -1101,6 +1104,9 @@ static void ath_rc_update_ht(struct ath_
- 	ath_debug_stat_retries(sc, tx_rate, xretries, retries,
+@@ -1100,6 +1103,9 @@ static void ath_rc_update_ht(struct ath_
+ 	ath_debug_stat_retries(ath_rc_priv, tx_rate, xretries, retries,
  			       ath_rc_priv->per[tx_rate]);
  
 +	ath9k_pktlog_rcupdate(sc, ath_rc_priv, tx_rate,
@@ -1270,7 +1270,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  }
  
  static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
-@@ -1133,7 +1139,8 @@ static int ath_rc_get_rateindex(const st
+@@ -1132,7 +1138,8 @@ static int ath_rc_get_rateindex(const st
  static void ath_rc_tx_status(struct ath_softc *sc,
  			     struct ath_rate_priv *ath_rc_priv,
  			     struct ieee80211_tx_info *tx_info,
@@ -1280,7 +1280,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  {
  	const struct ath_rate_table *rate_table;
  	struct ieee80211_tx_rate *rates = tx_info->status.rates;
-@@ -1162,7 +1169,7 @@ static void ath_rc_tx_status(struct ath_
+@@ -1161,7 +1168,7 @@ static void ath_rc_tx_status(struct ath_
  				rix = ath_rc_get_rateindex(rate_table, &rates[i]);
  				ath_rc_update_ht(sc, ath_rc_priv, tx_info,
  						rix, xretries ? 1 : 2,
@@ -1289,7 +1289,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  			}
  		}
  	} else {
-@@ -1184,7 +1191,7 @@ static void ath_rc_tx_status(struct ath_
+@@ -1183,7 +1190,7 @@ static void ath_rc_tx_status(struct ath_
  		return;
  
  	rix = ath_rc_get_rateindex(rate_table, &rates[i]);
@@ -1298,7 +1298,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  }
  
  static const
-@@ -1401,7 +1408,8 @@ static void ath_tx_status(void *priv, st
+@@ -1393,7 +1400,8 @@ static void ath_tx_status(void *priv, st
  		tx_status = 1;
  
  	ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status,
@@ -1310,7 +1310,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	if (conf_is_ht(&sc->hw->conf) &&
 --- a/drivers/net/wireless/ath/ath9k/recv.c
 +++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -1627,6 +1627,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1630,6 +1630,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
  	struct ieee80211_rx_status *rxs;
  	struct ath_hw *ah = sc->sc_ah;
  	struct ath_common *common = ath9k_hw_common(ah);
@@ -1318,7 +1318,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	/*
  	 * The hw can techncically differ from common->hw when using ath9k
  	 * virtual wiphy so to account for that we iterate over the active
-@@ -1719,12 +1720,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1722,12 +1723,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
  				 dma_type);
  
  		skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
@@ -1346,7 +1346,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data,
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -437,6 +437,8 @@ static void ath_tx_complete_aggr(struct 
+@@ -436,6 +436,8 @@ static void ath_tx_complete_aggr(struct 
  			list_move_tail(&bf->list, &bf_head);
  		}
  
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (!txpending || (tid->state & AGGR_CLEANUP)) {
  			/*
  			 * complete the acked-ones/xretried ones; update
-@@ -2075,7 +2077,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2078,7 +2080,7 @@ static void ath_tx_processq(struct ath_s
  		ds = lastbf->bf_desc;
  
  		memset(&ts, 0, sizeof(ts));
@@ -1364,7 +1364,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (status == -EINPROGRESS) {
  			spin_unlock_bh(&txq->axq_lock);
  			break;
-@@ -2112,10 +2114,14 @@ static void ath_tx_processq(struct ath_s
+@@ -2115,10 +2117,14 @@ static void ath_tx_processq(struct ath_s
  			ath_tx_rc_status(bf, &ts, txok ? 0 : 1, txok, true);
  		}
  
@@ -1381,7 +1381,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  		ath_wake_mac80211_queue(sc, txq);
  
-@@ -2187,9 +2193,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2190,9 +2196,11 @@ void ath_tx_edma_tasklet(struct ath_soft
  	struct list_head bf_head;
  	int status;
  	int txok;
@@ -1394,7 +1394,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (status == -EINPROGRESS)
  			break;
  		if (status == -EIO) {
-@@ -2230,14 +2238,18 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2233,14 +2241,18 @@ void ath_tx_edma_tasklet(struct ath_soft
  			ath_tx_rc_status(bf, &txs, txok ? 0 : 1, txok, true);
  		}
  
-- 
1.7.0.4

[PATCH 1/2] compat-wireless: Remove extra config option for kfifo.

[Hauke Mehrtens]

kfifo is now build when CONFIG_COMPAT_KERNEL_36 is set.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 config.mk |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/config.mk b/config.mk
index 5f861ca..846d2e0 100644
--- a/config.mk
+++ b/config.mk
@@ -107,11 +107,6 @@ ifdef CONFIG_FW_LOADER
 endif #CONFIG_FW_LOADER
 endif #CONFIG_COMPAT_KERNEL_33
 
-ifdef CONFIG_COMPAT_KERNEL_36
-CONFIG_COMPAT_KFIFO=m
-endif #CONFIG_COMPAT_KERNEL_36
-
-
 # Wireless subsystem stuff
 CONFIG_MAC80211=m
 
-- 
1.7.1

[PATCH 2/2] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/99-change-makefiles.patch |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch
index dcdad19..be62e28 100644
--- a/patches/99-change-makefiles.patch
+++ b/patches/99-change-makefiles.patch
@@ -13,7 +13,7 @@ only the wireless stuff.
  obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
 --- a/drivers/net/usb/Makefile
 +++ b/drivers/net/usb/Makefile
-@@ -2,29 +2,7 @@
+@@ -2,30 +2,7 @@
  # Makefile for USB Network drivers
  #
  
@@ -42,6 +42,7 @@ only the wireless stuff.
 -obj-$(CONFIG_USB_SIERRA_NET)	+= sierra_net.o
 -obj-$(CONFIG_USB_NET_CX82310_ETH)	+= cx82310_eth.o
 -obj-$(CONFIG_USB_NET_CDC_NCM)	+= cdc_ncm.o
+-obj-$(CONFIG_USB_VL600)		+= lg-vl600.o
  
 --- a/drivers/net/wireless/Makefile
 +++ b/drivers/net/wireless/Makefile
-- 
1.7.1

Re: [PATCH 2/2] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Thu, Apr 7, 2011 at 7:39 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

applied and pushed thanks!

  Luis

[PATCH 1/2] compat-wireless: add config var for CORDIC and CRC8

[Hauke Mehrtens]

Sometimes the kernel version compat-wireless is build against has
support for cordic and crc8 in its source, but these modules where not
build when the kernel was build, because no one selected them. They are
needed for the bcmsmac driver and they should be build every time when
there is not an kernel module already.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 config.mk |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/config.mk b/config.mk
index 05edb79..5eabc51 100644
--- a/config.mk
+++ b/config.mk
@@ -657,6 +657,14 @@ endif #CONFIG_CRC7
 
 CONFIG_MWIFIEX=m
 
+ifndef CONFIG_CORDIC
+CONFIG_COMPAT_CORDIC=y
+endif #CONFIG_CORDIC
+
+ifndef CONFIG_CRC8
+CONFIG_COMPAT_CRC8=y
+endif #CONFIG_CRC8
+
 ifdef CONFIG_COMPAT_KERNEL_2_6_27
 CONFIG_LIBERTAS=n
 else #CONFIG_COMPAT_KERNEL_2_6_27
-- 
1.7.5.4

[PATCH 2/2] compat-wireless: make patches apply again

[Hauke Mehrtens]

many files in iwlegacy where renamed this causes our patches not
applying any more.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/08-rename-config-options.patch |   33 +++-------
 patches/11-dev-pm-ops.patch            |  110 ++++++++++++++++----------------
 patches/38-led-max-brightness.patch    |   16 ++--
 patches/39-remove_blink_set.patch      |   34 +++++-----
 4 files changed, 89 insertions(+), 104 deletions(-)

diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index d22d79a..fdd39ec 100644
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -24,41 +24,26 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  obj-$(CONFIG_RTLWIFI)		+= rtlwifi/
 --- a/drivers/net/wireless/iwlegacy/Makefile
 +++ b/drivers/net/wireless/iwlegacy/Makefile
-@@ -10,7 +10,7 @@ iwl-legacy-objs += $(iwl-legacy-m)
- CFLAGS_iwl-devtrace.o := -I$(src)
+@@ -5,7 +5,7 @@ iwlegacy-$(CONFIG_IWLEGACY_DEBUGFS) += d
+ iwlegacy-objs += $(iwlegacy-m)
  
  # 4965
 -obj-$(CONFIG_IWL4965)	+= iwl4965.o
 +obj-$(CONFIG_COMPAT_IWL4965)	+= iwl4965.o
- iwl4965-objs		:= iwl-4965.o iwl4965-base.o iwl-4965-rs.o iwl-4965-led.o
- iwl4965-objs		+= iwl-4965-ucode.o iwl-4965-tx.o
- iwl4965-objs		+= iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o
---- a/drivers/net/wireless/iwlegacy/iwl-dev.h
-+++ b/drivers/net/wireless/iwlegacy/iwl-dev.h
-@@ -1163,7 +1163,7 @@ struct iwl_priv {
+ iwl4965-objs		:= 4965.o 4965-mac.o 4965-rs.o 4965-calib.o
+ iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += 4965-debug.o
+ 
+--- a/drivers/net/wireless/iwlegacy/common.h
++++ b/drivers/net/wireless/iwlegacy/common.h
+@@ -1411,7 +1411,7 @@ struct il_priv {
  
  		} _3945;
  #endif
 -#if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE)
 +#if defined(CONFIG_COMPAT_IWL4965) || defined(CONFIG_COMPAT_IWL4965_MODULE)
  		struct {
- 			struct iwl_rx_phy_res last_phy_res;
+ 			struct il_rx_phy_res last_phy_res;
  			bool last_phy_res_valid;
---- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
-+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
-@@ -3211,10 +3211,10 @@ void iwl4965_txq_set_sched(struct iwl_pr
- 
- /* Hardware specific file defines the PCI IDs table for that hardware module */
- static DEFINE_PCI_DEVICE_TABLE(iwl4965_hw_card_ids) = {
--#if defined(CONFIG_IWL4965_MODULE) || defined(CONFIG_IWL4965)
-+#if defined(CONFIG_COMPAT_IWL4965_MODULE) || defined(CONFIG_COMPAT_IWL4965)
- 	{IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_cfg)},
- 	{IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_cfg)},
--#endif /* CONFIG_IWL4965 */
-+#endif /* CONFIG_COMPAT_IWL4965 */
- 
- 	{0}
- };
 --- a/drivers/net/wireless/libertas/Makefile
 +++ b/drivers/net/wireless/libertas/Makefile
 @@ -16,5 +16,5 @@ libertas_spi-objs += if_spi.o
diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 294aaba..756ee7d 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -9,7 +9,7 @@ calls on compat code with only slight modifications.
 
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2897,6 +2897,9 @@ static struct pci_error_handlers atl1c_e
+@@ -2900,6 +2900,9 @@ static struct pci_error_handlers atl1c_e
  
  static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
  
@@ -19,7 +19,7 @@ calls on compat code with only slight modifications.
  static struct pci_driver atl1c_driver = {
  	.name     = atl1c_driver_name,
  	.id_table = atl1c_pci_tbl,
-@@ -2904,7 +2907,12 @@ static struct pci_driver atl1c_driver =
+@@ -2907,7 +2910,12 @@ static struct pci_driver atl1c_driver =
  	.remove   = __devexit_p(atl1c_remove),
  	.shutdown = atl1c_shutdown,
  	.err_handler = &atl1c_err_handler,
@@ -118,7 +118,7 @@ calls on compat code with only slight modifications.
  int ath_pci_init(void)
 --- a/drivers/net/wireless/libertas/if_spi.c
 +++ b/drivers/net/wireless/libertas/if_spi.c
-@@ -1251,6 +1251,7 @@ static int __devexit libertas_spi_remove
+@@ -1252,6 +1252,7 @@ static int __devexit libertas_spi_remove
  	return 0;
  }
  
@@ -126,7 +126,7 @@ calls on compat code with only slight modifications.
  static int if_spi_suspend(struct device *dev)
  {
  	struct spi_device *spi = to_spi_device(dev);
-@@ -1284,6 +1285,7 @@ static const struct dev_pm_ops if_spi_pm
+@@ -1285,6 +1286,7 @@ static const struct dev_pm_ops if_spi_pm
  	.suspend	= if_spi_suspend,
  	.resume		= if_spi_resume,
  };
@@ -134,7 +134,7 @@ calls on compat code with only slight modifications.
  
  static struct spi_driver libertas_spi_driver = {
  	.probe	= if_spi_probe,
-@@ -1292,7 +1294,9 @@ static struct spi_driver libertas_spi_dr
+@@ -1293,7 +1295,9 @@ static struct spi_driver libertas_spi_dr
  		.name	= "libertas_spi",
  		.bus	= &spi_bus_type,
  		.owner	= THIS_MODULE,
@@ -144,82 +144,82 @@ calls on compat code with only slight modifications.
  	},
  };
  
---- a/drivers/net/wireless/iwlegacy/iwl-core.c
-+++ b/drivers/net/wireless/iwlegacy/iwl-core.c
-@@ -2016,15 +2016,17 @@ int iwl_legacy_pci_resume(struct device
+--- a/drivers/net/wireless/iwlegacy/common.c
++++ b/drivers/net/wireless/iwlegacy/common.c
+@@ -5079,15 +5079,16 @@ il_pci_resume(struct device *device)
  }
- EXPORT_SYMBOL(iwl_legacy_pci_resume);
- 
--const struct dev_pm_ops iwl_legacy_pm_ops = {
--	.suspend = iwl_legacy_pci_suspend,
--	.resume = iwl_legacy_pci_resume,
--	.freeze = iwl_legacy_pci_suspend,
--	.thaw = iwl_legacy_pci_resume,
--	.poweroff = iwl_legacy_pci_suspend,
--	.restore = iwl_legacy_pci_resume,
+ EXPORT_SYMBOL(il_pci_resume);
+ 
+-const struct dev_pm_ops il_pm_ops = {
+-	.suspend = il_pci_suspend,
+-	.resume = il_pci_resume,
+-	.freeze = il_pci_suspend,
+-	.thaw = il_pci_resume,
+-	.poweroff = il_pci_suspend,
+-	.restore = il_pci_resume,
 -};
-+const SIMPLE_DEV_PM_OPS(iwl_legacy_pm_ops, iwl_legacy_pci_suspend, iwl_legacy_pci_resume);
-+
-+compat_pci_suspend(iwl_legacy_pci_suspend)
-+compat_pci_resume(iwl_legacy_pci_resume)
++const SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume);
++compat_pci_suspend(il_pci_suspend)
++compat_pci_resume(il_pci_resume)
 +
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
- EXPORT_SYMBOL(iwl_legacy_pm_ops);
+ EXPORT_SYMBOL(il_pm_ops);
 +#else
-+EXPORT_SYMBOL(iwl_legacy_pci_suspend_compat);
-+EXPORT_SYMBOL(iwl_legacy_pci_resume_compat);
++EXPORT_SYMBOL(il_pci_suspend_compat);
++EXPORT_SYMBOL(il_pci_resume_compat);
 +#endif
  
  #endif /* CONFIG_PM */
  
---- a/drivers/net/wireless/iwlegacy/iwl-core.h
-+++ b/drivers/net/wireless/iwlegacy/iwl-core.h
-@@ -499,7 +499,12 @@ __le32 iwl_legacy_add_beacon_time(struct
+--- a/drivers/net/wireless/iwlegacy/common.h
++++ b/drivers/net/wireless/iwlegacy/common.h
+@@ -2027,7 +2027,13 @@ __le32 il_add_beacon_time(struct il_priv
  #ifdef CONFIG_PM
- int iwl_legacy_pci_suspend(struct device *device);
- int iwl_legacy_pci_resume(struct device *device);
+ int il_pci_suspend(struct device *device);
+ int il_pci_resume(struct device *device);
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+int iwl_legacy_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state);
-+int iwl_legacy_pci_resume_compat(struct pci_dev *pdev);
++int il_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state);
++int il_pci_resume_compat(struct pci_dev *pdev);
 +#else
- extern const struct dev_pm_ops iwl_legacy_pm_ops;
+ extern const struct dev_pm_ops il_pm_ops;
 +#endif
++
  
- #define IWL_LEGACY_PM_OPS	(&iwl_legacy_pm_ops)
+ #define IL_LEGACY_PM_OPS	(&il_pm_ops)
  
---- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
-+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
-@@ -3960,7 +3960,12 @@ static struct pci_driver iwl3945_driver
- 	.id_table = iwl3945_hw_card_ids,
- 	.probe = iwl3945_pci_probe,
- 	.remove = __devexit_p(iwl3945_pci_remove),
+--- a/drivers/net/wireless/iwlegacy/3945-mac.c
++++ b/drivers/net/wireless/iwlegacy/3945-mac.c
+@@ -3920,7 +3920,12 @@ static struct pci_driver il3945_driver =
+ 	.id_table = il3945_hw_card_ids,
+ 	.probe = il3945_pci_probe,
+ 	.remove = __devexit_p(il3945_pci_remove),
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
- 	.driver.pm = IWL_LEGACY_PM_OPS,
+ 	.driver.pm = IL_LEGACY_PM_OPS,
 +#elif defined(CONFIG_PM)
-+	.suspend = iwl_legacy_pci_suspend_compat,
-+	.resume = iwl_legacy_pci_resume_compat,
++	.suspend = il_pci_suspend_compat,
++	.resume = il_pci_resume_compat,
 +#endif
  };
  
- static int __init iwl3945_init(void)
---- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
-+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
-@@ -3225,7 +3225,12 @@ static struct pci_driver iwl4965_driver
- 	.id_table = iwl4965_hw_card_ids,
- 	.probe = iwl4965_pci_probe,
- 	.remove = __devexit_p(iwl4965_pci_remove),
+ static int __init
+--- a/drivers/net/wireless/iwlegacy/4965-mac.c
++++ b/drivers/net/wireless/iwlegacy/4965-mac.c
+@@ -6478,7 +6478,12 @@ static struct pci_driver il4965_driver =
+ 	.id_table = il4965_hw_card_ids,
+ 	.probe = il4965_pci_probe,
+ 	.remove = __devexit_p(il4965_pci_remove),
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
- 	.driver.pm = IWL_LEGACY_PM_OPS,
+ 	.driver.pm = IL_LEGACY_PM_OPS,
 +#elif defined(CONFIG_PM)
-+	.suspend = iwl_legacy_pci_suspend_compat,
-+	.resume = iwl_legacy_pci_resume_compat,
++	.suspend = il_pci_suspend_compat,
++	.resume = il_pci_resume_compat,
 +#endif
  };
  
- static int __init iwl4965_init(void)
+ static int __init
 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
-@@ -536,6 +536,9 @@ static int iwl_pci_resume(struct device
+@@ -520,6 +520,9 @@ static int iwl_pci_resume(struct device
  
  static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
  
@@ -229,7 +229,7 @@ calls on compat code with only slight modifications.
  #define IWL_PM_OPS	(&iwl_dev_pm_ops)
  
  #else
-@@ -549,7 +552,12 @@ static struct pci_driver iwl_pci_driver
+@@ -533,7 +536,12 @@ static struct pci_driver iwl_pci_driver
  	.id_table = iwl_hw_card_ids,
  	.probe = iwl_pci_probe,
  	.remove = __devexit_p(iwl_pci_remove),
diff --git a/patches/38-led-max-brightness.patch b/patches/38-led-max-brightness.patch
index 64ecc9c..ec33b21 100644
--- a/patches/38-led-max-brightness.patch
+++ b/patches/38-led-max-brightness.patch
@@ -1,15 +1,15 @@
---- a/drivers/net/wireless/iwlegacy/iwl-led.c
-+++ b/drivers/net/wireless/iwlegacy/iwl-led.c
-@@ -166,7 +166,9 @@ void iwl_legacy_leds_init(struct iwl_pri
- 				   wiphy_name(priv->hw->wiphy));
- 	priv->led.brightness_set = iwl_legacy_led_brightness_set;
- 	priv->led.blink_set = iwl_legacy_led_blink_set;
+--- a/drivers/net/wireless/iwlegacy/common.c
++++ b/drivers/net/wireless/iwlegacy/common.c
+@@ -402,7 +402,9 @@ il_leds_init(struct il_priv *il)
+ 	    kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy));
+ 	il->led.brightness_set = il_led_brightness_set;
+ 	il->led.blink_set = il_led_blink_set;
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
- 	priv->led.max_brightness = 1;
+ 	il->led.max_brightness = 1;
 +#endif
  
  	switch (mode) {
- 	case IWL_LED_DEFAULT:
+ 	case IL_LED_DEFAULT:
 --- a/drivers/net/wireless/iwlwifi/iwl-led.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-led.c
 @@ -184,7 +184,9 @@ void iwl_leds_init(struct iwl_priv *priv
diff --git a/patches/39-remove_blink_set.patch b/patches/39-remove_blink_set.patch
index a39b634..ba43d8d 100644
--- a/patches/39-remove_blink_set.patch
+++ b/patches/39-remove_blink_set.patch
@@ -1,30 +1,30 @@
---- a/drivers/net/wireless/iwlegacy/iwl-led.c
-+++ b/drivers/net/wireless/iwlegacy/iwl-led.c
-@@ -145,6 +145,7 @@ static void iwl_legacy_led_brightness_se
- 	iwl_legacy_led_cmd(priv, on, 0);
+--- a/drivers/net/wireless/iwlegacy/common.c
++++ b/drivers/net/wireless/iwlegacy/common.c
+@@ -380,6 +380,7 @@ il_led_brightness_set(struct led_classde
+ 	il_led_cmd(il, on, 0);
  }
  
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
- static int iwl_legacy_led_blink_set(struct led_classdev *led_cdev,
- 			     unsigned long *delay_on,
- 			     unsigned long *delay_off)
-@@ -153,6 +154,7 @@ static int iwl_legacy_led_blink_set(stru
+ static int
+ il_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on,
+ 		 unsigned long *delay_off)
+@@ -388,6 +389,7 @@ il_led_blink_set(struct led_classdev *le
  
- 	return iwl_legacy_led_cmd(priv, *delay_on, *delay_off);
+ 	return il_led_cmd(il, *delay_on, *delay_off);
  }
 +#endif
  
- void iwl_legacy_leds_init(struct iwl_priv *priv)
- {
-@@ -165,7 +167,9 @@ void iwl_legacy_leds_init(struct iwl_pri
- 	priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
- 				   wiphy_name(priv->hw->wiphy));
- 	priv->led.brightness_set = iwl_legacy_led_brightness_set;
+ void
+ il_leds_init(struct il_priv *il)
+@@ -401,7 +403,9 @@ il_leds_init(struct il_priv *il)
+ 	il->led.name =
+ 	    kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy));
+ 	il->led.brightness_set = il_led_brightness_set;
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
- 	priv->led.blink_set = iwl_legacy_led_blink_set;
+ 	il->led.blink_set = il_led_blink_set;
 +#endif
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
- 	priv->led.max_brightness = 1;
+ 	il->led.max_brightness = 1;
  #endif
 --- a/drivers/net/wireless/iwlwifi/iwl-led.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-led.c
-- 
1.7.5.4