mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

netdev-linux: Don't assume 'struct netdev' has offset 0.

Browse Source 
The data items returned by netdev_get_devices() are "struct netdev *"s.
The code fixed up by this commit used them as "struct netdev_linux *",
which happens to work because struct netdev happens to be at offset 0 in
each struct but it's better to do a proper cast in case someday
struct netdev gets moved to a nonzero offset.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2013-08-02 12:19:49 -07:00
parent 7d6ce2d189
commit 96172faa34
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/netdev-linux.c
View File

@@ -557,9 +557,10 @@ netdev_linux_cache_cb(const struct rtnetlink_link_change *change,
shash_init(&device_shash);
netdev_get_devices(&netdev_linux_class, &device_shash);
SHASH_FOR_EACH (node, &device_shash) {
struct netdev *netdev = node->data;
unsigned int flags;
dev = node->data;
dev = netdev_linux_cast(netdev);
get_flags(&dev->up, &flags);
netdev_linux_changed(dev, flags, 0);
@@ -1194,7 +1195,8 @@ netdev_linux_miimon_run(void)
shash_init(&device_shash);
netdev_get_devices(&netdev_linux_class, &device_shash);
SHASH_FOR_EACH (node, &device_shash) {
struct netdev_linux *dev = node->data;
struct netdev *netdev = node->data;
struct netdev_linux *dev = netdev_linux_cast(netdev);
bool miimon;
if (dev->miimon_interval <= 0 || !timer_expired(&dev->miimon_timer)) {
@@ -1222,7 +1224,8 @@ netdev_linux_miimon_wait(void)
shash_init(&device_shash);
netdev_get_devices(&netdev_linux_class, &device_shash);
SHASH_FOR_EACH (node, &device_shash) {
struct netdev_linux *dev = node->data;
struct netdev *netdev = node->data;
struct netdev_linux *dev = netdev_linux_cast(netdev);
if (dev->miimon_interval > 0) {
timer_wait(&dev->miimon_timer);