Johannes Berg 4334ec8518 mac80211: fix TX status cookie in HW offload case ... When the off-channel TX is done with remain-on-channel offloaded to hardware, the reported cookie is wrong as in that case we shouldn't use the SKB as the cookie but need to instead use the corresponding r-o-c cookie (XOR'ed with 2 to prevent API mismatches). Fix this by keeping track of the hw_roc_skb pointer just for the status processing and use the correct cookie to report in this case. We can't use the hw_roc_skb pointer itself because it is NULL'ed when the frame is transmitted to prevent it being used twice. This fixes a bug where the P2P state machine in the supplicant gets stuck because it never gets a correct result for its transmitted frame. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2011-02-02 16:38:59 -05:00
..
9p	net/9p/protocol.c: Remove duplicated macros.	2010-12-08 09:56:28 -08:00
802	net/802: add __rcu annotations	2010-10-25 13:09:44 -07:00
8021q	8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues	2010-11-28 10:47:19 -08:00
appletalk
atm	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
ax25	net: ax25: fix information leak to userland	2010-11-10 10:14:33 -08:00
batman-adv	batman-adv: Return hna count on local buffer fill	2010-12-20 10:32:03 -08:00
bluetooth	Bluetooth: Fix race condition with conn->sec_level	2011-01-19 14:43:11 -02:00
bridge	net: bridge: check the length of skb after nf_bridge_maybe_copy_header()	2011-01-06 11:33:05 -08:00
caif	Net: caif: Makefile: Remove deprecated items	2010-11-22 08:16:09 -08:00
can	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
ceph	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-26 22:37:05 -08:00
core	net offloading: Convert checksums to use centrally computed features.	2011-01-09 23:35:35 -08:00
dcb	dcb: use after free in dcb_flushapp()	2011-01-06 11:16:54 -08:00
dccp	dccp: make upper bound for seq_window consistent on 32/64 bit	2011-01-07 12:22:44 +01:00
decnet	net: Abstract default MTU metric calculation behind an accessor.	2010-12-14 13:01:14 -08:00
dns_resolver	Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions	2010-11-22 08:16:10 -08:00
dsa	net/dsa: don't use flush_scheduled_work()	2010-12-24 15:59:06 +01:00
econet	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-17 12:27:22 -08:00
ethernet	net: return operator cleanup	2010-09-23 14:33:39 -07:00
ieee802154	net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()	2010-12-08 10:07:24 -08:00
ipv4	netlink: test for all flags of the NLM_F_DUMP composite	2011-01-09 16:25:03 -08:00
ipv6	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-20 13:24:14 -08:00
ipx	BKL: introduce CONFIG_BKL.	2010-10-21 15:44:13 +02:00
irda	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-26 22:37:05 -08:00
iucv	[S390] irq: have detailed statistics for interrupt types	2011-01-05 12:47:25 +01:00
key	net: return operator cleanup	2010-09-23 14:33:39 -07:00
l2tp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-08 13:47:38 -08:00
lapb	Net: lapb: Makefile: Remove deprecated kbuild goal definitions	2010-11-22 08:16:14 -08:00
llc	net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()	2010-12-08 10:07:24 -08:00
mac80211	mac80211: fix TX status cookie in HW offload case	2011-02-02 16:38:59 -05:00
netfilter	netlink: test for all flags of the NLM_F_DUMP composite	2011-01-09 16:25:03 -08:00
netlabel	net: kill unused macros	2010-12-19 21:59:35 -08:00
netlink	netlink: test for all flags of the NLM_F_DUMP composite	2011-01-09 16:25:03 -08:00
netrom
packet	net: Use skb_checksum_start_offset()	2010-12-16 14:43:14 -08:00
phonet	Net: phonet: Makefile: Remove deprecated kbuild goal definitions	2010-11-22 08:16:14 -08:00
rds	Net: rds: Makefile: Remove deprecated items	2010-11-22 08:16:15 -08:00
rfkill	rfkill: remove dead code	2010-11-15 13:24:06 -05:00
rose	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
rxrpc	Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions	2010-11-22 08:16:15 -08:00
sched	net_sched: pfifo_head_drop problem	2011-01-05 13:39:17 -08:00
sctp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-17 12:27:22 -08:00
sunrpc	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
tipc	tipc: update log.h re-include protection to reflect new name	2011-01-01 14:56:18 -08:00
unix	af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.	2011-01-05 15:38:53 -08:00
wanrouter	Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions	2010-11-22 08:16:16 -08:00
wimax
wireless	cfg80211: fix transposition of words in printk	2011-01-04 14:43:01 -05:00
x25	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-08 13:47:38 -08:00
xfrm	netlink: test for all flags of the NLM_F_DUMP composite	2011-01-09 16:25:03 -08:00
compat.c	net: Limit socket I/O iovec total length to INT_MAX.	2010-10-28 11:47:52 -07:00
Kconfig	net: Add batman-adv meshing protocol	2010-12-16 13:44:24 -08:00
Makefile	net: Add batman-adv meshing protocol	2010-12-16 13:44:24 -08:00
nonet.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
socket.c	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00
sysctl_net.c
TUNABLE