From d485c3f0ce4ad3f5606f60d551e935e333a3124c Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Tue, 15 Apr 2008 13:42:35 -0700 Subject: [PATCH] Finish removing references to the MAC table. --- datapath/chain.h | 2 -- datapath/datapath.c | 1 - include/openflow.h | 1 - lib/ofp-print.c | 4 ++-- switch/datapath.c | 3 +-- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/datapath/chain.h b/datapath/chain.h index fc07f513..76692539 100644 --- 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 639a4836..67c4cf43 100644 --- 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 7462b884..43fb817b 100644 --- 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 8b056fd9..2a76991d 100644 --- 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 0d4ffa77..94100612 100644 --- 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); -- 2.30.2