Merge branch 'hns3-fixes'

davem330 · davem330 · commit 6bfde2e196d8 · 2018-08-22T21:55:01.000-07:00
Huazhong Tan says:

====================
net: hns3: bug fix &amp; optimization for HNS3 driver

This patchset presents a bug fix found out when CONFIG_ARM64_64K_PAGES
enable and an optimization for HNS3 driver.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2019,7 +2019,8 @@ static void hns3_nic_reuse_page(struct sk_buff *skb, int i,
 				struct hns3_desc_cb *desc_cb)
 {
 	struct hns3_desc *desc;
-	int truesize, size;
+	u32 truesize;
+	int size;
 	int last_offset;
 	bool twobufs;
 
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -284,11 +284,11 @@ struct hns3_desc_cb {
 
 	/* priv data for the desc, e.g. skb when use with ip stack*/
 	void *priv;
-	u16 page_offset;
-	u16 reuse_flag;
-
+	u32 page_offset;
 	u32 length;     /* length of the buffer */
 
+	u16 reuse_flag;
+
        /* desc type, used by the ring user to mark the type of the priv data */
 	u16 type;
 };

Original file line number	Diff line number	Diff line change
`@@ -2019,7 +2019,8 @@ static void hns3_nic_reuse_page(struct sk_buff *skb, int i,`
`2019`	`2019`	`struct hns3_desc_cb *desc_cb)`
`2020`	`2020`	`{`
`2021`	`2021`	`struct hns3_desc *desc;`
`2022`		`- int truesize, size;`
	`2022`	`+ u32 truesize;`
	`2023`	`+ int size;`
`2023`	`2024`	`int last_offset;`
`2024`	`2025`	`bool twobufs;`
`2025`	`2026`