This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

David S. Miller ff9c38bba3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/mac80211/ht.c

2009-12-01 22:13:38 -08:00

..

aes_ccm.c

…

aes_ccm.h

…

aes_cmac.c

…

aes_cmac.h

…

agg-rx.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-12-01 22:13:38 -08:00

agg-tx.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-12-01 22:13:38 -08:00

cfg.c

mac80211: fix rcu locking

2009-11-23 17:05:29 -05:00

cfg.h

…

debugfs_key.c

cfg80211/mac80211: use debugfs_remove_recursive

2009-10-30 16:49:18 -04:00

debugfs_key.h

…

debugfs_netdev.c

mac80211: add nl80211/cfg80211 handling of the new mesh root mode option.

2009-11-13 17:43:57 -05:00

debugfs_netdev.h

…

debugfs_sta.c

mac80211: add per-station HT capability file

2009-11-19 11:09:08 -05:00

debugfs_sta.h

…

debugfs.c

mac80211: make software rate control optional

2009-11-18 17:09:24 -05:00

debugfs.h

cfg80211/mac80211: use debugfs_remove_recursive

2009-10-30 16:49:18 -04:00

driver-ops.h

mac80211: convert aggregation to operate on vifs/stas

2009-11-18 17:09:15 -05:00

driver-trace.c

…

driver-trace.h

mac80211: convert aggregation to operate on vifs/stas

2009-11-18 17:09:15 -05:00

event.c

…

ht.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-12-01 22:13:38 -08:00

ibss.c

mac80211: remove encrypt parameter from ieee80211_tx_skb

2009-11-18 17:09:27 -05:00

ieee80211_i.h

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-12-01 22:13:38 -08:00

iface.c

cfg80211: introduce capability for 4addr mode

2009-11-19 11:08:53 -05:00

Kconfig

mac80211: add MAC80211_VERBOSE_MHWMP_DEBUG

2009-11-11 15:23:58 -05:00

key.c

…

key.h

cfg80211/mac80211: use debugfs_remove_recursive

2009-10-30 16:49:18 -04:00

led.c

…

led.h

…

main.c

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00

Makefile

mac80211: move TX status handling

2009-11-18 17:09:27 -05:00

mesh_hwmp.c

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00

mesh_pathtbl.c

mac80211: fix endianess on mesh_path_error_tx() calls

2009-11-19 11:38:24 -05:00

mesh_plink.c

mac80211: remove encrypt parameter from ieee80211_tx_skb

2009-11-18 17:09:27 -05:00

mesh.c

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00

mesh.h

mac80211: use fixed broadcast address

2009-11-18 17:09:18 -05:00

michael.c

…

michael.h

…

mlme.c

mac80211: avoid spurious deauth frames/messages

2009-11-19 11:09:02 -05:00

pm.c

…

rate.c

mac80211: make software rate control optional

2009-11-18 17:09:24 -05:00

rate.h

mac80211: make software rate control optional

2009-11-18 17:09:24 -05:00

rc80211_minstrel_debugfs.c

net: file_operations should be const

2009-09-02 01:03:53 -07:00

rc80211_minstrel.c

rc80211_minstrel: fix contention window calculation

2009-09-23 11:35:42 -04:00

rc80211_minstrel.h

mac80211: Remove unnused throughput field from minstrel_rate.

2009-08-28 14:40:34 -04:00

rc80211_pid_algo.c

…

rc80211_pid_debugfs.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

rc80211_pid.h

…

rx.c

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00

scan.c

cfg80211: validate scan channels

2009-11-02 15:43:29 -05:00

spectmgmt.c

mac80211: remove encrypt parameter from ieee80211_tx_skb

2009-11-18 17:09:27 -05:00

sta_info.c

mac80211: make software rate control optional

2009-11-18 17:09:24 -05:00

sta_info.h

mac80211: Fix missing kernel-doc notation

2009-11-23 17:05:40 -05:00

status.c

mac80211: move TX status handling

2009-11-18 17:09:27 -05:00

tkip.c

mac80211: use fixed broadcast address

2009-11-18 17:09:18 -05:00

tkip.h

…

tx.c

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00

util.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-29 00:57:15 -08:00

wep.c

mac80211: trim RX data

2009-11-18 17:09:17 -05:00

wep.h

…

wme.c

…

wme.h

…

wpa.c

mac80211: trim RX data

2009-11-18 17:09:17 -05:00

wpa.h

…