diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2400pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 28999ffaba2e..0e345659f421 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -265,9 +265,9 @@ static void rt2400pci_config_bssid(struct rt2x00_dev *rt2x00dev, | |||
265 | (2 * sizeof(__le32))); | 265 | (2 * sizeof(__le32))); |
266 | } | 266 | } |
267 | 267 | ||
268 | static void rt2400pci_config_type(struct rt2x00_dev *rt2x00dev, int type) | 268 | static void rt2400pci_config_type(struct rt2x00_dev *rt2x00dev, const int type, |
269 | const int tsf_sync) | ||
269 | { | 270 | { |
270 | struct interface *intf = &rt2x00dev->interface; | ||
271 | u32 reg; | 271 | u32 reg; |
272 | 272 | ||
273 | rt2x00pci_register_write(rt2x00dev, CSR14, 0); | 273 | rt2x00pci_register_write(rt2x00dev, CSR14, 0); |
@@ -287,13 +287,7 @@ static void rt2400pci_config_type(struct rt2x00_dev *rt2x00dev, int type) | |||
287 | rt2x00_set_field32(®, CSR14_TSF_COUNT, 1); | 287 | rt2x00_set_field32(®, CSR14_TSF_COUNT, 1); |
288 | rt2x00_set_field32(®, CSR14_TBCN, 1); | 288 | rt2x00_set_field32(®, CSR14_TBCN, 1); |
289 | rt2x00_set_field32(®, CSR14_BEACON_GEN, 0); | 289 | rt2x00_set_field32(®, CSR14_BEACON_GEN, 0); |
290 | if (is_interface_type(intf, IEEE80211_IF_TYPE_IBSS) || | 290 | rt2x00_set_field32(®, CSR14_TSF_SYNC, tsf_sync); |
291 | is_interface_type(intf, IEEE80211_IF_TYPE_AP)) | ||
292 | rt2x00_set_field32(®, CSR14_TSF_SYNC, 2); | ||
293 | else if (is_interface_type(intf, IEEE80211_IF_TYPE_STA)) | ||
294 | rt2x00_set_field32(®, CSR14_TSF_SYNC, 1); | ||
295 | else | ||
296 | rt2x00_set_field32(®, CSR14_TSF_SYNC, 0); | ||
297 | rt2x00pci_register_write(rt2x00dev, CSR14, reg); | 291 | rt2x00pci_register_write(rt2x00dev, CSR14, reg); |
298 | } | 292 | } |
299 | 293 | ||