projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
bnx2.h
diff --git
a/drivers/net/bnx2.h
b/drivers/net/bnx2.h
index 68020451dc4f19fab935c6e963b9bc92664a6967..bf371f6fe154a0def25a7927ca70e63aa746c2ce 100644
(file)
--- a/
drivers/net/bnx2.h
+++ b/
drivers/net/bnx2.h
@@
-6754,8
+6754,6
@@
struct bnx2 {
u32 rx_max_ring_idx;
u32 rx_max_pg_ring_idx;
- u32 rx_csum;
-
/* TX constants */
int tx_ring_size;
u32 tx_wake_thresh;
@@
-6922,6
+6920,7
@@
struct bnx2 {
u8 num_tx_rings;
u8 num_rx_rings;
+ u32 leds_save;
u32 idle_chk_status_idx;
#ifdef BCM_CNIC