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

2015-06-08 20:06:56 -07:00
parent ac7ba51c21 5879ae5fd0
commit 941742f497
140 changed files with 1112 additions and 716 deletions
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -318,6 +318,7 @@ struct i40e_pf {
 #endif
 #define I40E_FLAG_PORT_ID_VALID                (u64)(1 << 28)
 #define I40E_FLAG_DCB_CAPABLE                  (u64)(1 << 29)
+#define I40E_FLAG_VEB_MODE_ENABLED		BIT_ULL(40)

 	/* tracks features that get auto disabled by errors */
 	u64 auto_disable_flags;