lib/mac-learning.h: Change one variable's type and name

This commit changes variable "int i" of "union port" of "struct mac_entry"
to "uint16_t ofp_port", since it is used to store the OpenFlow port number.

Signed-off-by: Alex Wang <alexw@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
index 4a95dc1..ab37dcc 100644 (file)
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.c
@@ -474,12 +474,12 @@ lswitch_choose_destination(struct lswitch *sw, const struct flow *flow)
     /* Learn the source MAC. */
     if (mac_learning_may_learn(sw->ml, flow->dl_src, 0)) {
         struct mac_entry *mac = mac_learning_insert(sw->ml, flow->dl_src, 0);
-        if (mac_entry_is_new(mac) || mac->port.i != flow->in_port) {
+        if (mac_entry_is_new(mac) || mac->port.ofp_port != flow->in_port) {
             VLOG_DBG_RL(&rl, "%016llx: learned that "ETH_ADDR_FMT" is on "
                         "port %"PRIu16, sw->datapath_id,
                         ETH_ADDR_ARGS(flow->dl_src), flow->in_port);
 
-            mac->port.i = flow->in_port;
+            mac->port.ofp_port = flow->in_port;
             mac_learning_changed(sw->ml, mac);
         }
     }
@@ -495,7 +495,7 @@ lswitch_choose_destination(struct lswitch *sw, const struct flow *flow)
 
         mac = mac_learning_lookup(sw->ml, flow->dl_dst, 0, NULL);
         if (mac) {
-            out_port = mac->port.i;
+            out_port = mac->port.ofp_port;
             if (out_port == flow->in_port) {
                 /* Don't send a packet back out its input port. */
                 return OFPP_NONE;

diff --git a/lib/mac-learning.h b/lib/mac-learning.h
index 284e7f6..666b00f 100644 (file)
--- a/lib/mac-learning.h
+++ b/lib/mac-learning.h
@@ -49,7 +49,7 @@ struct mac_entry {
     /* Learned port. */
     union {
         void *p;
-        int i;
+        uint16_t ofp_port;
     } port;
 };