Merge branch 'qed-next'

Yuval Mintz says: ==================== qed: update series This patch series tries to improve general configuration by changing configuration to better suit B0 boards and allow more available resources to each physical function. In additition, it contains some small fixes and semantic changes. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
mariux64 · Mar 2, 2016 · afc3de9 · afc3de9
2 parents fb653eb + 619db46
commit afc3de9
Show file tree

Hide file tree

Showing 6 changed files with 439 additions and 329 deletions.
diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -146,9 +146,6 @@ struct qed_hw_info {
 	u16				ovlan;
 	u32				part_num[4];
 
-	u32				vendor_id;
-	u32				device_id;
-
 	unsigned char			hw_mac_addr[ETH_ALEN];
 
 	struct qed_igu_info		*p_igu_info;