summaryrefslogtreecommitdiffstats
path: root/net/mac80211
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-06-062-4/+15
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-06-032-4/+15
| |\
| | * mac80211: fix dialog token allocatorJohannes Berg2010-06-011-2/+4
| | * mac80211: fix blockack-req processingJohannes Berg2010-06-011-2/+11
| * | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2010-05-311-1/+1
| |\ \ | | |/ | |/|
* | | net: use __packed annotationEric Dumazet2010-06-033-3/+3
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-05-311-1/+1
|\| | | |/ |/|
| * mac80211: make a function staticJohannes Berg2010-05-281-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-05-251-1/+1
|\|
| * wireless: fix sta_info.h kernel-doc warningsRandy Dunlap2010-05-241-1/+1
| * Revert "ath9k: Group Key fix for VAPs"John W. Linville2010-05-241-1/+0
* | kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT...Alexey Dobriyan2010-05-251-1/+1
* | Revert "ath9k: Group Key fix for VAPs"Linus Torvalds2010-05-241-1/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-05-2034-385/+1568
|\
| * net: Remove unnecessary returns from void function()sJoe Perches2010-05-173-4/+0
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-176-8/+147
| |\
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-171-2/+25
| | |\
| | | * mac80211: don't process work item with wrong frameJohannes Berg2010-05-121-2/+25
| | * | mac80211: fix paged defragmentationAbhijeet Kolekar2010-05-121-0/+6
| | * | mac80211: check channel switch mode for future frames transmitWey-Yi Guy2010-05-121-1/+2
| | * | mac80211: add offload channel switch supportJohannes Berg2010-05-124-5/+114
| | * | Merge branch 'wireless-2.6' into wireless-next-2.6Reinette Chatre2010-05-101-1/+2
| | |\|
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-05-121-1/+2
| |\ \ \
| * \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-119-36/+249
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mac80211: set IEEE80211_TX_CTL_FIRST_FRAGMENT for beaconsJohn W. Linville2010-05-071-2/+3
| | * | | mac80211: improve HT channel handlingJohannes Berg2010-05-076-31/+118
| | * | | cfg80211/mac80211: better channel handlingJohannes Berg2010-05-074-1/+111
| | * | | mac80211: fix BSS info reconfigurationJohannes Berg2010-05-071-5/+20
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-0514-63/+216
| |\| | |
| | * | | mac80211: use fixed channel in ibss join when appropriateJohannes Berg2010-05-051-0/+6
| | * | | Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel...John W. Linville2010-05-032-1/+2
| | |\ \ \
| | | * \ \ Merge branch 'wireless-2.6' into wireless-next-2.6Reinette Chatre2010-04-302-1/+2
| | | |\ \ \
| | * | | | | mac80211: improve IBSS scanningJohannes Berg2010-05-034-21/+36
| | * | | | | mac80211: allow controlling aggregation manuallyJohannes Berg2010-05-031-1/+64
| | * | | | | mac80211: fix ieee80211_find_sta[_by_hw]Johannes Berg2010-05-031-4/+13
| | * | | | | mac80211: remove deprecated noise field from ieee80211_rx_statusJohn W. Linville2010-04-301-2/+0
| | |/ / / /
| | * | | | mac80211: tell driver about IBSS mergeJohannes Berg2010-04-301-0/+6
| | * | | | mac80211: notify driver about IBSS statusJohannes Berg2010-04-281-1/+5
| | * | | | mac80211: fix supported rates IE if AP doesn't give us it's ratesStanislaw Gruszka2010-04-281-9/+19
| | * | | | mac80211: do not wip out old supported ratesStanislaw Gruszka2010-04-281-10/+11
| | * | | | mac80211: fix rts threshold checkShanyu Zhao2010-04-271-2/+3
| | * | | | mac80211: give virtual interface to hw_scanJohannes Berg2010-04-273-7/+11
| | * | | | mac80211: Determine dynamic PS timeout based on ps-qos network latencyJuuso Oikarinen2010-04-273-2/+25
| | * | | | mac80211: implement ap isolation supportFelix Fietkau2010-04-271-0/+7
| | * | | | mac80211: fix handling of 4-address-mode in ieee80211_change_ifaceFelix Fietkau2010-04-271-4/+3
| | * | | | mac80211: Fix sta->last_tx_rate setting with no-op rate control devicesJuuso Oikarinen2010-04-261-0/+7
| * | | | | Merge branch 'master' into for-davemJohn W. Linville2010-04-238-9/+58
| |\| | | |
| | * | | | mac80211: Fix ieee80211_sta_conn_mon_timer with hw connection monitoringJuuso Oikarinen2010-04-201-0/+5
| | * | | | mac80211: sample survey implementation for mac80211 & hwsimHolger Schurig2010-04-202-0/+21
| | * | | | ath9k: Group Key fix for VAPsDaniel Yingqiang Ma2010-04-201-0/+1