summaryrefslogtreecommitdiffstats
path: root/net/mac80211
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mac80211: fix conn_mon_timer running after disassociateStanislaw Gruszka2011-02-181-0/+6
| * | | | | mac80211: Clear PS related flag on disabling power save.Vivek Natarajan2011-02-181-0/+1
| * | | | | small adjustment to net/mac80211/KconfigJan Beulich2011-02-181-1/+1
| * | | | | mac80211: fix 2.4 GHz 40 MHz disablingJohannes Berg2011-02-184-15/+13
| * | | | | mac80211: Add power to debugfs.Ben Greear2011-02-181-0/+6
| * | | | | mac80211: reply to directed probes in IBSSJohannes Berg2011-02-141-5/+6
| * | | | | mac80211: Remove superfluous if clauseHelmut Schaa2011-02-141-11/+1
| * | | | | mac80211: Ensure power-level set properly for scanning.Ben Greear2011-02-092-2/+10
| * | | | | mac80211: Allow work items to use existing channel type.Ben Greear2011-02-091-3/+50
| * | | | | mac80211: Allow scanning on existing channel-type.Ben Greear2011-02-092-6/+16
| * | | | | mac80211: Properly set work-item channel-type.Ben Greear2011-02-092-0/+3
* | | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-02-191-0/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-02-141-0/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | mac80211: add missing locking in ieee80211_reconfigEliad Peller2011-02-091-0/+2
* | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-02-084-3/+10
|\| | | |
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-02-084-3/+10
| |\| | |
| | * | | mac80211: fix the skb cloned check in the tx pathFelix Fietkau2011-02-071-1/+1
| | * | | mac80211: fix TX status cookie in HW offload caseJohannes Berg2011-02-023-2/+9
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-02-0814-151/+458
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | mac80211: remove unneeded checkDan Carpenter2011-02-071-1/+1