summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Šimerda <psimerda@redhat.com>2013-07-29 14:40:50 +0200
committerPavel Šimerda <psimerda@redhat.com>2013-07-30 11:40:18 +0200
commitf6ef3740763e50f0fcb80c8feec78d30d01add5f (patch)
treeee85462e8d84f2410d2c6b5ecb506296d723bfab
parent439473e9a4e86085fb23d6e8c8e2a5b1975abc1a (diff)
downloadNetworkManager-f6ef3740763e50f0fcb80c8feec78d30d01add5f.tar.gz
trivial: use 'preferred' attribute name for preferred lifetime
-rw-r--r--src/rdisc/nm-lndp-rdisc.c2
-rw-r--r--src/rdisc/nm-rdisc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rdisc/nm-lndp-rdisc.c b/src/rdisc/nm-lndp-rdisc.c
index 6b61d87658..ab27fa8327 100644
--- a/src/rdisc/nm-lndp-rdisc.c
+++ b/src/rdisc/nm-lndp-rdisc.c
@@ -481,7 +481,7 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data)
address.address = route.network;
address.timestamp = now;
address.lifetime = ndp_msg_opt_prefix_valid_time (msg, offset);
- address.preferred_lft = ndp_msg_opt_prefix_preferred_time (msg, offset);
+ address.preferred = ndp_msg_opt_prefix_preferred_time (msg, offset);
fill_address_from_mac (&address.address, lladdr);
diff --git a/src/rdisc/nm-rdisc.h b/src/rdisc/nm-rdisc.h
index abdd81cdab..c645bda2cd 100644
--- a/src/rdisc/nm-rdisc.h
+++ b/src/rdisc/nm-rdisc.h
@@ -60,7 +60,7 @@ typedef struct {
struct in6_addr address;
guint32 timestamp;
guint32 lifetime;
- guint32 preferred_lft;
+ guint32 preferred;
} NMRDiscAddress;
typedef struct {