leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hns3-fixes'

Browse Source 
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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-08-22 21:55:01 -07:00
commit 6bfde2e196
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -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_cb *desc_cb)
{ {
struct hns3_desc *desc; struct hns3_desc *desc;
int truesize, size; u32 truesize;
int size;
int last_offset; int last_offset;
bool twobufs; bool twobufs;

6
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
View File

@ -284,11 +284,11 @@ struct hns3_desc_cb {
/* priv data for the desc, e.g. skb when use with ip stack*/ /* priv data for the desc, e.g. skb when use with ip stack*/
void *priv; void *priv;
u16 page_offset; u32 page_offset;
u16 reuse_flag;
u32 length; /* length of the buffer */ u32 length; /* length of the buffer */
u16 reuse_flag;
/* desc type, used by the ring user to mark the type of the priv data */ /* desc type, used by the ring user to mark the type of the priv data */
u16 type; u16 type;
}; };