David S. Miller 6bc19fb82d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Merge 'net' bug fixes into 'net-next' as we have patches
that will build on top of them.

This merge commit includes a change from Emil Goode
(emilgoode@gmail.com) that fixes a warning that would
have been introduced by this merge.  Specifically it
fixes the pingv6_ops method ipv6_chk_addr() to add a
"const" to the "struct net_device *dev" argument and
likewise update the dummy_ipv6_chk_addr() declaration.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-06-05 16:37:30 -07:00

..

aes_ccm.c

mac80211: use AES_BLOCK_SIZE

2011-07-08 11:11:24 -04:00

aes_ccm.h

mac80211: use AES_BLOCK_SIZE

2011-07-08 11:11:24 -04:00

aes_cmac.c

mac80211: include export.h in aes_cmac

2012-11-07 18:01:54 +01:00

aes_cmac.h

mac80211: fix CMAC races

2011-07-08 11:11:20 -04:00

agg-rx.c

mac80211: improve aggregation debug messages

2013-01-18 21:55:15 +01:00

agg-tx.c

mac80211: fix aggregation state with current drivers

2013-01-24 15:43:51 +01:00

cfg.c

mac80211: use synchronize_rcu() with rcu_barrier()

2013-04-22 15:40:39 +02:00

cfg.h

[MAC80211]: rename ieee80211_cfg.h to cfg.h

2007-10-10 16:52:34 -07:00

chan.c

Merge remote-tracking branch 'wireless-next/master' into mac80211-next

2013-04-22 15:31:43 +02:00

debug.h

mac80211: mesh power save basics

2013-02-04 18:57:47 +01:00

debugfs_key.c

mac80211: move sdata debugfs dir to vif

2013-03-18 20:10:04 +01:00

debugfs_key.h

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

debugfs_netdev.c

mac80211: add beacon stats to debugfs

2013-04-08 09:16:54 +02:00

debugfs_netdev.h

mac80211: reduce reliance on netdev

2009-12-21 18:38:52 -05:00

debugfs_sta.c

mac80211: add beacon stats to debugfs

2013-04-08 09:16:54 +02:00

debugfs_sta.h

mac80211: RCU-ify STA info structure access

2008-03-06 15:30:46 -05:00

debugfs.c

mac80211: remove IEEE80211_HW_SCAN_WHILE_IDLE

2013-02-11 18:45:01 +01:00

debugfs.h

mac80211: use __printf attribute in debugfs

2012-10-18 09:01:57 +02:00

driver-ops.h

mac80211: pass queue bitmap to flush operation

2013-03-18 20:15:03 +01:00

event.c

cfg80211: use proper allocation flags

2009-07-10 15:01:49 -04:00

ht.c

mac80211: fix HT capability overrides for AP station

2013-03-06 16:36:02 +01:00

ibss.c

mac80211: parse VHT channel switch IEs

2013-04-16 15:29:45 +02:00

ieee80211_i.h

mac80211: fix IEEE80211_SDATA_DISCONNECT_RESUME

2013-05-16 22:38:04 +02:00

iface.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-06-05 16:37:30 -07:00

Kconfig

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2013-02-21 12:05:51 -08:00

key.c

mac80211: batch key free synchronize_net()

2013-03-11 15:16:42 +02:00

key.h

mac80211: batch key free synchronize_net()

2013-03-11 15:16:42 +02:00

led.c

leds: Rename led_brightness_set() to led_set_brightness()

2012-07-24 07:52:34 +08:00

led.h

mac80211: selective throughput LED trigger active

2010-12-22 14:33:37 -05:00

main.c

mac80211: adjust initial chandefs assignments in ieee80211_register_hw

2013-04-16 16:01:23 +02:00

Makefile

mac80211: mesh power save basics

2013-02-04 18:57:47 +01:00

mesh_hwmp.c

mac80211: parse VHT channel switch IEs

2013-04-16 15:29:45 +02:00

mesh_pathtbl.c

mac80211: return new mpath from mesh_path_add()

2013-04-08 09:16:59 +02:00

mesh_plink.c

mac80211: parse VHT channel switch IEs

