forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
....@@ -94,7 +94,7 @@
9494 	struct adapter *adapter;	/* our adapter */
9595 	u32 vlan_id;			/* vlan id for VST */
9696 	u16 viid;			/* virtual interface ID */
97
-	s16 xact_addr_filt;		/* index of our MAC address filter */
97
+	int xact_addr_filt;		/* index of our MAC address filter */
9898 	u16 rss_size;			/* size of VI's RSS table slice */
9999 	u8 pidx;			/* index into adapter port[] */
100100 	s8 mdio_addr;
....@@ -352,6 +352,7 @@
352352 struct hash_mac_addr {
353353 	struct list_head list;
354354 	u8 addr[ETH_ALEN];
355
+	unsigned int iface_mac;
355356 };
356357 
357358 struct mbox_list {
....@@ -405,11 +406,12 @@
405406 };
406407 
407408 enum { /* adapter flags */
408
-	FULL_INIT_DONE     = (1UL << 0),
409
-	USING_MSI          = (1UL << 1),
410
-	USING_MSIX         = (1UL << 2),
411
-	QUEUES_BOUND       = (1UL << 3),
412
-	ROOT_NO_RELAXED_ORDERING = (1UL << 4),
409
+	CXGB4VF_FULL_INIT_DONE			= (1UL << 0),
410
+	CXGB4VF_USING_MSI			= (1UL << 1),
411
+	CXGB4VF_USING_MSIX			= (1UL << 2),
412
+	CXGB4VF_QUEUES_BOUND			= (1UL << 3),
413
+	CXGB4VF_ROOT_NO_RELAXED_ORDERING	= (1UL << 4),
414
+	CXGB4VF_FW_OK				= (1UL << 5),
413415 };
414416 
415417 /*
....@@ -560,7 +562,7 @@
560562 			   unsigned int);
561563 void t4vf_free_sge_resources(struct adapter *);
562564 
563
-int t4vf_eth_xmit(struct sk_buff *, struct net_device *);
565
+netdev_tx_t t4vf_eth_xmit(struct sk_buff *, struct net_device *);
564566 int t4vf_ethrx_handler(struct sge_rspq *, const __be64 *,
565567 		       const struct pkt_gl *);
566568