Handle ethernet drivers that try to indicate unknown with negative speed.

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3387 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo 2008-03-07 17:40:31 +00:00
parent 593520f9a8
commit 85e5092363
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2008-03-07 Tambet Ingo <tambet@gmail.com>
* src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_get_speed): Handle
the case correctly where driver is trying to send -1 for the speed, which gets
casted to u16 and thus is always > 0.
2008-03-07 Dan Williams <dcbw@redhat.com>
* src/nm-hal-manager.c

View file

@ -578,7 +578,8 @@ nm_device_802_3_ethernet_get_speed (NMDevice8023Ethernet *self)
ifr.ifr_data = (char *) &edata;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCETHTOOL, &ifr) == -1)
goto out;
speed = edata.speed > 0 ? (guint32) edata.speed : 0;
speed = edata.speed != G_MAXUINT16 ? edata.speed : 0;
out:
nm_dev_sock_close (sk);