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

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / broadcom / bnx2x / bnx2x_vfpf.h

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
index bfc80baec00d7564628f4088be05c47ae3f9a899..41708faab5752ac00f4f59edcceebf8545f59da3 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
@@ -328,9 +328,15 @@ struct pf_vf_bulletin_content {
 #define MAC_ADDR_VALID         0       /* alert the vf that a new mac address
                                         * is available for it
                                         */
+#define VLAN_VALID             1       /* when set, the vf should not access
+                                        * the vfpf channel
+                                        */
 
        u8 mac[ETH_ALEN];
-       u8 padding[2];
+       u8 mac_padding[2];
+
+       u16 vlan;
+       u8 vlan_padding[6];
 };
 
 union pf_vf_bulletin {
@@ -353,6 +359,7 @@ enum channel_tlvs {
        CHANNEL_TLV_LIST_END,
        CHANNEL_TLV_FLR,
        CHANNEL_TLV_PF_SET_MAC,
+       CHANNEL_TLV_PF_SET_VLAN,
        CHANNEL_TLV_MAX
 };