davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56a4342dfe
kernel-ark/net/batman-adv
History
David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-06 17:37:45 -05:00
..
bat_algo.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
bat_iv_ogm.c batman-adv: fix header alignment by unrolling batadv_header 2013-12-28 12:51:16 +01:00
bitarray.c batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
bitarray.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
bridge_loop_avoidance.c batman-adv: make the backbone gw check VLAN specific 2013-10-19 23:25:38 +02:00
bridge_loop_avoidance.h batman-adv: make the backbone gw check VLAN specific 2013-10-19 23:25:38 +02:00
debugfs.c batman-adv: remove vis functionality 2013-10-09 21:22:32 +02:00
debugfs.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
distributed-arp-table.c batman-adv: fix header alignment by unrolling batadv_header 2013-12-28 12:51:16 +01:00
distributed-arp-table.h batman-adv: tvlv - add distributed arp table container 2013-10-09 21:22:27 +02:00
fragmentation.c batman-adv: fix header alignment by unrolling batadv_header 2013-12-28 12:51:16 +01:00
fragmentation.h batman-adv: Fragment and send skbs larger than mtu 2013-10-12 11:58:35 +02:00
gateway_client.c batman-adv: make struct batadv_neigh_node algorithm agnostic 2013-10-23 15:33:08 +02:00
gateway_client.h batman-adv: tvlv - gateway download/upload bandwidth container 2013-10-09 21:22:27 +02:00
gateway_common.c batman-adv: tvlv - gateway download/upload bandwidth container 2013-10-09 21:22:27 +02:00
gateway_common.h batman-adv: tvlv - gateway download/upload bandwidth container 2013-10-09 21:22:27 +02:00
hard-interface.c batman-adv: invoke dev_get_by_index() outside of is_wifi_iface() 2013-10-23 17:03:44 +02:00
hard-interface.h batman-adv: invoke dev_get_by_index() outside of is_wifi_iface() 2013-10-23 17:03:44 +02:00
hash.c batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
hash.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
icmp_socket.c batman-adv: fix header alignment by unrolling batadv_header 2013-12-28 12:51:16 +01:00
icmp_socket.h batman-adv: generalize batman-adv icmp packet handling 2013-10-23 17:03:47 +02:00
Kconfig batman-adv: network coding - add the initial infrastructure code 2013-03-13 22:53:48 +01:00
main.c batman-adv: fix size of batadv_icmp_header 2013-12-28 12:51:16 +01:00
main.h batadv: Slight optimization of batadv_compare_eth 2013-12-09 20:58:11 -05:00
Makefile batman-adv: Receive fragmented packets and merge 2013-10-12 11:58:34 +02:00
network-coding.c batman-adv: fix header alignment by unrolling batadv_header 2013-12-28 12:51:16 +01:00
network-coding.h batman-adv: tvlv - add network coding container 2013-10-09 21:22:28 +02:00
originator.c batman-adv: use batadv_compare_eth for concise 2013-12-26 13:31:33 -05:00
originator.h batman-adv: make struct batadv_orig_node algorithm agnostic 2013-10-23 15:33:09 +02:00
packet.h batman-adv: fix alignment for batadv_tvlv_tt_change 2013-12-28 12:51:18 +01:00
routing.c batman-adv: fix size of batadv_icmp_header 2013-12-28 12:51:16 +01:00
routing.h batman-adv: adapt bonding to use the new API functions 2013-10-23 15:33:12 +02:00
send.c batman-adv: fix header alignment by unrolling batadv_header 2013-12-28 12:51:16 +01:00
send.h batman-adv: refine API calls for unicast transmissions of SKBs 2013-10-19 17:31:54 +02:00
soft-interface.c batman-adv: fix vlan header access 2013-12-28 14:48:40 +01:00
soft-interface.h batman-adv: add sysfs framework for VLAN 2013-10-19 17:28:42 +02:00
sysfs.c batman-adv: make the AP isolation attribute VLAN specific 2013-10-19 17:28:47 +02:00
sysfs.h batman-adv: add sysfs framework for VLAN 2013-10-19 17:28:42 +02:00
translation-table.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
translation-table.h batman-adv: limit local translation table max size 2013-10-23 17:03:43 +02:00
types.h batman-adv: generalize batman-adv icmp packet handling 2013-10-23 17:03:47 +02:00