Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3893d547 authored by Malli Chilakala's avatar Malli Chilakala Committed by Jeff Garzik
Browse files

[PATCH] e1000: Included proposals to false late collisions due to H/W latencies 



Included proposals to false late collisions due to H/W latencies

Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: default avatarGanesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
parent 6921368f

drivers/net/e1000/e1000_hw.c

+14 −5
Original line number Diff line number Diff line
@@ -354,7 +354,18 @@ e1000_set_media_type(struct e1000_hw *hw) 
        hw->media_type = e1000_media_type_internal_serdes;

        break;

    default:

        if(hw->mac_type >= e1000_82543) {

        switch (hw->mac_type) {

        case e1000_82542_rev2_0:

        case e1000_82542_rev2_1:

            hw->media_type = e1000_media_type_fiber;

            break;

        case e1000_82573:

            /* The STATUS_TBIMODE bit is reserved or reused for the this

             * device.

             */

            hw->media_type = e1000_media_type_copper;

            break;

        default:

            status = E1000_READ_REG(hw, STATUS);

            if (status & E1000_STATUS_TBIMODE) {

                hw->media_type = e1000_media_type_fiber;
@@ -363,9 +374,7 @@ e1000_set_media_type(struct e1000_hw *hw) 
            } else {

                hw->media_type = e1000_media_type_copper;

            }

        } else {

            /* This is an 82542 (fiber only) */

            hw->media_type = e1000_media_type_fiber;

            break;

        }

    }

}

drivers/net/e1000/e1000_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ typedef enum { 
    e1000_eeprom_spi,

    e1000_eeprom_microwire,

    e1000_eeprom_flash,

    e1000_eeprom_none, /* No NVM support */

    e1000_num_eeprom_types

} e1000_eeprom_type;