Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Side by Side Diff: chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8187_dev.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Linux device driver for RTL8187 2 * Linux device driver for RTL8187
3 * 3 *
4 * Copyright 2007 Michael Wu <flamingice@sourmilk.net> 4 * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
5 * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> 5 * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
6 * 6 *
7 * Based on the r8187 driver, which is: 7 * Based on the r8187 driver, which is:
8 * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al. 8 * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
9 * 9 *
10 * The driver was extended to the RTL8187B in 2008 by: 10 * The driver was extended to the RTL8187B in 2008 by:
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 566
567 i = 10; 567 i = 10;
568 do { 568 do {
569 msleep(2); 569 msleep(2);
570 if (!(rtl818x_ioread8(priv, &priv->map->CMD) & 570 if (!(rtl818x_ioread8(priv, &priv->map->CMD) &
571 RTL818X_CMD_RESET)) 571 RTL818X_CMD_RESET))
572 break; 572 break;
573 } while (--i); 573 } while (--i);
574 574
575 if (!i) { 575 if (!i) {
576 » » wiphy_err(dev->wiphy, "reset timeout!\n"); 576 » » wiphy_err(dev->wiphy, "Reset timeout!\n");
577 return -ETIMEDOUT; 577 return -ETIMEDOUT;
578 } 578 }
579 579
580 /* reload registers from eeprom */ 580 /* reload registers from eeprom */
581 rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_LOAD); 581 rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_LOAD);
582 582
583 i = 10; 583 i = 10;
584 do { 584 do {
585 msleep(4); 585 msleep(4);
586 if (!(rtl818x_ioread8(priv, &priv->map->EEPROM_CMD) & 586 if (!(rtl818x_ioread8(priv, &priv->map->EEPROM_CMD) &
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
1527 dev->queues = 4; 1527 dev->queues = 4;
1528 1528
1529 err = ieee80211_register_hw(dev); 1529 err = ieee80211_register_hw(dev);
1530 if (err) { 1530 if (err) {
1531 printk(KERN_ERR "rtl8187: Cannot register device\n"); 1531 printk(KERN_ERR "rtl8187: Cannot register device\n");
1532 goto err_free_dmabuf; 1532 goto err_free_dmabuf;
1533 } 1533 }
1534 mutex_init(&priv->conf_mutex); 1534 mutex_init(&priv->conf_mutex);
1535 skb_queue_head_init(&priv->b_tx_status.queue); 1535 skb_queue_head_init(&priv->b_tx_status.queue);
1536 1536
1537 » wiphy_info(dev->wiphy, "hwaddr %pm, %s v%d + %s, rfkill mask %d\n", 1537 » wiphy_info(dev->wiphy, "hwaddr %pM, %s V%d + %s, rfkill mask %d\n",
1538 mac_addr, chip_name, priv->asic_rev, priv->rf->name, 1538 mac_addr, chip_name, priv->asic_rev, priv->rf->name,
1539 priv->rfkill_mask); 1539 priv->rfkill_mask);
1540 1540
1541 #ifdef CONFIG_RTL8187_LEDS 1541 #ifdef CONFIG_RTL8187_LEDS
1542 eeprom_93cx6_read(&eeprom, 0x3F, &reg); 1542 eeprom_93cx6_read(&eeprom, 0x3F, &reg);
1543 reg &= 0xFF; 1543 reg &= 0xFF;
1544 rtl8187_leds_init(dev, reg); 1544 rtl8187_leds_init(dev, reg);
1545 #endif 1545 #endif
1546 rtl8187_rfkill_init(dev); 1546 rtl8187_rfkill_init(dev);
1547 1547
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1589 return usb_register(&rtl8187_driver); 1589 return usb_register(&rtl8187_driver);
1590 } 1590 }
1591 1591
1592 static void __exit rtl8187_exit(void) 1592 static void __exit rtl8187_exit(void)
1593 { 1593 {
1594 usb_deregister(&rtl8187_driver); 1594 usb_deregister(&rtl8187_driver);
1595 } 1595 }
1596 1596
1597 module_init(rtl8187_init); 1597 module_init(rtl8187_init);
1598 module_exit(rtl8187_exit); 1598 module_exit(rtl8187_exit);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698