aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-04-1216-75/+126
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-04-073-12/+25
| |\
| * | mac80211: remove few obsolete flagsMohammed Shafi Shajakhan2011-04-071-9/+0
| * | nl80211: Add BSS parameters to stationPaul Stewart2011-04-071-1/+12
| * | mac80211: clean up station cleanup timerJohannes Berg2011-04-044-18/+3
| * | mac80211: remove the dependency on crypto_blkcipherFelix Fietkau2011-04-046-28/+23
| * | mac80211: fix suppressing probe responses in ad-hoc modeFelix Fietkau2011-04-041-2/+1
| * | wifi: Add hwflags to debugfs.Ben Greear2011-04-041-13/+76
| * | cfg80211: Add nl80211 event for deletion of a station entryJouni Malinen2011-03-301-0/+2
| * | mac80211: Minor optimization in tx status handlingHelmut Schaa2011-03-301-4/+7
| * | mac80211: add comment about reorderingJohannes Berg2011-03-301-0/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-111-1/+1
|\ \ \ | | |/ | |/|
| * | mac80211: Fix duplicate frames on cooked monitorHelmut Schaa2011-04-041-1/+1
* | | Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6Linus Torvalds2011-04-077-8/+8
|\ \ \ | |/ / |/| |
| * | Fix common misspellingsLucas De Marchi2011-03-317-8/+8
| |/
* | mac80211: fix aggregation frame release during timeoutDaniel Halperin2011-03-281-1/+2
* | mac80211: fix possible NULL pointer dereferenceMariusz Kozlowski2011-03-281-1/+2
* | mac80211: fix NULL pointer dereference in ieee80211_key_alloc()Petr Štetiar2011-03-281-2/+2
* | mac80211: fix a crash in minstrel_ht in HT mode with no supported MCS ratesFelix Fietkau2011-03-281-7/+18
|/
* mac80211: initialize sta->last_rx in sta_info_allocFelix Fietkau2011-03-211-0/+1
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-03-181-1/+1
|\
| * Merge branch 'master' into for-nextJiri Kosina2011-02-157-16/+29
| |\
| * | Kill off warning: ‘inline’ is not at beginning of declarationJesper Juhl2011-01-191-1/+1
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-03-156-12/+168
|\ \ \
| * | | mac80211: fix channel type recalculation with HT and non-HT interfacesFelix Fietkau2011-03-141-0/+3
| * | | mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devicesHelmut Schaa2011-03-141-7/+34
| * | | mac80211: implement support for cfg80211_ops->{get,set}_ringparamJohn W. Linville2011-03-113-0/+95
| * | | mac80211: do not enable ps if 802.1x controlled port is unblockedJason Young2011-03-112-5/+36
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-03-116-58/+33
|\ \ \ \ | |/ / /
| * | | mac80211: update minstrel_ht sample rate when probe is setDaniel Halperin2011-03-091-10/+5
| * | | mac80211: fix scan race, simplify codeJohannes Berg2011-03-071-40/+24
| * | | mac80211: Add log message to ieee80211_restart_hw()Michael Buesch2011-03-071-0/+3
| * | | mac80211: remove unused macrosShan Wei2011-03-073-5/+0
| * | | mac80211: Remove redundant preamble and RTS flag setup in minstrel_htHelmut Schaa2011-03-041-3/+1
* | | | Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2011-03-0412-138/+225
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-03-0412-138/+225
| |\ \ \ \ | | |/ / /
| | * | | mac80211: make rate control Kconfig warning depend on mac80211Johannes Berg2011-03-011-1/+1
| | * | | mac80211: add support for showing the last rx bitrateFelix Fietkau2011-03-013-10/+36
| | * | | mac80211: support direct offchannel TX offloadJohannes Berg2011-02-255-0/+108
| | * | | mac80211: better fix for conn_mon_timer running after disassociateStanislaw Gruszka2011-02-251-6/+3
| | * | | mac80211: copy peer MCS TX parametersJohannes Berg2011-02-251-1/+4
| | * | | mac80211: remove IBSS merge delayJohannes Berg2011-02-251-5/+0
| | * | | mac80211: make tx() operation return voidJohannes Berg2011-02-252-110/+58
| | * | | mac80211: rename RX_FLAG_TSFTJohannes Berg2011-02-232-3/+3
| | * | | mac80211: Fix a race on enabling power save.Vivek Natarajan2011-02-232-3/+13
* | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-03-031-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-02-221-0/+6
| |\ \ \ \
| * | | | | net: Fix more stale on-stack list_head objects.Eric W. Biederman2011-02-201-0/+1
* | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-02-2212-43/+113
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6John W. Linville2011-02-186-3/+18
| |\ \ \ \ \ | | | |/ / / | | |/| | |