forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse source
This commit is contained in:
John W. Linville 2010-10-15 16:11:56 -04:00
commit c64557d666
151 changed files with 5269 additions and 6380 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/rt2x00/rt2400pci.c
View file

@ -1104,7 +1104,7 @@ static void rt2400pci_write_beacon(struct queue_entry *entry,
rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
rt2x00pci_register_write(rt2x00dev, CSR14, reg);
rt2x00queue_map_txskb(rt2x00dev, entry->skb);
rt2x00queue_map_txskb(entry);
/*
* Write the TX descriptor for the beacon.