Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bfde2e1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-fixes' 



Huazhong Tan says:

====================
net: hns3: bug fix & 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: default avatarDavid S. Miller <davem@davemloft.net>
parents d23c4b63 583e7281

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

};