diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-15 22:11:56 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-15 22:11:56 +0200 |
| commit | c64557d666eb62eb5f296c6b93bd0a5525ed1e36 (patch) | |
| tree | 1e25cc32521d06ae876de18bb8e48b3cf9d30808 /drivers/net/wireless/rt2x00/rt2500pci.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova... (diff) | |
| parent | drivers/net/wireless/p54/eeprom.c: Return -ENOMEM on memory allocation failure (diff) | |
| download | linux-c64557d666eb62eb5f296c6b93bd0a5525ed1e36.tar.xz linux-c64557d666eb62eb5f296c6b93bd0a5525ed1e36.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 2214c3231727..97feb7aef809 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c @@ -1258,7 +1258,7 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, rt2x00_set_field32(®, 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. |