* [patch] mac80211: potential null dereference in mesh forwarding
From: Dan Carpenter @ 2011-01-03 5:43 UTC (permalink / raw)
To: John W. Linville
Cc: Johannes Berg, David S. Miller, linux-wireless, netdev,
kernel-janitors
The printk() is supposed to be ratelimited but we should always goto out
when fwd_skb is NULL. Otherwise it gets dereferenced on the next line.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5e9d3bc..dc8b566 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1831,8 +1831,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
fwd_skb = skb_copy(skb, GFP_ATOMIC);
- if (!fwd_skb && net_ratelimit()) {
- printk(KERN_DEBUG "%s: failed to clone mesh frame\n",
+ if (!fwd_skb) {
+ if (net_ratelimit())
+ printk(KERN_DEBUG "%s: failed to clone mesh frame\n",
sdata->name);
goto out;
}
^ permalink raw reply related
* Re: [PATCH] ath9k: Reset keycache on resume
From: Mohammed Shafi @ 2011-01-03 4:56 UTC (permalink / raw)
To: Kalle Valo
Cc: Jouni Malinen, linux-wireless@vger.kernel.org, Luis Rodriguez,
linville@tuxdriver.com
In-Reply-To: <8762u9ge8m.fsf@purkki.adurom.net>
On Saturday 01 January 2011 03:03 PM, Kalle Valo wrote:
> Hi,
>
> a minor nitpick:
>
Thanks for pointing it out.
> Mohammed Shafi Shajakhan<mshajakhan@atheros.com> writes:
>
>
>> From: Mohammed Shafi Shajakhan<mshajakhan@atheros.com>
>>
> This means that Mohammed is the author of the patch.
>
> [...]
>
Jouni is the author.
>
>> Signed-off-by: Jouni Malinen<Jouni.Malinen@Atheros.com>
>> Signed-off-by: Mohammed Shafi Shajakhan<mshajakhan@atheros.com>
>>
> But here the author's sob line should be first one, the order is from
> top to bottom. If Mohammed is the author, the sob lines should be
> reversed. But if Jouni actually is the author, the From line should be
> fixed.
>
> Of course this is just a style issue and doesn't matter that much, but
> it's still nice to get it right.
>
>
^ permalink raw reply
* Tp-link wn7200nd - cannot associate
From: Ming-Ching Tiew @ 2011-01-03 2:38 UTC (permalink / raw)
To: linux-wireless
I have a TP-LINK WN7200ND, I am tested it with Kernel 2.6.36.1 and 2.6.35.10, basically after inserting the USB, the interface is up and it can never associate with any access point.
#lsmod |grep rt2
rt2800usb 7632 0
rt2800lib 20328 1 rt2800usb
rt2x00usb 4628 2 rt2800usb,rt2800lib
rt2x00lib 15408 2 rt2800lib,rt2x00usb
mac80211 122068 2 rt2x00usb,rt2x00lib
cfg80211 92252 2 rt2x00lib,mac80211
There are a lot of similar complaints on the net, this is one example :-
http://ubuntuforums.org/showthread.php?t=1530095
There don't seem to be any issue with 'iwlist wlanX scan'. But just can't associate.
Any recommendation ? Any debug information I should provide ?
Regards
^ permalink raw reply
* OOPS at ieee80211_aes_ccm_encrypt()?
From: Jussi Kivilinna @ 2011-01-02 22:10 UTC (permalink / raw)
To: linux-wireless
Hello!
While doing stress testing on zd1211rw AP-mode I run into this problem
that I don't think has that much to do with zd1211rw:
[ 3957.356752] BUG: unable to handle kernel NULL pointer dereference at (null)
[ 3957.357169] IP: [<(null)>] (null)
[ 3957.357370] *pdpt = 000000002a460001 *pde = 0000000000000000
[ 3957.357673] Oops: 0000 [#1] PREEMPT SMP
[ 3957.357870] last sysfs file:
/sys/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0C0A:00/power_supply/BAT1/charge_full
[ 3957.358215] Modules linked in: zd1211rw netconsole configfs
xt_length xt_mark sch_sfq acerhdf acpi_cpufreq mperf microcode
xt_multiport xt_limit xt_state xt_TCPMSS xt_tcpmss b43 rng_core
mac80211 cfg80211 rfkill uvcvideo uinput shpchp psmouse pci_hotplug
[last unloaded: zd1211rw]
[ 3957.359962]
[ 3957.359962] Pid: 0, comm: swapper Not tainted
2.6.36.2-jk4-ureadahead-schedautogroup #1 /AOA150
[ 3957.359962] EIP: 0060:[<00000000>] EFLAGS: 00010246 CPU: 0
[ 3957.359962] EIP is at 0x0
[ 3957.359962] EAX: ea747c00 EBX: e5549694 ECX: e5549694 EDX: e5549694
[ 3957.359962] ESI: ee3670dc EDI: 00000010 EBP: ee3670dc ESP: c16ddc7c
[ 3957.359962] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
[ 3957.359962] Process swapper (pid: 0, ti=c16dc000 task=c16edde0
task.ti=c16dc000)
[ 3957.359962] Stack:
[ 3957.359962] f8c2cd14 00000010 00000001 ea747c00 0000005f e55496d3
e55496d2 e55496c4
[ 3957.359962] <0> e55496b4 01844e38 00000004 e5844e38 ee3670dc
e5549600 c16ddd94 f8c1fb1e
[ 3957.359962] <0> 000005e4 ee3670dc ee3676c0 e5549694 00000018
000005fc c16ddd94 e5844e50
[ 3957.359962] Call Trace:
[ 3957.359962] [<f8c2cd14>] ? ieee80211_aes_ccm_encrypt+0xb4/0x140 [mac80211]
[ 3957.359962] [<f8c1fb1e>] ?
ieee80211_crypto_ccmp_encrypt+0x17e/0x1c0 [mac80211]
[ 3957.359962] [<f8c33dcf>] ? invoke_tx_handlers+0xcef/0xef0 [mac80211]
[ 3957.359962] [<c14058ed>] ? skb_queue_tail+0x1d/0x50
[ 3957.359962] [<c1500c0a>] ? _raw_spin_lock_irqsave+0x1a/0x40
[ 3957.359962] [<f8c34041>] ? ieee80211_tx+0x71/0x240 [mac80211]
[ 3957.359962] [<f8d12a21>] ? rx_urb_complete+0x161/0x290 [zd1211rw]
[ 3957.359962] [<c1400000>] ? sock_recvmsg_nosec+0x0/0x120
[ 3957.359962] [<c1406441>] ? pskb_expand_head+0xd1/0x150
[ 3957.359962] [<f8c3429f>] ? ieee80211_xmit+0x8f/0x1c0 [mac80211]
[ 3957.359962] [<f8c31e8c>] ? ieee80211_skb_resize+0x6c/0xf0 [mac80211]
[ 3957.359962] [<f8c34754>] ? ieee80211_subif_start_xmit+0x284/0x620
[mac80211]
[ 3957.359962] [<c1500000>] ? do_nanosleep+0x50/0xd0
[ 3957.359962] [<f8c1d2c7>] ? ieee80211_tx_status+0x237/0x7f0 [mac80211]
[ 3957.359962] [<c1411a3d>] ? dev_hard_start_xmit+0x2cd/0x510
[ 3957.359962] [<c14261f3>] ? sch_direct_xmit+0xe3/0x1b0
[ 3957.359962] [<c1426328>] ? __qdisc_run+0x68/0xf0
[ 3957.359962] [<c1410827>] ? net_tx_action+0xb7/0x110
[ 3957.359962] [<c1046357>] ? __do_softirq+0x97/0x1e0
[ 3957.359962] [<c108a65d>] ? handle_IRQ_event+0x3d/0x170
[ 3957.359962] [<c101eabb>] ? ack_apic_level+0x6b/0x200
[ 3957.359962] [<c10464cd>] ? do_softirq+0x2d/0x40
[ 3957.359962] [<c10468b5>] ? irq_exit+0x75/0x80
[ 3957.359962] [<c1004aa6>] ? do_IRQ+0x56/0xc0
[ 3957.359962] [<c1003429>] ? common_interrupt+0x29/0x30
[ 3957.359962] [<c104007b>] ? __set_personality+0x20b/0x2a0
[ 3957.359962] [<c1267a5e>] ? intel_idle+0xce/0x190
[ 3957.359962] [<c13b1c89>] ? cpuidle_idle_call+0x69/0x110
[ 3957.359962] [<c1001ea1>] ? cpu_idle+0x51/0xf0
[ 3957.359962] [<c174f8ac>] ? start_kernel+0x2d6/0x2dc
[ 3957.359962] [<c174f412>] ? unknown_bootoption+0x0/0x192
[ 3957.359962] Code: Bad EIP value.
[ 3957.359962] EIP: [<00000000>] 0x0 SS:ESP 0068:c16ddc7c
[ 3957.359962] CR2: 0000000000000000
Hostapd shows last messages at:
1294001925.104125: IEEE 802.1X: 99 bytes from 00:16:01:09:c4:c4
1294001925.104742: IEEE 802.1X: version=1 type=3 length=95
1294001925.104816: wlan4: STA 00:16:01:09:c4:c4 WPA: received
EAPOL-Key 2/2 Group with unexpected replay counter
1294001925.104927: received replay counter - hexdump(len=8): 00 00 00
00 00 00 00 07
1294001925.946033: wlan4: STA 00:16:01:09:c4:c4 WPA: rekeying PTK
1294001925.946086: WPA: 00:16:01:09:c4:c4 WPA_PTK entering state PTKSTART
1294001925.946135: wlan4: STA 00:16:01:09:c4:c4 WPA: sending 1/4 msg
of 4-Way Handshake
1294001925.946161: WPA: Send EAPOL(version=2 secure=0 mic=0 ack=1
install=0 pairwise=8 kde_len=0 keyidx=0 encr=0)
1294001925.953682: IEEE 802.1X: 121 bytes from 00:16:01:09:c4:c4
1294001925.953742: IEEE 802.1X: version=1 type=3 length=117
1294001925.953802: wlan4: STA 00:16:01:09:c4:c4 WPA: received
EAPOL-Key frame (2/4 Pairwise)
1294001925.953834: WPA: 00:16:01:09:c4:c4 WPA_PTK entering state
PTKCALCNEGOTIATING
1294001925.953919: WPA: PTK derivation - A1=00:19:cb:32:78:cf
A2=00:16:01:09:c4:c4
1294001925.953953: WPA: PMK - hexdump(len=32): [REMOVED]
1294001925.953976: WPA: PTK - hexdump(len=48): [REMOVED]
1294001925.954022: WPA: 00:16:01:09:c4:c4 WPA_PTK entering state
PTKCALCNEGOTIATING2
1294001925.954053: WPA: 00:16:01:09:c4:c4 WPA_PTK entering state
PTKINITNEGOTIATING
1294001925.954342: wlan4: STA 00:16:01:09:c4:c4 WPA: sending 3/4 msg
of 4-Way Handshake
1294001925.954379: WPA: Send EAPOL(version=2 secure=1 mic=1 ack=1
install=1 pairwise=8 kde_len=66 keyidx=2 encr=1)
1294001925.954433: Plaintext EAPOL-Key Key Data - hexdump(len=80): [REMOVED]
1294001926.054936: wlan4: STA 00:16:01:09:c4:c4 WPA: EAPOL-Key timeout
1294001926.055000: WPA: 00:16:01:09:c4:c4 WPA_PTK entering state
PTKINITNEGOTIATING
1294001926.055298: wlan4: STA 00:16:01:09:c4:c4 WPA: sending 3/4 msg
of 4-Way Handshake
1294001926.055345: WPA: Send EAPOL(version=2 secure=1 mic=1 ack=1
install=1 pairwise=8 kde_len=66 keyidx=2 encr=1)
1294001926.055400: Plaintext EAPOL-Key Key Data - hexdump(len=80): [REMOVED]
Disassembly shows that crash happens at
'crypto_cipher_encrypt_one(tfm, b, b);' in ieee80211_aes_ccm_encrypt():
00010c60 <ieee80211_aes_ccm_encrypt>:
10c60: 55 push %ebp
10c61: 57 push %edi
10c62: 89 cf mov %ecx,%edi
10c64: 56 push %esi
10c65: 53 push %ebx
10c66: 89 d3 mov %edx,%ebx
10c68: 8d 64 24 d8 lea -0x28(%esp),%esp
10c6c: 89 d9 mov %ebx,%ecx
10c6e: 8b 74 24 3c mov 0x3c(%esp),%esi
10c72: 89 44 24 08 mov %eax,0x8(%esp)
10c76: 8d 42 20 lea 0x20(%edx),%eax
10c79: 89 44 24 1c mov %eax,0x1c(%esp)
10c7d: 8b 44 24 08 mov 0x8(%esp),%eax
10c81: 8d 56 0f lea 0xf(%esi),%edx
10c84: c1 ea 04 shr $0x4,%edx
10c87: 89 54 24 0c mov %edx,0xc(%esp)
10c8b: 89 da mov %ebx,%edx
10c8d: e8 4e ff ff ff call 10be0 <aes_ccm_prepare>
10c92: 8b 44 24 0c mov 0xc(%esp),%eax
10c96: 85 c0 test %eax,%eax
10c98: 0f 84 d4 00 00 00 je 10d72 <ieee80211_aes_ccm_encrypt+0x112>
10c9e: 83 e6 0f and $0xf,%esi
10ca1: 8d 43 30 lea 0x30(%ebx),%eax
10ca4: 0f 95 44 24 23 setne 0x23(%esp)
10ca9: 89 44 24 18 mov %eax,0x18(%esp)
10cad: 89 74 24 24 mov %esi,0x24(%esp)
10cb1: 8d 53 3e lea 0x3e(%ebx),%edx
10cb4: 8d 43 3f lea 0x3f(%ebx),%eax
10cb7: 89 54 24 14 mov %edx,0x14(%esp)
10cbb: 89 44 24 10 mov %eax,0x10(%esp)
10cbf: 8b 6c 24 40 mov 0x40(%esp),%ebp
10cc3: 89 fe mov %edi,%esi
10cc5: c7 44 24 04 01 00 00 movl $0x1,0x4(%esp)
10ccc: 00
10ccd: 8d 76 00 lea 0x0(%esi),%esi
10cd0: 8b 54 24 0c mov 0xc(%esp),%edx
10cd4: 39 54 24 04 cmp %edx,0x4(%esp)
10cd8: 75 0e jne 10ce8 <ieee80211_aes_ccm_encrypt+0x88>
10cda: 8b 7c 24 24 mov 0x24(%esp),%edi
10cde: 80 7c 24 23 00 cmpb $0x0,0x23(%esp)
10ce3: 89 3c 24 mov %edi,(%esp)
10ce6: 75 07 jne 10cef <ieee80211_aes_ccm_encrypt+0x8f>
10ce8: c7 04 24 10 00 00 00 movl $0x10,(%esp)
10cef: 31 c0 xor %eax,%eax
10cf1: 8b 3c 24 mov (%esp),%edi
10cf4: 8d 74 26 00 lea 0x0(%esi,%eiz,1),%esi
10cf8: 0f b6 14 06 movzbl (%esi,%eax,1),%edx
10cfc: 30 14 03 xor %dl,(%ebx,%eax,1)
10cff: 83 c0 01 add $0x1,%eax
10d02: 39 c7 cmp %eax,%edi
10d04: 7f f2 jg 10cf8 <ieee80211_aes_ccm_encrypt+0x98>
10d06: 8b 44 24 08 mov 0x8(%esp),%eax
10d0a: 89 d9 mov %ebx,%ecx
10d0c: 89 da mov %ebx,%edx
10d0e: 89 3c 24 mov %edi,(%esp)
10d11: ff 50 08 call *0x8(%eax)
10d14: 8b 54 24 14 mov 0x14(%esp),%edx
...
Is key being used after freeing?
-Jussi
^ permalink raw reply
* Compat-wireless release for 2011-01-02 is baked
From: Compat-wireless cronjob account @ 2011-01-02 20:02 UTC (permalink / raw)
To: linux-wireless
cat: /var/opt/compat/compat-wireless-2.6/compat_version: No such file or directory
cat: compat_base_tree: No such file or directory
cat: compat_base_tree_version: No such file or directory
cat: compat_version: No such file or directory
cat: /var/opt/compat/compat-wireless-2.6/compat_version: No such file or directory
scripts/Makefile.clean:17: /var/opt/compat/compat-wireless-2.6/drivers/net/wireless/hostap/Makefile: No such file or directory
make[4]: *** No rule to make target `/var/opt/compat/compat-wireless-2.6/drivers/net/wireless/hostap/Makefile'. Stop.
make[3]: *** [/var/opt/compat/compat-wireless-2.6/drivers/net/wireless/hostap] Error 2
make[2]: *** [/var/opt/compat/compat-wireless-2.6/drivers/net/wireless] Error 2
make[1]: *** [_clean_/var/opt/compat/compat-wireless-2.6] Error 2
make: *** [clean] Error 2
/usr/bin/sha1sum: *.tar.bz2: No such file or directory
compat-wireless code metrics
774936 - Total upstream lines of code being pulled
^ permalink raw reply
* Re: [ath5k-devel] [PATCH 1/6] ath5k: Always write tx powertable on hw
From: Bob Copeland @ 2011-01-02 18:23 UTC (permalink / raw)
To: Bruno Randolf
Cc: ath5k-devel, linux-wireless, linville, mcgrof, jirislaby, nbd,
sedat.dilek
In-Reply-To: <201101012351.07339.br1@einfach.org>
On Sat, Jan 01, 2011 at 11:51:07PM +0900, Bruno Randolf wrote:
> > Reverting just this patch helps, so my power table must be broken
> > at start up.
> >
> > I saw that Bruno had a later series that touched this area, so I'll
> > try them next.
>
> Yep, they should fix that problem. Please try them and report if they don't.
Indeed, applied first 3 patches and problem is resolved (and now I see
you pointed it out in patch 3). Thanks!
--
Bob Copeland %% www.bobcopeland.com
^ permalink raw reply
* Re: [PATCH] Revert "ath9k: Parse DTIM period from mac80211"
From: Jouni Malinen @ 2011-01-02 8:53 UTC (permalink / raw)
To: Kalle Valo
Cc: Mohammed Shafi Shajakhan, linville, linux-wireless, lrodriguez,
Jouni Malinen
In-Reply-To: <871v4xgdfp.fsf@purkki.adurom.net>
On Sat, Jan 01, 2011 at 11:50:50AM +0200, Kalle Valo wrote:
> Mohammed Shafi Shajakhan <mshajakhan@atheros.com> writes:
> > * Preventing association with broken AP's
>
> How can different dtim value cause problems with association? Power
> save should not be even enabled during association. Or do you mean
> there are problems after association, for example during eap
> negotation?
It is not the DTIM value, it is the part of having to receive a Beacon
frame before even trying to associate. This is very much a corner case,
but well, that behavior did change with the commit.
> > * Adds latency in roaming
>
> We should try to solve this problem differently than hardcoding dtim.
> There are other ways to trigger roaming than just following beacons.
> And if there's no data, there's no need to roam either.
This is about the part of waiting for Beacon frame before trying to
associate, not about hardcoding DTIM for any other purpose.
> > So its better to always use the safe value of '1' for dtim period
>
> By hardcoding dtim you increase the power consumption in the case when
> there is no data traffic, so it's not definitely better in all cases.
>
> I would prefer to fix the real issues instead of hardcoding dtim. And
> if it's really essential to hardcode it now, please add a big fat
> warning indicating that this is a temporary solution and should be
> fixed properly without hardcoding anything.
The real issue (as far as I can tell) was that ath9k was changed to
require mac80211 to get it DTIM period before association. I'm not aware
of any need for that with ath9k. It should have no problems updating PS
parameters after association and as such, should not require mac80211 to
figure DTIM period out before being able to associate. This change is
not about hardcoding DTIM period; it is about removing unneeded change
that added extra latency without any real gain.
--
Jouni Malinen PGP id EFC895FA
^ permalink raw reply
* Re: BUG in rt2x00lib_txdone() with 2.6.37-rc8
From: Stephen Boyd @ 2011-01-01 21:35 UTC (permalink / raw)
To: Heinz Diehl; +Cc: users, Ivo van Doorn, linux-wireless, linux-kernel
In-Reply-To: <20110101102817.GC6981@fancy-poultry.org>
On 01/01/11 02:28, Heinz Diehl wrote:
> On 31.12.2010, Stephen Boyd wrote:
>
>> [ 9085.714105] BUG: unable to handle kernel NULL pointer dereference at
>> 00000000000000a4
>> [ 9085.714816] IP: [<ffffffffa0025458>] rt2x00lib_txdone+0x36/0x249
>> [rt2x00lib]
>> [ 9085.715017] PGD 215fd067 PUD 292f4067 PMD 0
>> [ 9085.715017] Oops: 0000 [#1] SMP
>> [ 9085.715017] last sysfs file:
>> /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
>> [ 9085.715017] CPU 1
>> [ 9085.715017] Modules linked in: usb_storage thermal snd_seq_oss
>> snd_seq_midi snd_seq_dummy snd_pcm_oss snd_mixer_oss snd_hrtimer
>> snd_emu10k1_synth snd_emux_synth snd_seq_virmidi snd_seq_midi_event
>> snd_seq_midi_emul snd_seq scsi_wait_scan powernow_k8 mperf i2c_i801 fuse
>> fan snd_emu10k1 snd_rawmidi snd_ac97_codec ac97_bus snd_pcm
>> snd_seq_device snd_timer snd_page_alloc snd_util_mem rt73usb crc_itu_t
>> rt2x00usb snd_hwdep snd processor r8169 via82cxxx rt2x00lib soundcore
>> mii button k8temp
>> [ 9085.715017]
>> [ 9085.715017] Pid: 11513, comm: kworker/1:0 Not tainted 2.6.37-rc7+ #27
>> MS-7094/MS-7094
> [....]
>
> I'm not quite shure on this, but it reminds me on this bug here:
> https://bugzilla.kernel.org/show_bug.cgi?id=24892
>
I believe I had the latest net tree merged into 2.6.37-rc7 in which case
the patch mentioned in that bugzilla would already be applied.
^ permalink raw reply
* Compat-wireless release for 2011-01-01 is baked
From: Compat-wireless cronjob account @ 2011-01-01 20:03 UTC (permalink / raw)
To: linux-wireless
cat: /var/opt/compat/compat-wireless-2.6/compat_version: No such file or directory
cat: compat_base_tree: No such file or directory
cat: compat_base_tree_version: No such file or directory
cat: compat_version: No such file or directory
cat: /var/opt/compat/compat-wireless-2.6/compat_version: No such file or directory
scripts/Makefile.clean:17: /var/opt/compat/compat-wireless-2.6/drivers/net/wireless/hostap/Makefile: No such file or directory
make[4]: *** No rule to make target `/var/opt/compat/compat-wireless-2.6/drivers/net/wireless/hostap/Makefile'. Stop.
make[3]: *** [/var/opt/compat/compat-wireless-2.6/drivers/net/wireless/hostap] Error 2
make[2]: *** [/var/opt/compat/compat-wireless-2.6/drivers/net/wireless] Error 2
make[1]: *** [_clean_/var/opt/compat/compat-wireless-2.6] Error 2
make: *** [clean] Error 2
/usr/bin/sha1sum: *.tar.bz2: No such file or directory
compat-wireless code metrics
774936 - Total upstream lines of code being pulled
^ permalink raw reply
* Re: [PATCH 03/15]drivers:staging:rtl8187se:r8180_hw.h Typo change diable to disable.
From: Justin P. Mattock @ 2011-01-01 14:53 UTC (permalink / raw)
To: Dan Carpenter, Finn Thain, devel, trivial, linux-scsi, netdev,
linux-usb, linux-wireless, linux-kernel, ivtv-devel, linux-m68k,
spi-devel-general, linux-media
In-Reply-To: <20110101090931.GH1886@bicker>
On 01/01/2011 01:09 AM, Dan Carpenter wrote:
> On Fri, Dec 31, 2010 at 11:43:30PM -0800, Justin P. Mattock wrote:
>> On 12/31/2010 10:48 PM, Finn Thain wrote:
>>>> -/* BIT[8-9] is for SW Antenna Diversity. Only the value EEPROM_SW_AD_ENABLE means enable, other values are diable. */
>>>> +/* BIT[8-9] is for SW Antenna Diversity. Only the value EEPROM_SW_AD_ENABLE means enable, other values are disabled. */
>>>
>>> I think, "other values disable" was what you meant?
>>>
>>> Finn
>>>
>>>> #define EEPROM_SW_AD_MASK 0x0300
>>>> #define EEPROM_SW_AD_ENABLE 0x0100
>>>>
>>>>
>>>
>>
>> no! I changed it to disabled to make it proper..
>
> Finn is obviously right, but maybe a compromise would be:
>
> Only the value EEPROM_SW_AD_ENABLE means "enable", other values mean
> "disable".
>
> regards,
> dan carpenter
>
ahh.. I see what you your saying now.. alright let me send this out that
way..
Justin P. Mattock
^ permalink raw reply
* Re: [ath5k-devel] [PATCH 1/6] ath5k: Always write tx powertable on hw
From: Bruno Randolf @ 2011-01-01 14:51 UTC (permalink / raw)
To: Bob Copeland
Cc: ath5k-devel, linux-wireless, linville, mcgrof, jirislaby, nbd,
sedat.dilek
In-Reply-To: <AANLkTinD+XrkXeUR2PNqj4eVVvTmrh8a9c4UEy0Nr7JE@mail.gmail.com>
On Thursday 30 December 2010 06:02:29 Bob Copeland wrote:
> On Thu, Dec 2, 2010 at 11:03 PM, Nick Kossifidis <mickflemm@gmail.com>
wrote:
> > * By skipping tx power table calibration we also skip setting
> > tx power table on hw. Make sure we always write tx power table
> > on hw since it gets cleared on reset.
> >
> > Signed-off-by: Nick Kossifidis <mickflemm@gmail.com>
>
> Just a very late heads-up, this patch seems to be causing problems
> for me.
>
> Seems a bit weird given the content, but the symptom is that
> when I bring up the device none of my probe requests are actually
> getting sent, according to wireshark captures from another device.
> Reverting just this patch helps, so my power table must be broken
> at start up.
>
> I saw that Bruno had a later series that touched this area, so I'll
> try them next.
Yep, they should fix that problem. Please try them and report if they don't.
Bruno
^ permalink raw reply
* [PATCH 4/4] compat-wireless: use generic suspend resume
From: Hauke Mehrtens @ 2011-01-01 14:26 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
In-Reply-To: <1293891981-22151-1-git-send-email-hauke@hauke-m.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/11-dev-pm-ops.patch | 173 +++++++++++++++----------------------------
1 files changed, 61 insertions(+), 112 deletions(-)
diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index dea121a..4aa257f 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -7,9 +7,59 @@ calls on compat code with only slight modifications.
[1] http://lxr.linux.no/#linux+v2.6.29/include/linux/pm.h#L170
+--- a/drivers/net/atl1c/atl1c_main.c
++++ b/drivers/net/atl1c/atl1c_main.c
+@@ -2879,6 +2879,9 @@ static struct pci_error_handlers atl1c_e
+
+ static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
+
++compat_pci_suspend(atl1c_suspend)
++compat_pci_resume(atl1c_resume)
++
+ static struct pci_driver atl1c_driver = {
+ .name = atl1c_driver_name,
+ .id_table = atl1c_pci_tbl,
+@@ -2886,7 +2889,12 @@ static struct pci_driver atl1c_driver =
+ .remove = __devexit_p(atl1c_remove),
+ .shutdown = atl1c_shutdown,
+ .err_handler = &atl1c_err_handler,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+ .driver.pm = &atl1c_pm_ops,
++#elif defined(CONFIG_PM_SLEEP)
++ .suspend = atl1c_suspend_compat,
++ .resume = atl1c_resume_compat,
++#endif
+ };
+
+ /*
+--- a/drivers/net/wireless/ath/ath5k/pci.c
++++ b/drivers/net/wireless/ath/ath5k/pci.c
+@@ -286,6 +286,9 @@ static int ath5k_pci_resume(struct devic
+ return 0;
+ }
+
++compat_pci_suspend(ath5k_pci_suspend)
++compat_pci_resume(ath5k_pci_resume)
++
+ static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume);
+ #define ATH5K_PM_OPS (&ath5k_pm_ops)
+ #else
+@@ -297,7 +300,12 @@ static struct pci_driver ath5k_pci_drive
+ .id_table = ath5k_pci_id_table,
+ .probe = ath5k_pci_probe,
+ .remove = __devexit_p(ath5k_pci_remove),
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+ .driver.pm = ATH5K_PM_OPS,
++#elif defined(CONFIG_PM_SLEEP)
++ .suspend = ath5k_pci_suspend_compat,
++ .resume = ath5k_pci_resume_compat,
++#endif
+ };
+
+ /*
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -315,14 +315,36 @@ static int ath_pci_resume(struct device
+@@ -326,14 +326,11 @@ static int ath_pci_resume(struct device
return 0;
}
@@ -21,40 +71,15 @@ calls on compat code with only slight modifications.
- .poweroff = ath_pci_suspend,
- .restore = ath_pci_resume,
-};
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+static int ath_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state)
-+{
-+ int r;
+
-+ r = ath_pci_suspend(&pdev->dev);
-+ if (r)
-+ return r;
-+
-+ pci_save_state(pdev);
-+ pci_disable_device(pdev);
-+ pci_set_power_state(pdev, PCI_D3hot);
-+
-+ return 0;
-+}
-+
-+static int ath_pci_resume_compat(struct pci_dev *pdev)
-+{
-+ int r;
-+
-+ pci_restore_state(pdev);
-+ r = pci_enable_device(pdev);
-+ if (r)
-+ return r;
-+
-+ return ath_pci_resume(&pdev->dev);
-+}
-+#endif
++compat_pci_suspend(ath_pci_suspend)
++compat_pci_resume(ath_pci_resume)
+
+static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume);
#define ATH9K_PM_OPS (&ath9k_pm_ops)
-@@ -340,7 +362,12 @@ static struct pci_driver ath_pci_driver
+@@ -351,7 +348,12 @@ static struct pci_driver ath_pci_driver
.id_table = ath_pci_id_table,
.probe = ath_pci_probe,
.remove = ath_pci_remove,
@@ -84,7 +109,7 @@ calls on compat code with only slight modifications.
static int __init iwl_init(void)
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
-@@ -2098,14 +2098,42 @@ int iwl_pci_resume(struct device *device
+@@ -2098,14 +2098,16 @@ int iwl_pci_resume(struct device *device
}
EXPORT_SYMBOL(iwl_pci_resume);
@@ -96,42 +121,16 @@ calls on compat code with only slight modifications.
- .poweroff = iwl_pci_suspend,
- .restore = iwl_pci_resume,
-};
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+int iwl_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state)
-+{
-+ int r;
-+
-+ r = iwl_pci_suspend(&pdev->dev);
-+ if (r)
-+ return r;
-+
-+ pci_save_state(pdev);
-+ pci_disable_device(pdev);
-+ pci_set_power_state(pdev, PCI_D3hot);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(iwl_pci_suspend_compat);
-+
-+int iwl_pci_resume_compat(struct pci_dev *pdev)
-+{
-+ int r;
-+
-+ pci_set_power_state(pdev, PCI_D0);
-+ r = pci_enable_device(pdev);
-+ if (r)
-+ return r;
-+ pci_restore_state(pdev);
-+
-+ return iwl_pci_resume(&pdev->dev);
-+}
-+EXPORT_SYMBOL(iwl_pci_resume_compat);
-+#endif
-+
+const SIMPLE_DEV_PM_OPS(iwl_pm_ops, iwl_pci_suspend, iwl_pci_resume);
+
++compat_pci_suspend(iwl_pci_suspend)
++compat_pci_resume(iwl_pci_resume)
++
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
EXPORT_SYMBOL(iwl_pm_ops);
++#else
++EXPORT_SYMBOL(iwl_pci_suspend_compat);
++EXPORT_SYMBOL(iwl_pci_resume_compat);
+#endif
#endif /* CONFIG_PM */
@@ -165,53 +164,3 @@ calls on compat code with only slight modifications.
};
static int __init iwl3945_init(void)
---- a/drivers/net/wireless/ath/ath5k/pci.c
-+++ b/drivers/net/wireless/ath/ath5k/pci.c
-@@ -286,6 +286,34 @@ static int ath5k_pci_resume(struct devic
- return 0;
- }
-
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+static int ath5k_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state)
-+{
-+ int r;
-+
-+ r = ath5k_pci_suspend(&pdev->dev);
-+ if (r)
-+ return r;
-+
-+ pci_save_state(pdev);
-+ pci_disable_device(pdev);
-+ pci_set_power_state(pdev, PCI_D3hot);
-+ return 0;
-+}
-+
-+static int ath5k_pci_resume_compat(struct pci_dev *pdev)
-+{
-+ int r;
-+
-+ pci_restore_state(pdev);
-+ r = pci_enable_device(pdev);
-+ if (r)
-+ return r;
-+
-+ return ath5k_pci_resume(&pdev->dev);
-+}
-+#endif
-+
- static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume);
- #define ATH5K_PM_OPS (&ath5k_pm_ops)
- #else
-@@ -297,7 +325,12 @@ static struct pci_driver ath5k_pci_drive
- .id_table = ath5k_pci_id_table,
- .probe = ath5k_pci_probe,
- .remove = __devexit_p(ath5k_pci_remove),
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
- .driver.pm = ATH5K_PM_OPS,
-+#elif defined(CONFIG_PM_SLEEP)
-+ .suspend = ath5k_pci_suspend_compat,
-+ .resume = ath5k_pci_resume_compat,
-+#endif
- };
-
- /*
--
1.7.1
^ permalink raw reply related
* [PATCH 3/4] compat-wireless: rtl8187 and rtl8180 moved
From: Hauke Mehrtens @ 2011-01-01 14:26 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
In-Reply-To: <1293891981-22151-1-git-send-email-hauke@hauke-m.de>
The rtl8187 and rtl8180 modules moved to an other subdirectory and the
filenames were changed. The makefile includes some header, where the
path has to be changed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/25-multicast-list_head.patch | 22 +++++-----
patches/35-backport-brcm80211-Makefile.patch | 32 ----------------
patches/35-fix-makefile-includes.patch | 52 ++++++++++++++++++++++++++
scripts/admin-update.sh | 2 +
4 files changed, 65 insertions(+), 43 deletions(-)
delete mode 100644 patches/35-backport-brcm80211-Makefile.patch
create mode 100644 patches/35-fix-makefile-includes.patch
diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 8ad8391..3d8632e 100644
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -162,7 +162,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
}
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -3131,20 +3131,42 @@ unlock:
+@@ -3135,20 +3135,42 @@ unlock:
}
static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw,
@@ -205,7 +205,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
pos &= 0x3f;
mfilt[pos / 32] |= (1 << (pos % 32));
-@@ -3153,6 +3175,9 @@ static u64 ath5k_prepare_multicast(struc
+@@ -3157,6 +3179,9 @@ static u64 ath5k_prepare_multicast(struc
* neet to inform below to not reset the mcast */
/* ath5k_hw_set_mcast_filterindex(ah,
* ha->addr[5]); */
@@ -445,7 +445,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
size_t fw_name_len, u32 *hw_ver);
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
-@@ -1609,7 +1609,11 @@ static void set_multicast_list(struct us
+@@ -1629,7 +1629,11 @@ static void set_multicast_list(struct us
netdev_for_each_mc_addr(ha, usbdev->net)
memcpy(mc_addrs + i++ * ETH_ALEN,
@@ -457,8 +457,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
}
netif_addr_unlock_bh(usbdev->net);
---- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
-+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
+--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
++++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -815,10 +815,19 @@ static void rtl8180_bss_info_changed(str
}
}
@@ -479,8 +479,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
}
static void rtl8180_configure_filter(struct ieee80211_hw *dev,
---- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
-+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
+--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
++++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -1194,9 +1194,17 @@ static void rtl8187_bss_info_changed(str
}
@@ -677,7 +677,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -719,7 +719,12 @@ struct ieee80211_local {
+@@ -734,7 +734,12 @@ struct ieee80211_local {
struct work_struct recalc_smps;
/* aggregated multicast list */
@@ -692,7 +692,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -433,8 +433,13 @@ static void ieee80211_do_stop(struct iee
+@@ -435,8 +435,13 @@ static void ieee80211_do_stop(struct iee
netif_addr_lock_bh(sdata->dev);
spin_lock_bh(&local->filter_lock);
@@ -706,7 +706,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
spin_unlock_bh(&local->filter_lock);
netif_addr_unlock_bh(sdata->dev);
-@@ -593,7 +598,12 @@ static void ieee80211_set_multicast_list
+@@ -595,7 +600,12 @@ static void ieee80211_set_multicast_list
sdata->flags ^= IEEE80211_SDATA_PROMISC;
}
spin_lock_bh(&local->filter_lock);
@@ -733,7 +733,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
spin_unlock_bh(&local->filter_lock);
/* be a bit nasty */
-@@ -555,9 +559,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -559,9 +563,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
INIT_LIST_HEAD(&local->interfaces);
diff --git a/patches/35-backport-brcm80211-Makefile.patch b/patches/35-backport-brcm80211-Makefile.patch
deleted file mode 100644
index bc57367..0000000
--- a/patches/35-backport-brcm80211-Makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/drivers/staging/brcm80211/Makefile
-+++ b/drivers/staging/brcm80211/Makefile
-@@ -24,10 +24,10 @@ ccflags-y := \
- -DDBAND \
- -DBCMDMA32 \
- -DBCMNVRAMR \
-- -Idrivers/staging/brcm80211/sys \
-- -Idrivers/staging/brcm80211/phy \
-- -Idrivers/staging/brcm80211/util \
-- -Idrivers/staging/brcm80211/include
-+ -I$(obj)/sys \
-+ -I$(obj)/phy \
-+ -I$(obj)/util \
-+ -I$(obj)/include
-
- PCI_CFLAGS := -DWLC_LOW
-
---- a/drivers/staging/brcm80211/brcmfmac/Makefile
-+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
-@@ -33,9 +33,9 @@ ccflags-y := \
- -DPKT_FILTER_SUPPORT \
- -DSHOW_EVENTS \
- -DTOE \
-- -Idrivers/staging/brcm80211/brcmfmac \
-- -Idrivers/staging/brcm80211/include \
-- -Idrivers/staging/brcm80211/util
-+ -I$(obj) \
-+ -I$(obj)/../include \
-+ -I$(obj)/../util
-
- DHDOFILES = dhd_linux.o ../util/linux_osl.o ../util/bcmutils.o dhd_common.o dhd_custom_gpio.o \
- wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o \
diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch
new file mode 100644
index 0000000..c80e11f
--- /dev/null
+++ b/patches/35-fix-makefile-includes.patch
@@ -0,0 +1,52 @@
+When some other headers are included in some makefile it must be
+relative to the current object file processed. When giving the full
+path the make process will search in the kernel tree for the headers.
+
+--- a/drivers/net/wireless/rtl818x/rtl8180/Makefile
++++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile
+@@ -2,4 +2,4 @@ rtl8180-objs := dev.o rtl8225.o sa2400.
+
+ obj-$(CONFIG_RTL8180) += rtl8180.o
+
+-ccflags-y += -Idrivers/net/wireless/rtl818x
++ccflags-y += -I$(obj)/..
+--- a/drivers/net/wireless/rtl818x/rtl8187/Makefile
++++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile
+@@ -2,4 +2,4 @@ rtl8187-objs := dev.o rtl8225.o leds.o
+
+ obj-$(CONFIG_RTL8187) += rtl8187.o
+
+-ccflags-y += -Idrivers/net/wireless/rtl818x
++ccflags-y += -I$(obj)/..
+--- a/drivers/staging/brcm80211/Makefile
++++ b/drivers/staging/brcm80211/Makefile
+@@ -24,10 +24,10 @@ ccflags-y := \
+ -DDBAND \
+ -DBCMDMA32 \
+ -DBCMNVRAMR \
+- -Idrivers/staging/brcm80211/sys \
+- -Idrivers/staging/brcm80211/phy \
+- -Idrivers/staging/brcm80211/util \
+- -Idrivers/staging/brcm80211/include
++ -I$(obj)/sys \
++ -I$(obj)/phy \
++ -I$(obj)/util \
++ -I$(obj)/include
+
+ PCI_CFLAGS := -DWLC_LOW
+
+--- a/drivers/staging/brcm80211/brcmfmac/Makefile
++++ b/drivers/staging/brcm80211/brcmfmac/Makefile
+@@ -33,9 +33,9 @@ ccflags-y := \
+ -DPKT_FILTER_SUPPORT \
+ -DSHOW_EVENTS \
+ -DTOE \
+- -Idrivers/staging/brcm80211/brcmfmac \
+- -Idrivers/staging/brcm80211/include \
+- -Idrivers/staging/brcm80211/util
++ -I$(obj) \
++ -I$(obj)/../include \
++ -I$(obj)/../util
+
+ DHDOFILES = dhd_linux.o ../util/linux_osl.o ../util/bcmutils.o dhd_common.o dhd_custom_gpio.o \
+ wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o \
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index b93761e..f23c33c 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -229,6 +229,8 @@ DRIVERS="$DRIVERS drivers/net/wireless/zd1211rw"
DRIVERS="$DRIVERS drivers/net/wireless/libertas"
DRIVERS="$DRIVERS drivers/net/wireless/p54"
DRIVERS="$DRIVERS drivers/net/wireless/rtl818x"
+DRIVERS="$DRIVERS drivers/net/wireless/rtl818x/rtl8180"
+DRIVERS="$DRIVERS drivers/net/wireless/rtl818x/rtl8187"
DRIVERS="$DRIVERS drivers/net/wireless/rtlwifi"
DRIVERS="$DRIVERS drivers/net/wireless/rtlwifi/rtl8192ce"
DRIVERS="$DRIVERS drivers/net/wireless/libertas_tf"
--
1.7.1
^ permalink raw reply related
* [PATCH 2/4] compat-wireless: remove patches applied mainline
From: Hauke Mehrtens @ 2011-01-01 14:26 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
In-Reply-To: <1293891981-22151-1-git-send-email-hauke@hauke-m.de>
The removed parts are now in mainline and do not have to be backported
any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
| 20 ---------
patches/20-pcidev.patch | 83 ---------------------------------------
2 files changed, 0 insertions(+), 103 deletions(-)
delete mode 100644 patches/20-pcidev.patch
--git a/patches/06-header-changes.patch b/patches/06-header-changes.patch
index 0b90d4c..6e4ae56 100644
--- a/patches/06-header-changes.patch
+++ b/patches/06-header-changes.patch
@@ -26,16 +26,6 @@ cases.
#include "wifi.h"
#include "rc.h"
#include "base.h"
---- a/drivers/net/wireless/wl1251/boot.c
-+++ b/drivers/net/wireless/wl1251/boot.c
-@@ -19,7 +19,6 @@
- *
- */
-
--#include <linux/gpio.h>
- #include <linux/slab.h>
-
- #include "reg.h"
--- a/drivers/net/wireless/wl1251/main.c
+++ b/drivers/net/wireless/wl1251/main.c
@@ -24,6 +24,9 @@
@@ -60,16 +50,6 @@ cases.
#include <linux/spi/spi.h>
#include <linux/wl12xx.h>
---- a/drivers/net/wireless/wl12xx/boot.c
-+++ b/drivers/net/wireless/wl12xx/boot.c
-@@ -21,7 +21,6 @@
- *
- */
-
--#include <linux/gpio.h>
- #include <linux/slab.h>
-
- #include "acx.h"
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -22,6 +22,9 @@
diff --git a/patches/20-pcidev.patch b/patches/20-pcidev.patch
deleted file mode 100644
index d576ce8..0000000
--- a/patches/20-pcidev.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Older kernels than 2.6.24 do not have the is_pcie member as part of
-the struct pci_dev, to help with that we use the compat-2.6.24.c supplied
-compat_is_pcie() when needed.
-
---- a/drivers/net/wireless/ath/ath5k/attach.c
-+++ b/drivers/net/wireless/ath/ath5k/attach.c
-@@ -276,7 +276,7 @@ int ath5k_hw_init(struct ath5k_softc *sc
- /*
- * Write PCI-E power save settings
- */
-- if ((ah->ah_version == AR5K_AR5212) && pdev && (pdev->is_pcie)) {
-+ if ((ah->ah_version == AR5K_AR5212) && pdev && (pci_is_pcie(pdev))) {
- ath5k_hw_reg_write(ah, 0x9248fc00, AR5K_PCIE_SERDES);
- ath5k_hw_reg_write(ah, 0x24924924, AR5K_PCIE_SERDES);
-
---- a/drivers/net/wireless/ath/ath5k/reset.c
-+++ b/drivers/net/wireless/ath/ath5k/reset.c
-@@ -537,7 +537,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah
- * we ingore that flag for PCI-E cards. On PCI cards
- * this flag gets cleared after 64 PCI clocks.
- */
-- bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;
-+ bus_flags = (pdev && pci_is_pcie(pdev)) ? 0 : AR5K_RESET_CTL_PCI;
-
- if (ah->ah_version == AR5K_AR5210) {
- ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
-@@ -594,7 +594,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw
- * we ingore that flag for PCI-E cards. On PCI cards
- * this flag gets cleared after 64 PCI clocks.
- */
-- bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;
-+ bus_flags = (pdev && pci_is_pcie(pdev)) ? 0 : AR5K_RESET_CTL_PCI;
-
- if (ah->ah_version == AR5K_AR5210) {
- ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
---- a/drivers/net/wireless/ath/ath9k/pci.c
-+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -96,7 +96,7 @@ static void ath_pci_bt_coex_prep(struct
- struct pci_dev *pdev = to_pci_dev(sc->dev);
- u8 aspm;
-
-- if (!pdev->is_pcie)
-+ if (!pci_is_pcie(pdev))
- return;
-
- pci_read_config_byte(pdev, ATH_PCIE_CAP_LINK_CTRL, &aspm);
---- a/drivers/net/wireless/rt2x00/rt2x00pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -301,7 +301,7 @@ int rt2x00pci_probe(struct pci_dev *pci_
- rt2x00dev->irq = pci_dev->irq;
- rt2x00dev->name = pci_name(pci_dev);
-
-- if (pci_dev->is_pcie)
-+ if (pci_is_pcie(pci_dev))
- rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
- else
- rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
---- a/drivers/net/wireless/rtlwifi/pci.c
-+++ b/drivers/net/wireless/rtlwifi/pci.c
-@@ -1608,7 +1608,7 @@ static bool _rtl_pci_find_adapter(struct
- pcipriv->ndis_adapter.pcibridge_funcnum =
- PCI_FUNC(bridge_pdev->devfn);
- pcipriv->ndis_adapter.pcibridge_pciehdr_offset =
-- bridge_pdev->pcie_cap;
-+ pci_pcie_cap(bridge_pdev);
- pcipriv->ndis_adapter.pcicfg_addrport =
- (pcipriv->ndis_adapter.pcibridge_busnum << 16) |
- (pcipriv->ndis_adapter.pcibridge_devnum << 11) |
---- a/drivers/ssb/scan.c
-+++ b/drivers/ssb/scan.c
-@@ -405,10 +405,10 @@ int ssb_bus_scan(struct ssb_bus *bus,
- /* Ignore PCI cores on PCI-E cards.
- * Ignore PCI-E cores on PCI cards. */
- if (dev->id.coreid == SSB_DEV_PCI) {
-- if (bus->host_pci->is_pcie)
-+ if (pci_is_pcie(bus->host_pci))
- continue;
- } else {
-- if (!bus->host_pci->is_pcie)
-+ if (!pci_is_pcie(bus->host_pci))
- continue;
- }
- }
--
1.7.1
^ permalink raw reply related
* [PATCH 1/4] compat-wireless: fix power managemnet backport
From: Hauke Mehrtens @ 2011-01-01 14:26 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
Include backported power management support under the same condition as
the new one is integrated.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/11-dev-pm-ops.patch | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index f30baf8..dea121a 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -60,7 +60,7 @@ calls on compat code with only slight modifications.
.remove = ath_pci_remove,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
.driver.pm = ATH9K_PM_OPS,
-+#elif defined(CONFIG_PM_SLEEP)
++#elif defined(CONFIG_PM)
+ .suspend = ath_pci_suspend_compat,
+ .resume = ath_pci_resume_compat,
+#endif
@@ -75,7 +75,7 @@ calls on compat code with only slight modifications.
.remove = __devexit_p(iwl_pci_remove),
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
.driver.pm = IWL_PM_OPS,
-+#elif defined(CONFIG_PM_SLEEP)
++#elif defined(CONFIG_PM)
+ .suspend = iwl_pci_suspend_compat,
+ .resume = iwl_pci_resume_compat,
+#endif
@@ -158,7 +158,7 @@ calls on compat code with only slight modifications.
.remove = __devexit_p(iwl3945_pci_remove),
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
.driver.pm = IWL_PM_OPS,
-+#elif defined(CONFIG_PM_SLEEP)
++#elif defined(CONFIG_PM)
+ .suspend = iwl_pci_suspend_compat,
+ .resume = iwl_pci_resume_compat,
+#endif
--
1.7.1
^ permalink raw reply related
* [PATCH 3/3] compat: add generic functions for suspend/resume
From: Hauke Mehrtens @ 2011-01-01 14:23 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
In-Reply-To: <1293891815-22087-1-git-send-email-hauke@hauke-m.de>
This define is used to generate a suspend and a resume function for pci
devices using the old power management interface. The new interface was
introduced in kernel 2.6.29.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
include/linux/compat-2.6.29.h | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/include/linux/compat-2.6.29.h b/include/linux/compat-2.6.29.h
index 78b2d58..b4e1236 100644
--- a/include/linux/compat-2.6.29.h
+++ b/include/linux/compat-2.6.29.h
@@ -278,6 +278,36 @@ static inline struct net *read_pnet(struct net * const *pnet)
extern int init_dummy_netdev(struct net_device *dev);
+#define compat_pci_suspend(fn) \
+ int fn##_compat(struct pci_dev *pdev, pm_message_t state) \
+ { \
+ int r; \
+ \
+ r = fn(&pdev->dev); \
+ if (r) \
+ return r; \
+ \
+ pci_save_state(pdev); \
+ pci_disable_device(pdev); \
+ pci_set_power_state(pdev, PCI_D3hot); \
+ \
+ return 0; \
+ }
+
+#define compat_pci_resume(fn) \
+ int fn##_compat(struct pci_dev *pdev) \
+ { \
+ int r; \
+ \
+ pci_set_power_state(pdev, PCI_D0); \
+ r = pci_enable_device(pdev); \
+ if (r) \
+ return r; \
+ pci_restore_state(pdev); \
+ \
+ return fn(&pdev->dev); \
+ }
+
#else
static inline void netdev_attach_ops(struct net_device *dev,
@@ -285,6 +315,10 @@ static inline void netdev_attach_ops(struct net_device *dev,
{
dev->netdev_ops = ops;
}
+
+#define compat_pci_suspend(fn)
+#define compat_pci_resume(fn)
+
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) */
#endif /* LINUX_26_29_COMPAT_H */
--
1.7.1
^ permalink raw reply related
* [PATCH 2/3] compat: backport alloc_workqueue
From: Hauke Mehrtens @ 2011-01-01 14:23 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
In-Reply-To: <1293891815-22087-1-git-send-email-hauke@hauke-m.de>
This is needed by rtlwifi.
The function signature of __create_workqueue changed in kernel 2.6.28,
so two different defines are needed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
include/linux/compat-2.6.28.h | 2 ++
include/linux/compat-2.6.36.h | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/include/linux/compat-2.6.28.h b/include/linux/compat-2.6.28.h
index b9024d6..fdb8fb2 100644
--- a/include/linux/compat-2.6.28.h
+++ b/include/linux/compat-2.6.28.h
@@ -236,6 +236,8 @@ extern int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
int pci_wake_from_d3(struct pci_dev *dev, bool enable);
+#define alloc_workqueue(name, flags, max_active) __create_workqueue(name, flags, max_active)
+
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)) */
#endif /* LINUX_26_28_COMPAT_H */
diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h
index 1f2f507..74d2309 100644
--- a/include/linux/compat-2.6.36.h
+++ b/include/linux/compat-2.6.36.h
@@ -97,6 +97,10 @@ struct pm_qos_request_list {
static inline __attribute__ ((format (printf, 1, 2)))
int no_printk(const char *s, ...) { return 0; }
+#ifndef alloc_workqueue
+#define alloc_workqueue(name, flags, max_active) __create_workqueue(name, flags, max_active, 0)
+#endif
+
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) */
#endif /* LINUX_26_36_COMPAT_H */
--
1.7.1
^ permalink raw reply related
* [PATCH 1/3] compat: backport pci_wake_from_d3
From: Hauke Mehrtens @ 2011-01-01 14:23 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
This is needed by atl1c.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/compat-2.6.28.c | 22 ++++++++++++++++++++++
include/linux/compat-2.6.28.h | 2 ++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/compat/compat-2.6.28.c b/compat/compat-2.6.28.c
index 7a834d2..72c9e09 100644
--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
@@ -439,3 +439,25 @@ int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
}
EXPORT_SYMBOL(n_tty_ioctl_helper);
+/**
+ * pci_wake_from_d3 - enable/disable device to wake up from D3_hot or D3_cold
+ * @dev: PCI device to prepare
+ * @enable: True to enable wake-up event generation; false to disable
+ *
+ * Many drivers want the device to wake up the system from D3_hot or D3_cold
+ * and this function allows them to set that up cleanly - pci_enable_wake()
+ * should not be called twice in a row to enable wake-up due to PCI PM vs ACPI
+ * ordering constraints.
+ *
+ * This function only returns error code if the device is not capable of
+ * generating PME# from both D3_hot and D3_cold, and the platform is unable to
+ * enable wake-up power for it.
+ */
+int pci_wake_from_d3(struct pci_dev *dev, bool enable)
+{
+ return pci_pme_capable(dev, PCI_D3cold) ?
+ pci_enable_wake(dev, PCI_D3cold, enable) :
+ pci_enable_wake(dev, PCI_D3hot, enable);
+}
+EXPORT_SYMBOL(pci_wake_from_d3);
+
diff --git a/include/linux/compat-2.6.28.h b/include/linux/compat-2.6.28.h
index 1de39ad..b9024d6 100644
--- a/include/linux/compat-2.6.28.h
+++ b/include/linux/compat-2.6.28.h
@@ -234,6 +234,8 @@ extern void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page,
extern int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg);
+int pci_wake_from_d3(struct pci_dev *dev, bool enable);
+
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)) */
#endif /* LINUX_26_28_COMPAT_H */
--
1.7.1
^ permalink raw reply related
* Re: BUG in rt2x00lib_txdone() with 2.6.37-rc8
From: Heinz Diehl @ 2011-01-01 10:28 UTC (permalink / raw)
To: Stephen Boyd; +Cc: users, Ivo van Doorn, linux-wireless, linux-kernel
In-Reply-To: <4D1DAF0A.40000@gmail.com>
On 31.12.2010, Stephen Boyd wrote:
> [ 9085.714105] BUG: unable to handle kernel NULL pointer dereference at
> 00000000000000a4
> [ 9085.714816] IP: [<ffffffffa0025458>] rt2x00lib_txdone+0x36/0x249
> [rt2x00lib]
> [ 9085.715017] PGD 215fd067 PUD 292f4067 PMD 0
> [ 9085.715017] Oops: 0000 [#1] SMP
> [ 9085.715017] last sysfs file:
> /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
> [ 9085.715017] CPU 1
> [ 9085.715017] Modules linked in: usb_storage thermal snd_seq_oss
> snd_seq_midi snd_seq_dummy snd_pcm_oss snd_mixer_oss snd_hrtimer
> snd_emu10k1_synth snd_emux_synth snd_seq_virmidi snd_seq_midi_event
> snd_seq_midi_emul snd_seq scsi_wait_scan powernow_k8 mperf i2c_i801 fuse
> fan snd_emu10k1 snd_rawmidi snd_ac97_codec ac97_bus snd_pcm
> snd_seq_device snd_timer snd_page_alloc snd_util_mem rt73usb crc_itu_t
> rt2x00usb snd_hwdep snd processor r8169 via82cxxx rt2x00lib soundcore
> mii button k8temp
> [ 9085.715017]
> [ 9085.715017] Pid: 11513, comm: kworker/1:0 Not tainted 2.6.37-rc7+ #27
> MS-7094/MS-7094
[....]
I'm not quite shure on this, but it reminds me on this bug here:
https://bugzilla.kernel.org/show_bug.cgi?id=24892
^ permalink raw reply
* Re: [PATCH] Revert "ath9k: Parse DTIM period from mac80211"
From: Kalle Valo @ 2011-01-01 9:50 UTC (permalink / raw)
To: Mohammed Shafi Shajakhan
Cc: linville, linux-wireless, lrodriguez, Jouni Malinen
In-Reply-To: <1293691681-3574-1-git-send-email-mshajakhan@atheros.com>
Mohammed Shafi Shajakhan <mshajakhan@atheros.com> writes:
> From: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
>
> This reverts commit 0ce3bcfc84900a64347b0fe1140229bd81314008.
>
> Event though with the above commit we obtain the configured DTIM period
> from the AP rather than always hardcoding it to '1', this seems to cause
> problems under the following scenarios:
> * Preventing association with broken AP's
How can different dtim value cause problems with association? Power
save should not be even enabled during association. Or do you mean
there are problems after association, for example during eap
negotation?
> * Adds latency in roaming
We should try to solve this problem differently than hardcoding dtim.
There are other ways to trigger roaming than just following beacons.
And if there's no data, there's no need to roam either.
I have been hoping to work on improving roaming, but never found the
time to do it :/
> So its better to always use the safe value of '1' for dtim period
By hardcoding dtim you increase the power consumption in the case when
there is no data traffic, so it's not definitely better in all cases.
I would prefer to fix the real issues instead of hardcoding dtim. And
if it's really essential to hardcode it now, please add a big fat
warning indicating that this is a temporary solution and should be
fixed properly without hardcoding anything.
--
Kalle Valo
^ permalink raw reply
* Re: [PATCH] ath9k: Reset keycache on resume
From: Kalle Valo @ 2011-01-01 9:33 UTC (permalink / raw)
To: Mohammed Shafi Shajakhan
Cc: linville, Jouni.Malinen, linux-wireless, lrodriguez
In-Reply-To: <1293000612-10884-1-git-send-email-mshajakhan@atheros.com>
Hi,
a minor nitpick:
Mohammed Shafi Shajakhan <mshajakhan@atheros.com> writes:
> From: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
This means that Mohammed is the author of the patch.
[...]
> Signed-off-by: Jouni Malinen <Jouni.Malinen@Atheros.com>
> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
But here the author's sob line should be first one, the order is from
top to bottom. If Mohammed is the author, the sob lines should be
reversed. But if Jouni actually is the author, the From line should be
fixed.
Of course this is just a style issue and doesn't matter that much, but
it's still nice to get it right.
--
Kalle Valo
^ permalink raw reply
* Re: [PATCH 03/15]drivers:staging:rtl8187se:r8180_hw.h Typo change diable to disable.
From: Dan Carpenter @ 2011-01-01 9:09 UTC (permalink / raw)
To: Justin P. Mattock
Cc: Finn Thain, devel, trivial, linux-scsi, netdev, linux-usb,
linux-wireless, linux-kernel, ivtv-devel, linux-m68k,
spi-devel-general, linux-media
In-Reply-To: <4D1EDB22.2020308@gmail.com>
On Fri, Dec 31, 2010 at 11:43:30PM -0800, Justin P. Mattock wrote:
> On 12/31/2010 10:48 PM, Finn Thain wrote:
> >>-/* BIT[8-9] is for SW Antenna Diversity. Only the value EEPROM_SW_AD_ENABLE means enable, other values are diable. */
> >>+/* BIT[8-9] is for SW Antenna Diversity. Only the value EEPROM_SW_AD_ENABLE means enable, other values are disabled. */
> >
> >I think, "other values disable" was what you meant?
> >
> >Finn
> >
> >> #define EEPROM_SW_AD_MASK 0x0300
> >> #define EEPROM_SW_AD_ENABLE 0x0100
> >>
> >>
> >
>
> no! I changed it to disabled to make it proper..
Finn is obviously right, but maybe a compromise would be:
Only the value EEPROM_SW_AD_ENABLE means "enable", other values mean
"disable".
regards,
dan carpenter
^ permalink raw reply
* Re: [PATCH 03/15]drivers:staging:rtl8187se:r8180_hw.h Typo change diable to disable.
From: Justin P. Mattock @ 2011-01-01 7:43 UTC (permalink / raw)
To: Finn Thain
Cc: trivial, linux-m68k, linux-kernel, netdev, ivtv-devel,
linux-media, linux-wireless, linux-scsi, spi-devel-general, devel,
linux-usb
In-Reply-To: <alpine.LNX.2.00.1012311722580.24460@nippy.intranet>
On 12/31/2010 10:48 PM, Finn Thain wrote:
>
> On Thu, 30 Dec 2010, Justin P. Mattock wrote:
>
>> The below patch fixes a typo "diable" to "disable". Please let me know if this
>> is correct or not.
>>
>> Signed-off-by: Justin P. Mattock<justinmattock@gmail.com>
>>
>> ---
>> drivers/staging/rtl8187se/r8180_hw.h | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8187se/r8180_hw.h b/drivers/staging/rtl8187se/r8180_hw.h
>> index 3fca144..2911d40 100644
>> --- a/drivers/staging/rtl8187se/r8180_hw.h
>> +++ b/drivers/staging/rtl8187se/r8180_hw.h
>> @@ -554,7 +554,7 @@
>> /* by amy for power save */
>> /* by amy for antenna */
>> #define EEPROM_SW_REVD_OFFSET 0x3f
>> -/* BIT[8-9] is for SW Antenna Diversity. Only the value EEPROM_SW_AD_ENABLE means enable, other values are diable. */
>> +/* BIT[8-9] is for SW Antenna Diversity. Only the value EEPROM_SW_AD_ENABLE means enable, other values are disabled. */
>
> I think, "other values disable" was what you meant?
>
> Finn
>
>> #define EEPROM_SW_AD_MASK 0x0300
>> #define EEPROM_SW_AD_ENABLE 0x0100
>>
>>
>
no! I changed it to disabled to make it proper..
Justin P. Mattock
^ permalink raw reply
* Re: [PATCH 03/15]drivers:staging:rtl8187se:r8180_hw.h Typo change diable to disable.
From: Finn Thain @ 2011-01-01 6:48 UTC (permalink / raw)
To: Justin P. Mattock
Cc: trivial, linux-m68k, linux-kernel, netdev, ivtv-devel,
linux-media, linux-wireless, linux-scsi, spi-devel-general, devel,
linux-usb
In-Reply-To: <1293750484-1161-3-git-send-email-justinmattock@gmail.com>
On Thu, 30 Dec 2010, Justin P. Mattock wrote:
> The below patch fixes a typo "diable" to "disable". Please let me know if this
> is correct or not.
>
> Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
>
> ---
> drivers/staging/rtl8187se/r8180_hw.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/rtl8187se/r8180_hw.h b/drivers/staging/rtl8187se/r8180_hw.h
> index 3fca144..2911d40 100644
> --- a/drivers/staging/rtl8187se/r8180_hw.h
> +++ b/drivers/staging/rtl8187se/r8180_hw.h
> @@ -554,7 +554,7 @@
> /* by amy for power save */
> /* by amy for antenna */
> #define EEPROM_SW_REVD_OFFSET 0x3f
> -/* BIT[8-9] is for SW Antenna Diversity. Only the value EEPROM_SW_AD_ENABLE means enable, other values are diable. */
> +/* BIT[8-9] is for SW Antenna Diversity. Only the value EEPROM_SW_AD_ENABLE means enable, other values are disabled. */
I think, "other values disable" was what you meant?
Finn
> #define EEPROM_SW_AD_MASK 0x0300
> #define EEPROM_SW_AD_ENABLE 0x0100
>
>
^ permalink raw reply
* Re: [PATCH 11/15]drivers:media:video:cx18:cx23418.h Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-31 22:33 UTC (permalink / raw)
To: Andy Walls
Cc: trivial, linux-m68k, linux-kernel, netdev, ivtv-devel,
linux-media, linux-wireless, linux-scsi, spi-devel-general, devel,
linux-usb
In-Reply-To: <1293830120.2410.11.camel@localhost>
On 12/31/2010 01:15 PM, Andy Walls wrote:
> On Thu, 2010-12-30 at 15:08 -0800, Justin P. Mattock wrote:
>> The below patch fixes a typo "diable" to "disable". Please let me know if this
>> is correct or not.
> ^^^^^^^^^^^^^^
>
> What, else could it be? The "diablo" chroma spatial filter type? ;)
>
> Looks fine.
>
> Acked-by: Andy Walls<awalls@md.metrocast.net>
depends on what the search engine gives you.. diablo did show up
but figured better throw that in to be safe since some definitions
appear to be incorect but are in fact correct..
>
>>
>> Signed-off-by: Justin P. Mattock<justinmattock@gmail.com>
>>
>> ---
>> drivers/media/video/cx18/cx23418.h | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
>> index 2c00980..7e40035 100644
>> --- a/drivers/media/video/cx18/cx23418.h
>> +++ b/drivers/media/video/cx18/cx23418.h
>> @@ -177,7 +177,7 @@
>> IN[0] - Task handle.
>> IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only,
>> 3 = 2D H/V separable, 4 = 2D symmetric non-separable
>> - IN[2] - chroma type: 0 - diable, 1 = 1D horizontal
>> + IN[2] - chroma type: 0 - disable, 1 = 1D horizontal
>> ReturnCode - One of the ERR_CAPTURE_... */
>> #define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C)
>>
>
>
>
cheers,
Justin P. Mattock
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox