Merge tag 'metag-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[deliverable/linux.git] / drivers / net / ethernet / intel / i40e / i40e.h

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index e83fc8afb30f04c0f3ee4ee4272587b2d4fc0039..2a882916b4f6c9c7acf5085942acded7ff791535 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -448,6 +448,14 @@ struct i40e_pf {
        u16 phy_led_val;
 };
 
+enum i40e_filter_state {
+       I40E_FILTER_INVALID = 0,        /* Invalid state */
+       I40E_FILTER_NEW,                /* New, not sent to FW yet */
+       I40E_FILTER_ACTIVE,             /* Added to switch by FW */
+       I40E_FILTER_FAILED,             /* Rejected by FW */
+       I40E_FILTER_REMOVE,             /* To be removed */
+/* There is no 'removed' state; the filter struct is freed */
+};
 struct i40e_mac_filter {
        struct list_head list;
        u8 macaddr[ETH_ALEN];
@@ -456,8 +464,7 @@ struct i40e_mac_filter {
        u8 counter;             /* number of instances of this filter */
        bool is_vf;             /* filter belongs to a VF */
        bool is_netdev;         /* filter belongs to a netdev */
-       bool changed;           /* filter needs to be sync'd to the HW */
-       bool is_laa;            /* filter is a Locally Administered Address */
+       enum i40e_filter_state state;
 };
 
 struct i40e_veb {
@@ -523,6 +530,9 @@ struct i40e_vsi {
        struct i40e_ring **rx_rings;
        struct i40e_ring **tx_rings;
 
+       u32  active_filters;
+       u32  promisc_threshold;
+
        u16 work_limit;
        u16 int_rate_limit;  /* value in usecs */