UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/net/batman-adv
History
David S. Miller 3313da8188 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The netfilter conflicts were rather simple overlapping
changes.

However, the cls_tcindex.c stuff was a bit more complex.

On the 'net' side, Cong is fixing several races and memory
leaks.  Whilst on the 'net-next' side we have Vlad adding
the rtnl-ness support.

What I've decided to do, in order to resolve this, is revert the
conversion over to using a workqueue that Cong did, bringing us back
to pure RCU.  I did it this way because I believe that either Cong's
races don't apply with have Vlad did things, or Cong will have to
implement the race fix slightly differently.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2019-02-15 12:38:38 -08:00
..
Kconfig batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
Makefile batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_algo.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_algo.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_iv_ogm.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_iv_ogm.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_v.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_v.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_v_elp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-08 15:00:17 -08:00
bat_v_elp.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_v_ogm.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bat_v_ogm.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bitarray.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bitarray.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bridge_loop_avoidance.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
bridge_loop_avoidance.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
debugfs.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
debugfs.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
distributed-arp-table.c batman-adv: fix memory leak in in batadv_dat_put_dhcp 2019-02-06 19:42:52 +01:00
distributed-arp-table.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
fragmentation.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
fragmentation.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
gateway_client.c batman-adv: Add gateway mesh genl configuration 2019-02-09 14:28:14 +01:00
gateway_client.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
gateway_common.c batman-adv: Add gateway mesh genl configuration 2019-02-09 14:28:14 +01:00
gateway_common.h batman-adv: Add gateway mesh genl configuration 2019-02-09 14:28:14 +01:00
hard-interface.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-08 15:00:17 -08:00
hard-interface.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
hash.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
hash.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
icmp_socket.c This feature/cleanup patchset includes the following patches: 2019-02-01 11:04:13 -08:00
icmp_socket.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
log.c This feature/cleanup patchset includes the following patches: 2019-02-01 11:04:13 -08:00
log.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
main.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
main.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
multicast.c This feature/cleanup patchset includes the following patches: 2019-02-01 11:04:13 -08:00
multicast.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
netlink.c batman-adv: Trigger genl notification on sysfs config change 2019-02-09 14:28:15 +01:00
netlink.h batman-adv: Trigger genl notification on sysfs config change 2019-02-09 14:28:15 +01:00
network-coding.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
network-coding.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
originator.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
originator.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
routing.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
routing.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
send.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
send.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
soft-interface.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-15 12:38:38 -08:00
soft-interface.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
sysfs.c batman-adv: Trigger genl notification on sysfs config change 2019-02-09 14:28:15 +01:00
sysfs.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
tp_meter.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
tp_meter.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
trace.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
trace.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
translation-table.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
translation-table.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
tvlv.c batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
tvlv.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00
types.h batman-adv: Update copyright years for 2019 2019-01-04 11:04:24 +01:00