summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-08-11 12:00:37 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-11 12:00:37 -0700
commitcdf0969763e020923abe28fddc605add572febc2 (patch)
treebc568521de044fb42db344a3c5d2625f0029ac0f /include/net
parent2c9c3bbbbfe9f7f700c30d9ac40c1abca59d39ee (diff)
Revert "Merge branch 'mv88e6xxx-switchdev-fdb'"
This reverts commit f1d5ca434413b20cd3f8c18ff2b634b7782149a5, reversing changes made to 4933d85c5173832ebd261756522095837583c458. I applied v2 instead of v3. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/dsa.h16
-rw-r--r--include/net/switchdev.h3
2 files changed, 7 insertions, 12 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 091d35f77180..fbca63ba8f73 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -296,16 +296,12 @@ struct dsa_switch_driver {
u32 br_port_mask);
int (*port_stp_update)(struct dsa_switch *ds, int port,
u8 state);
-
- /*
- * Forwarding database
- */
- int (*port_fdb_add)(struct dsa_switch *ds, int port, u16 vid,
- const u8 addr[ETH_ALEN]);
- int (*port_fdb_del)(struct dsa_switch *ds, int port, u16 vid,
- const u8 addr[ETH_ALEN]);
- int (*port_fdb_getnext)(struct dsa_switch *ds, int port, u16 *vid,
- u8 addr[ETH_ALEN], bool *is_static);
+ int (*fdb_add)(struct dsa_switch *ds, int port,
+ const unsigned char *addr, u16 vid);
+ int (*fdb_del)(struct dsa_switch *ds, int port,
+ const unsigned char *addr, u16 vid);
+ int (*fdb_getnext)(struct dsa_switch *ds, int port,
+ unsigned char *addr, bool *is_static);
};
void register_switch_driver(struct dsa_switch_driver *type);
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 0e296b82aef3..89da8934519b 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -70,9 +70,8 @@ struct switchdev_obj {
u32 tb_id;
} ipv4_fib;
struct switchdev_obj_fdb { /* PORT_FDB */
- u8 addr[ETH_ALEN];
+ const unsigned char *addr;
u16 vid;
- bool is_static;
} fdb;
} u;
};