David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

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

2013-10-08 23:07:53 -04:00

..

aes_ccm.c

wireless: move crypto constants to ieee80211.h

2013-05-16 22:39:41 +02: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

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

2013-08-16 14:24:51 -04:00

cfg.h

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

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

chan.c

mac80211: add channel switch command and beacon callbacks

2013-08-01 18:30:33 +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

cfg80211/mac80211: use cfg80211 wdev mutex in mac80211

2013-05-25 00:02:16 +02:00

debugfs_netdev.h

mac80211: reduce reliance on netdev

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

debugfs_sta.c

mac80211: add debugfs for driver-buffered TID bitmap

2013-08-01 15:08:24 +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: add channel switch command and beacon callbacks

2013-08-01 18:30:33 +02:00

event.c

cfg80211: use proper allocation flags

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

ht.c

mac80211: enable HT overrides for ibss

2013-07-16 09:57:57 +03:00

ibss.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-08-28 10:36:09 -04:00

ieee80211_i.h

wireless: make TU conversion macros available

2013-08-06 11:00:59 +02:00

iface.c

mac80211: fix change_interface queue assignments

2013-08-26 09:52:58 +02:00

Kconfig

Driver core patches for 3.9-rc1

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

key.c

mac80211: add APIs to allow keeping connections after WoWLAN

2013-08-16 12:58:43 +02:00

key.h

wireless: move crypto constants to ieee80211.h

2013-05-16 22:39:41 +02:00

led.c

mac80211: use oneshot blink API for LED triggers

2013-08-01 10:48:49 +02:00

led.h

mac80211: use oneshot blink API for LED triggers

2013-08-01 10:48:49 +02:00

main.c

mac80211: move setting WIPHY_FLAG_SUPPORTS_SCHED_SCAN into drivers

2013-08-23 12:02:26 +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: select and adjust bitrates according to channel mode

2013-07-16 09:58:06 +03:00

mesh_ps.c

mac80211: prevent the buffering or frame transmission to non-assoc mesh STA

2013-07-22 15:32:47 +02:00

mesh_sync.c

mac80211: clean up mesh code

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

mesh.c

mac80211: only respond to probe request with mesh ID

2013-08-23 15:25:06 +02:00

mesh.h

mac80211: update mesh beacon on workqueue

2013-06-18 15:57:27 +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

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

2013-08-28 13:49:20 -04: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: fix monitor interface suspend crash regression

2013-07-23 14:02:08 +02:00

rate.c

mac80211: allow lowest basic rate for unicast management for mesh

2013-08-09 15:11:27 +02:00

rate.h

mac80211/rc80211: add chandef to rate initialization

2013-07-16 09:58:02 +03: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

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

2013-08-28 13:51:40 -04: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

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

2013-08-01 15:26:52 -04:00

rc80211_minstrel.h

mac80211/minstrel: use the new rate control API

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

rc80211_pid_algo.c

mac80211/rc80211: add chandef to rate initialization

2013-07-16 09:58:02 +03: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: drop spoofed packets in ad-hoc mode

2013-09-26 19:56:06 +02:00

scan.c

mac80211: allow scanning for 5/10 MHz channels in IBSS

2013-07-16 09:58:09 +03:00

spectmgmt.c

mac80211: Remove unnecessary OOM logging messages

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

sta_info.c

mac80211: initialize power mode for mesh STAs

2013-06-24 15:59:20 +02:00

sta_info.h

mac80211: Ensure tid_start_tx is protected by sta->lock

2013-06-13 10:27:07 +02:00

status.c

mac80211: report some VHT radiotap infos for tx status

2013-08-01 10:49:04 +02: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

net:drivers/net: Miscellaneous conversions to ETH_ALEN

2013-10-02 17:04:45 -04:00

tx.c

mac80211: assign seqnums for group QoS frames

2013-08-23 15:43:38 +02:00

util.c

mac80211: fix the setting of extended supported rate IE

2013-09-26 19:56:59 +02:00

vht.c

mac80211: Fix VHT bandwidth change event

2013-06-13 11:58:47 +02:00

wep.c

wireless: move crypto constants to ieee80211.h

2013-05-16 22:39:41 +02: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

wireless: move crypto constants to ieee80211.h

2013-05-16 22:39:41 +02:00

wpa.h

mac80211: fix tx->skb NULL pointer dereference

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