Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / netdevsim / netdevsim.h

diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 9404637..66bf137 100644 (file)
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -145,6 +145,7 @@ struct nsim_dev_port {
 struct nsim_dev {
        struct nsim_bus_dev *nsim_bus_dev;
        struct nsim_fib_data *fib_data;
+       struct nsim_trap_data *trap_data;
        struct dentry *ddir;
        struct dentry *ports_ddir;
        struct bpf_offload_dev *bpf_dev;
@@ -158,6 +159,9 @@ struct nsim_dev {
        struct list_head port_list;
        struct mutex port_list_lock; /* protects port list */
        bool fw_update_status;
+       u32 max_macs;
+       bool test1;
+       struct devlink_region *dummy_region;
 };
 
 int nsim_dev_init(void);