Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
934c2b6d0c
linux/net/batman-adv
History
Linus Torvalds 06f4e926d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
aggregation.c batman-adv: Add missing hardif_free_ref in forw_packet_free 2011-05-15 00:02:06 +02:00
aggregation.h batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
bat_debugfs.c batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
bat_debugfs.h batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
bat_sysfs.c batman-adv: Avoid deadlock between rtnl_lock and s_active 2011-05-08 16:10:42 +02:00
bat_sysfs.h batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
bitarray.c batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
bitarray.h batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
gateway_client.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
gateway_client.h batman-adv: concentrate all curr_gw related rcu operations in select/deselect functions 2011-04-17 21:11:01 +02:00
gateway_common.c batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
gateway_common.h batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
hard-interface.c batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
hard-interface.h batman-adv: Make bat_priv->primary_if an rcu protected pointer 2011-05-01 22:49:03 +02:00
hash.c batman-adv: remove extra layer between hash and hash element - hash bucket 2011-03-05 12:52:00 +01:00
hash.h batman-adv: remove extra layer between hash and hash element - hash bucket 2011-03-05 12:52:00 +01:00
icmp_socket.c batman-adv: Make bat_priv->primary_if an rcu protected pointer 2011-05-01 22:49:03 +02:00
icmp_socket.h batman-adv: Remove duplicate types.h inclusions 2011-02-11 23:30:29 +01:00
Kconfig net: Add batman-adv meshing protocol 2010-12-16 13:44:24 -08:00
main.c batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
main.h batman-adv: Remove multiline comments from line ending 2011-05-08 16:10:42 +02:00
Makefile batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
originator.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
originator.h batman-adv: Make orig_node->router an rcu protected pointer 2011-04-17 21:11:01 +02:00
packet.h batman-adv: Remove multiline comments from line ending 2011-05-08 16:10:42 +02:00
ring_buffer.c batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
ring_buffer.h batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00
routing.c batman-adv: remove duplicate code from function is_bidirectional_neigh() 2011-05-08 16:10:42 +02:00
routing.h batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
send.c batman-adv: reset broadcast flood protection on error 2011-05-15 00:02:06 +02:00
send.h batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
soft-interface.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
soft-interface.h batman-adv: Disallow regular interface as mesh device 2011-03-05 12:52:09 +01:00
translation-table.c batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
translation-table.h batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
types.h batman-adv: Remove multiline comments from line ending 2011-05-08 16:10:42 +02:00
unicast.c batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
unicast.h batman-adv: rename batman_if struct to hard_iface 2011-03-05 12:52:06 +01:00
vis.c batman-adv: rename everything from *hna* into *tt* (translation table) 2011-05-08 16:10:42 +02:00
vis.h batman-adv: Update copyright years 2011-01-31 14:57:12 +01:00