← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/net/e1000e/es2lan.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/e1000e/es2lan.c
612
612
        while (timeout) {
613
613
                if (er32(EEMNGCTL) & mask)
614
614
                        break;
615
 
                msleep(1);
 
615
                usleep_range(1000, 2000);
616
616
                timeout--;
617
617
        }
618
618
        if (!timeout) {
802
802
        ew32(TCTL, E1000_TCTL_PSP);
803
803
        e1e_flush();
804
804
 
805
 
        msleep(10);
 
805
        usleep_range(10000, 20000);
806
806
 
807
807
        ctrl = er32(CTRL);
808
808
 
1434
1434
static struct e1000_mac_operations es2_mac_ops = {
1435
1435
        .read_mac_addr          = e1000_read_mac_addr_80003es2lan,
1436
1436
        .id_led_init            = e1000e_id_led_init,
 
1437
        .blink_led              = e1000e_blink_led_generic,
1437
1438
        .check_mng_mode         = e1000e_check_mng_mode_generic,
1438
1439
        /* check_for_link dependent on media type */
1439
1440
        .cleanup_led            = e1000e_cleanup_led_generic,