diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-10-15 16:11:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-10-15 16:11:56 -0400 |
commit | c64557d666eb62eb5f296c6b93bd0a5525ed1e36 (patch) | |
tree | 1e25cc32521d06ae876de18bb8e48b3cf9d30808 /drivers/net/wireless/rt2x00/rt2400pci.c | |
parent | 1a63c353c856c9f6d44a533afb6ad6dbbcdea683 (diff) | |
parent | 0d91f22b75347d9503b17a42b6c74d3f7750acd6 (diff) |
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/rt2400pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index d49e830fa1d..4f420a9ec5d 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -1104,7 +1104,7 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, | |||
1104 | rt2x00_set_field32(®, CSR14_BEACON_GEN, 0); | 1104 | rt2x00_set_field32(®, CSR14_BEACON_GEN, 0); |
1105 | rt2x00pci_register_write(rt2x00dev, CSR14, reg); | 1105 | rt2x00pci_register_write(rt2x00dev, CSR14, reg); |
1106 | 1106 | ||
1107 | rt2x00queue_map_txskb(rt2x00dev, entry->skb); | 1107 | rt2x00queue_map_txskb(entry); |
1108 | 1108 | ||
1109 | /* | 1109 | /* |
1110 | * Write the TX descriptor for the beacon. | 1110 | * Write the TX descriptor for the beacon. |