Finish removing references to the MAC table.

diff --git a/datapath/chain.h b/datapath/chain.h
index fc07f513772540c42ed4d506027cd1c32bdb4000..76692539cd96eda0ac3f0cdc5dfebbf3b9a59a00 100644 (file)
--- a/datapath/chain.h
+++ b/datapath/chain.h
@@ -8,8 +8,6 @@ struct datapath;
 
 #define TABLE_LINEAR_MAX_FLOWS  100
 #define TABLE_HASH_MAX_FLOWS   65536
-#define TABLE_MAC_MAX_FLOWS     1024
-#define TABLE_MAC_NUM_BUCKETS   1024
 
 /* Set of tables chained together in sequence from cheap to expensive. */
 #define CHAIN_MAX_TABLES 4

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 639a4836e2c0b81d90f3f956f5947d5f82894ce6..67c4cf43bad5852a1d837d42baba894011208647 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -653,7 +653,6 @@ fill_features_reply(struct datapath *dp, struct ofp_switch_features *ofr)
        ofr->datapath_id    = cpu_to_be64(dp->id); 
 
        ofr->n_exact        = htonl(2 * TABLE_HASH_MAX_FLOWS);
-       ofr->n_mac_only     = htonl(TABLE_MAC_MAX_FLOWS);
        ofr->n_compression  = 0;                                           /* Not supported */
        ofr->n_general      = htonl(TABLE_LINEAR_MAX_FLOWS);
        ofr->buffer_mb      = htonl(UINT32_MAX);

diff --git a/include/openflow.h b/include/openflow.h
index 7462b884fd3ca59e3561ff43de4349d3df164dbc..43fb817b5d071c658257014cb2bf27a1b6c04755 100644 (file)
--- a/include/openflow.h
+++ b/include/openflow.h
@@ -164,7 +164,6 @@ struct ofp_switch_features {
 
     /* Table info. */
     uint32_t n_exact;       /* Max exact-match table entries. */
-    uint32_t n_mac_only;    /* Max mac-only table entries. */
     uint32_t n_compression; /* Max entries compressed on service port.  */
     uint32_t n_general;     /* Max entries of arbitrary form. */
 

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 8b056fd9ea3420343700dacc8f5afd7dde0c323f..2a76991d444444ac5377887d8feb0ad03c851a6b 100644 (file)
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -302,8 +302,8 @@ ofp_print_switch_features(struct ds *string, const void *oh, size_t len,
     int i;
 
     ds_put_format(string, "dp id:%"PRIx64"\n", ntohll(osf->datapath_id));
-    ds_put_format(string, "tables: exact:%d, mac:%d, compressed:%d, general:%d\n",
-           ntohl(osf->n_exact), ntohl(osf->n_mac_only),
+    ds_put_format(string, "tables: exact:%d, compressed:%d, general:%d\n",
+           ntohl(osf->n_exact), 
            ntohl(osf->n_compression), ntohl(osf->n_general));
     ds_put_format(string, "buffers: size:%d, number:%d\n",
            ntohl(osf->buffer_mb), ntohl(osf->n_buffers));

diff --git a/switch/datapath.c b/switch/datapath.c
index 0d4ffa77d647cb9c19ae371daf45c88f1bde5ca6..94100612fc63aa290a88c02501b11e266c0d84fa 100644 (file)
--- a/switch/datapath.c
+++ b/switch/datapath.c
@@ -572,8 +572,7 @@ dp_send_features_reply(struct datapath *dp, const struct sender *sender)
                                 sender, &buffer);
     ofr->datapath_id    = htonll(dp->id); 
     ofr->n_exact        = htonl(2 * TABLE_HASH_MAX_FLOWS);
-    ofr->n_mac_only     = htonl(TABLE_MAC_MAX_FLOWS);
-    ofr->n_compression  = 0;                                           /* Not supported */
+    ofr->n_compression  = 0;         /* Not supported */
     ofr->n_general      = htonl(TABLE_LINEAR_MAX_FLOWS);
     ofr->buffer_mb      = htonl(UINT32_MAX);
     ofr->n_buffers      = htonl(N_PKT_BUFFERS);