git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
hisilicon
/
hns3
/
hns3pf
/
hclge_main.h
diff --git
a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index ada5c68f285163426845e40f7d1ab09e2c1ab844..b6c1153945e50515881e6d66a3923e48e7666579 100644
(file)
--- a/
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@
-929,6
+929,7
@@
struct hclge_dev {
unsigned long fd_bmap[BITS_TO_LONGS(MAX_FD_FILTER_NUM)];
enum HCLGE_FD_ACTIVE_RULE_TYPE fd_active_type;
u8 fd_en;
unsigned long fd_bmap[BITS_TO_LONGS(MAX_FD_FILTER_NUM)];
enum HCLGE_FD_ACTIVE_RULE_TYPE fd_active_type;
u8 fd_en;
+ bool gro_en;
u16 wanted_umv_size;
/* max available unicast mac vlan space */
u16 wanted_umv_size;
/* max available unicast mac vlan space */