Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / drivers / net / wireless / rt2x00 / rt2400pci.c

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index a6e9c89..b36ed1c 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -244,27 +244,39 @@ static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 #endif /* CONFIG_RT2400PCI_RFKILL */
 
 #ifdef CONFIG_RT2400PCI_LEDS
-static void rt2400pci_led_brightness(struct led_classdev *led_cdev,
+static void rt2400pci_brightness_set(struct led_classdev *led_cdev,
                                     enum led_brightness brightness)
 {
        struct rt2x00_led *led =
            container_of(led_cdev, struct rt2x00_led, led_dev);
        unsigned int enabled = brightness != LED_OFF;
-       unsigned int activity =
-           led->rt2x00dev->led_flags & LED_SUPPORT_ACTIVITY;
        u32 reg;
 
        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
 
-       if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC) {
+       if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)
                rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);
-               rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled && activity);
-       }
+       else if (led->type == LED_TYPE_ACTIVITY)
+               rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled);
 
        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
 }
-#else
-#define rt2400pci_led_brightness       NULL
+
+static int rt2400pci_blink_set(struct led_classdev *led_cdev,
+                              unsigned long *delay_on,
+                              unsigned long *delay_off)
+{
+       struct rt2x00_led *led =
+           container_of(led_cdev, struct rt2x00_led, led_dev);
+       u32 reg;
+
+       rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+       rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, *delay_on);
+       rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, *delay_off);
+       rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+
+       return 0;
+}
 #endif /* CONFIG_RT2400PCI_LEDS */
 
 /*
@@ -290,7 +302,8 @@ static void rt2400pci_config_filter(struct rt2x00_dev *rt2x00dev,
        rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
                           !(filter_flags & FIF_PROMISC_IN_BSS));
        rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
-                          !(filter_flags & FIF_PROMISC_IN_BSS));
+                          !(filter_flags & FIF_PROMISC_IN_BSS) &&
+                          !rt2x00dev->intf_ap_count);
        rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
        rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
 }
@@ -350,7 +363,7 @@ static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev,
        rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);
 
        rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
-       rt2x00_set_field32(&reg, ARCSR2_SIGNAL, 0x00 | preamble_mask);
+       rt2x00_set_field32(&reg, ARCSR2_SIGNAL, 0x00);
        rt2x00_set_field32(&reg, ARCSR2_SERVICE, 0x04);
        rt2x00_set_field32(&reg, ARCSR2_LENGTH, get_duration(ACK_SIZE, 10));
        rt2x00pci_register_write(rt2x00dev, ARCSR2, reg);
@@ -718,10 +731,16 @@ static int rt2400pci_init_registers(struct rt2x00_dev *rt2x00dev)
                           (rt2x00dev->rx->data_size / 128));
        rt2x00pci_register_write(rt2x00dev, CSR9, reg);
 
-       rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);
-       rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, 70);
-       rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, 30);
-       rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
+       rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+       rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);
+       rt2x00_set_field32(&reg, CSR14_TSF_SYNC, 0);
+       rt2x00_set_field32(&reg, CSR14_TBCN, 0);
+       rt2x00_set_field32(&reg, CSR14_TCFP, 0);
+       rt2x00_set_field32(&reg, CSR14_TATIMW, 0);
+       rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
+       rt2x00_set_field32(&reg, CSR14_CFP_COUNT_PRELOAD, 0);
+       rt2x00_set_field32(&reg, CSR14_TBCM_PRELOAD, 0);
+       rt2x00pci_register_write(rt2x00dev, CSR14, reg);
 
        rt2x00pci_register_write(rt2x00dev, CNT3, 0x3f080000);
 
@@ -1290,19 +1309,22 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
 #ifdef CONFIG_RT2400PCI_LEDS
        value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
 
-       switch (value) {
-       case LED_MODE_ASUS:
-       case LED_MODE_ALPHA:
-       case LED_MODE_DEFAULT:
-               rt2x00dev->led_flags = LED_SUPPORT_RADIO;
-               break;
-       case LED_MODE_TXRX_ACTIVITY:
-               rt2x00dev->led_flags =
-                   LED_SUPPORT_RADIO | LED_SUPPORT_ACTIVITY;
-               break;
-       case LED_MODE_SIGNAL_STRENGTH:
-               rt2x00dev->led_flags = LED_SUPPORT_RADIO;
-               break;
+       rt2x00dev->led_radio.rt2x00dev = rt2x00dev;
+       rt2x00dev->led_radio.type = LED_TYPE_RADIO;
+       rt2x00dev->led_radio.led_dev.brightness_set =
+           rt2400pci_brightness_set;
+       rt2x00dev->led_radio.led_dev.blink_set =
+           rt2400pci_blink_set;
+       rt2x00dev->led_radio.flags = LED_INITIALIZED;
+
+       if (value == LED_MODE_TXRX_ACTIVITY) {
+               rt2x00dev->led_qual.rt2x00dev = rt2x00dev;
+               rt2x00dev->led_qual.type = LED_TYPE_ACTIVITY;
+               rt2x00dev->led_qual.led_dev.brightness_set =
+                   rt2400pci_brightness_set;
+               rt2x00dev->led_qual.led_dev.blink_set =
+                   rt2400pci_blink_set;
+               rt2x00dev->led_qual.flags = LED_INITIALIZED;
        }
 #endif /* CONFIG_RT2400PCI_LEDS */
 
@@ -1568,7 +1590,6 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
        .link_stats             = rt2400pci_link_stats,
        .reset_tuner            = rt2400pci_reset_tuner,
        .link_tuner             = rt2400pci_link_tuner,
-       .led_brightness         = rt2400pci_led_brightness,
        .write_tx_desc          = rt2400pci_write_tx_desc,
        .write_tx_data          = rt2x00pci_write_tx_data,
        .kick_tx_queue          = rt2400pci_kick_tx_queue,