diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-01 20:48:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-01 20:48:11 -0400 |
| commit | 1204c70d9dcba31164f78ad5d8c88c42335d51f8 (patch) | |
| tree | acb4728a02f13a6c547518f22f0d60a5ef7eaeb1 /include/net/bonding.h | |
| parent | 372bf6c1c8f9712e7765acad568a6d7ed4e8d6c0 (diff) | |
| parent | aeb1b85c340c54dc1d68ff96b02d439d6a4f7150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from David Miller:
1) Fix free/alloc races in batmanadv, from Sven Eckelmann.
2) Several leaks and other fixes in kTLS support of mlx5 driver, from
Tariq Toukan.
3) BPF devmap_hash cost calculation can overflow on 32-bit, from Toke
Høiland-Jørgensen.
4) Add an r8152 device ID, from Kazutoshi Noguchi.
5) Missing include in ipv6's addrconf.c, from Ben Dooks.
6) Use siphash in flow dissector, from Eric Dumazet. Attackers can
easily infer the 32-bit secret otherwise etc.
7) Several netdevice nesting depth fixes from Taehee Yoo.
8) Fix several KCSAN reported errors, from Eric Dumazet. For example,
when doing lockless skb_queue_empty() checks, and accessing
sk_napi_id/sk_incoming_cpu lockless as well.
9) Fix jumbo packet handling in RXRPC, from David Howells.
10) Bump SOMAXCONN and tcp_max_syn_backlog values, from Eric Dumazet.
11) Fix DMA synchronization in gve driver, from Yangchun Fu.
12) Several bpf offload fixes, from Jakub Kicinski.
13) Fix sk_page_frag() recursion during memory reclaim, from Tejun Heo.
14) Fix ping latency during high traffic rates in hisilicon driver, from
Jiangfent Xiao.
* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (146 commits)
net: fix installing orphaned programs
net: cls_bpf: fix NULL deref on offload filter removal
selftests: bpf: Skip write only files in debugfs
selftests: net: reuseport_dualstack: fix uninitalized parameter
r8169: fix wrong PHY ID issue with RTL8168dp
net: dsa: bcm_sf2: Fix IMP setup for port different than 8
net: phylink: Fix phylink_dbg() macro
gve: Fixes DMA synchronization.
inet: stop leaking jiffies on the wire
ixgbe: Remove duplicate clear_bit() call
Documentation: networking: device drivers: Remove stray asterisks
e1000: fix memory leaks
i40e: Fix receive buffer starvation for AF_XDP
igb: Fix constant media auto sense switching when no cable is connected
net: ethernet: arc: add the missed clk_disable_unprepare
igb: Enable media autosense for the i350.
igb/igc: Don't warn on fatal read failures when the device is removed
tcp: increase tcp_max_syn_backlog max value
net: increase SOMAXCONN to 4096
netdevsim: Fix use-after-free during device dismantle
...
Diffstat (limited to 'include/net/bonding.h')
| -rw-r--r-- | include/net/bonding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index f7fe45689142..1afc125014da 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h | |||
| @@ -203,7 +203,6 @@ struct bonding { | |||
| 203 | struct slave __rcu *primary_slave; | 203 | struct slave __rcu *primary_slave; |
| 204 | struct bond_up_slave __rcu *slave_arr; /* Array of usable slaves */ | 204 | struct bond_up_slave __rcu *slave_arr; /* Array of usable slaves */ |
| 205 | bool force_primary; | 205 | bool force_primary; |
| 206 | u32 nest_level; | ||
| 207 | s32 slave_cnt; /* never change this value outside the attach/detach wrappers */ | 206 | s32 slave_cnt; /* never change this value outside the attach/detach wrappers */ |
| 208 | int (*recv_probe)(const struct sk_buff *, struct bonding *, | 207 | int (*recv_probe)(const struct sk_buff *, struct bonding *, |
| 209 | struct slave *); | 208 | struct slave *); |
| @@ -239,6 +238,7 @@ struct bonding { | |||
| 239 | struct dentry *debug_dir; | 238 | struct dentry *debug_dir; |
| 240 | #endif /* CONFIG_DEBUG_FS */ | 239 | #endif /* CONFIG_DEBUG_FS */ |
| 241 | struct rtnl_link_stats64 bond_stats; | 240 | struct rtnl_link_stats64 bond_stats; |
| 241 | struct lock_class_key stats_lock_key; | ||
| 242 | }; | 242 | }; |
| 243 | 243 | ||
| 244 | #define bond_slave_get_rcu(dev) \ | 244 | #define bond_slave_get_rcu(dev) \ |
