1 files changed, 15 insertions, 19 deletions

diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h
index 8da84312cd3b..8055e3965cef 100644
--- a/net/ncsi/internal.h
+++ b/net/ncsi/internal.h
@@ -68,15 +68,6 @@ enum {
         NCSI_MODE_MAX
 };
 
-enum {
-        NCSI_FILTER_BASE        = 0,
-        NCSI_FILTER_VLAN        = 0,
-        NCSI_FILTER_UC,
-        NCSI_FILTER_MC,
-        NCSI_FILTER_MIXED,
-        NCSI_FILTER_MAX
-};
-
 struct ncsi_channel_version {
         u32 version;            /* Supported BCD encoded NCSI version */
         u32 alpha2;             /* Supported BCD encoded NCSI version */
@@ -98,11 +89,18 @@ struct ncsi_channel_mode {
         u32 data[8];    /* Data entries                */
 };
 
-struct ncsi_channel_filter {
-        u32 index;      /* Index of channel filters          */
-        u32 total;      /* Total entries in the filter table */
-        u64 bitmap;     /* Bitmap of valid entries           */
-        u32 data[];     /* Data for the valid entries        */
+struct ncsi_channel_mac_filter {
+        u8      n_uc;
+        u8      n_mc;
+        u8      n_mixed;
+        u64     bitmap;
+        unsigned char   *addrs;
+};
+
+struct ncsi_channel_vlan_filter {
+        u8      n_vids;
+        u64     bitmap;
+        u16     *vids;
 };
 
 struct ncsi_channel_stats {
@@ -186,7 +184,9 @@ struct ncsi_channel {
         struct ncsi_channel_version version;
         struct ncsi_channel_cap     caps[NCSI_CAP_MAX];
         struct ncsi_channel_mode    modes[NCSI_MODE_MAX];
-        struct ncsi_channel_filter  *filters[NCSI_FILTER_MAX];
+        /* Filtering Settings */
+        struct ncsi_channel_mac_filter  mac_filter;
+        struct ncsi_channel_vlan_filter vlan_filter;
         struct ncsi_channel_stats   stats;
         struct {
                 struct timer_list   timer;
@@ -320,10 +320,6 @@ extern spinlock_t ncsi_dev_lock;
         list_for_each_entry_rcu(nc, &np->channels, node)
 
 /* Resources */
-u32 *ncsi_get_filter(struct ncsi_channel *nc, int table, int index);
-int ncsi_find_filter(struct ncsi_channel *nc, int table, void *data);
-int ncsi_add_filter(struct ncsi_channel *nc, int table, void *data);
-int ncsi_remove_filter(struct ncsi_channel *nc, int table, int index);
 void ncsi_start_channel_monitor(struct ncsi_channel *nc);
 void ncsi_stop_channel_monitor(struct ncsi_channel *nc);
 struct ncsi_channel *ncsi_find_channel(struct ncsi_package *np,