2013-04-16 15:29:45 +02:00

mesh_ps.c

mac80211: consolidate MBSS change notification

2013-02-15 09:41:09 +01:00

mesh_sync.c

mac80211: clean up mesh code

2013-02-15 15:46:37 +01:00

mesh.c

Merge remote-tracking branch 'wireless-next/master' into mac80211-next

2013-04-22 15:31:43 +02:00

mesh.h

mac80211: return new mpath from mesh_path_add()

2013-04-08 09:16:59 +02:00

michael.c

mac80211: remove ieee80211_get_hdr_info

2008-07-08 14:16:01 -04:00

michael.h

mac80211: remove ieee80211_get_hdr_info

2008-07-08 14:16:01 -04:00

mlme.c

mac80211: fix direct probe auth

2013-05-17 13:59:18 +02:00

offchannel.c

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-04-10 14:09:54 -04:00

pm.c

mac80211: use synchronize_rcu() with rcu_barrier()

2013-04-22 15:40:39 +02:00

rate.c

mac80211: fix spurious RCU warning and update documentation

2013-05-16 22:38:05 +02:00

rate.h

mac80211: track number of spatial streams

2013-02-15 09:41:31 +01:00

rc80211_minstrel_debugfs.c

mac80211: cosmetics for minstrel_debugfs

2013-04-17 17:08:23 +02:00

rc80211_minstrel_ht_debugfs.c

mac80211/minstrel_ht: add support for using CCK rates

2013-02-13 10:56:33 +01:00

rc80211_minstrel_ht.c

mac80211/minstrel_ht: use the new rate control API

2013-04-22 16:16:41 +02:00

rc80211_minstrel_ht.h

mac80211/minstrel_ht: use the new rate control API

2013-04-22 16:16:41 +02:00

rc80211_minstrel.c

mac80211/minstrel: use the new rate control API

2013-04-22 16:16:41 +02:00

rc80211_minstrel.h

mac80211/minstrel: use the new rate control API

2013-04-22 16:16:41 +02:00

rc80211_pid_algo.c

net: fix assignment of 0/1 to bool variables.

2011-12-19 22:27:29 -05:00

rc80211_pid_debugfs.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

rc80211_pid.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

rx.c

mac80211: fix AP-mode frame matching

2013-05-16 22:38:07 +02:00

scan.c

mac80211: parse VHT channel switch IEs

2013-04-16 15:29:45 +02:00

spectmgmt.c

mac80211: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -04:00

sta_info.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-04-01 13:36:50 -04:00

sta_info.h

mac80211: provide race-free 64-bit traffic counters

2013-03-07 14:32:18 +01:00

status.c

mac80211: mesh power save basics

2013-02-04 18:57:47 +01:00

tkip.c

mac80211: use just spin_lock() in ieee80211_get_tkip_p2k()

2013-05-16 22:38:06 +02:00

tkip.h

mac80211: fix TKIP races, make API easier to use

2011-07-08 11:11:19 -04:00

trace.c

mac80211: trace debug messages

2012-06-24 11:33:18 +02:00

trace.h

mac80211: support secondary channel offset in CSA

2013-04-16 15:29:44 +02:00

tx.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2013-04-24 10:54:20 -04:00

util.c

mac80211: fix IEEE80211_SDATA_DISCONNECT_RESUME

2013-05-16 22:38:04 +02:00

vht.c

mac80211: restrict peer's VHT capabilities to own

2013-03-06 16:36:03 +01:00

wep.c

mac80211: fix network header location when adding encryption headers

2012-05-16 12:47:43 -04:00

wep.h

mac80211: move RX WEP weak IV counting

2012-03-13 14:54:16 -04:00

wme.c

mac80211: mesh power save basics

2013-02-04 18:57:47 +01:00

wme.h

mac80211: save wmm_acm per sdata

2012-06-20 17:35:22 +02:00

wpa.c

mac80211: use spin_lock_bh() for TKIP lock

2013-02-15 09:41:13 +01:00

wpa.h

mac80211: fix tx->skb NULL pointer dereference

2012-01-16 15:01:16 -05:00