Johannes Berg
7527a782e1
cfg80211: advertise possible interface combinations ...
Add the ability to advertise interface combinations in nl80211.
This allows the driver to indicate what the combinations are
that it supports. "Combinations" of just a single interface are
implicit, as previously. Note that cfg80211 will enforce that
the restrictions are met, but not for all drivers yet (once all
drivers are updated, we can remove the flag and enforce for all).
When no combinations are actually supported, an empty list will
be exported so that userspace can know if the kernel exported
this info or not (although it isn't clear to me what tools using
the info should do if the kernel didn't export it).
Since some interface types are purely virtual/software and don't
fit the restrictions, those are exposed in a new list of pure SW
types, not subject to restrictions. This mainly exists to handle
AP-VLAN and monitor interfaces in mac80211.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-05-16 14:10:40 -04:00
Merge branches 'fixes', 'pgt-next' and 'versatile' into devel
2011-03-20 09:32:12 +00:00
bcma: add missing GPIO defines, use PULL register only when available
2011-05-11 14:50:41 -04:00
can: make struct proto const
2011-03-27 23:34:59 -07:00
libceph: add lingering request and watch/notify event framework
2011-03-22 11:33:55 -07:00
mfd: Add twl4030 madc driver
2011-03-23 10:42:00 +01:00
Merge branch 'next' into for-linus
2011-03-18 23:38:50 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
2011-03-29 12:09:30 -07:00
mlx4: Add blue flame support for kernel consumers
2011-03-23 12:24:23 -07:00
mmc: tmio_mmc: Move some defines into a shared header
2011-03-26 15:58:50 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1
2011-03-25 17:41:20 +02:00
netfilter: ipset: fix address ranges at hash:*port* types
2011-03-20 15:33:26 +01:00
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-03-16 15:11:04 -07:00
regulator: provide consumer interface for fall/rise time
2011-03-26 14:15:06 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-03-19 22:27:06 -07:00
ssb: move ssb_commit_settings and export it
2011-05-11 14:50:41 -04:00
NFS: Determine initial mount security
2011-03-24 13:52:42 -04:00
usbnet: use eth%d name for known ethernet devices
2011-04-01 20:12:02 -07:00
ACPI, APEI, Add PCIe AER error information printing support
2011-03-21 22:59:08 -04:00
libata: Use 'bool' return value for ata_id_XXX
2011-03-15 02:42:32 -04:00
ath9k_hw: Get AHB clock information from ath9k_platform_data
2011-04-25 14:50:08 -04:00
atm/solos-pci: Don't flap VCs when carrier state changes
2011-03-30 16:53:38 -07:00
backlight: add backlight type
2011-03-22 17:43:59 -07:00
crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn
2011-03-23 19:47:19 -07:00
userns: make has_capability* into real functions
2011-03-23 19:47:06 -07:00
mm: compaction: prevent kswapd compacting memory to reduce CPU usage
2011-03-22 17:44:00 -07:00
include/linux/compiler-gcc*.h: unify macro definitions
2011-03-22 17:44:10 -07:00
include/linux/compiler-gcc*.h: unify macro definitions
2011-03-22 17:44:10 -07:00
include/linux/compiler-gcc*.h: unify macro definitions
2011-03-22 17:44:10 -07:00
connector: convert to synchronous netlink message processing
2011-03-30 17:14:33 -07:00
ACPI, APEI, Add PCIe AER error information printing support
2011-03-21 22:59:08 -04:00
[CPUFREQ] Remove the pm_message_t argument from driver suspend
2011-03-16 17:54:33 -04:00
crc32: add missed brackets in macro
2011-03-22 17:44:15 -07:00
userns: security: make capabilities relative to the user namespace
2011-03-23 19:47:02 -07:00
net: davinci_emac:Fix translation logic for buffer descriptor
2011-03-22 19:25:05 -07:00
FS: lookup_mnt() is only used in the core fs routines now
2011-03-21 12:13:10 -04:00
net: dcbnl: Add IEEE app selector value definitions
2011-03-14 17:02:43 -07:00
Introduce ARCH_NO_SYSDEV_OPS config option (v2)
2011-03-23 22:16:41 +01:00
dm ioctl: add flag to wipe buffers for secure data
2011-03-24 13:54:30 +00:00
efivars: Expose efivars functionality to external drivers.
2011-03-14 08:40:51 -07:00
block: attempt to merge with existing requests on plug flush
2011-03-21 10:14:27 +01:00
include/linux/err.h: add a function to cast error-pointers to a return value
2011-03-22 17:44:11 -07:00
net: fix ethtool->set_flags not intended -EINVAL return value
2011-03-27 23:35:24 -07:00
vfs: Add name to file handle conversion support
2011-03-15 02:21:37 -04:00
ext3: use little-endian bitops
2011-03-23 19:46:17 -07:00
unicore32 machine related: add frame buffer driver for pkunity-v3 soc
2011-03-17 09:19:20 +08:00
New AT_... flag: AT_EMPTY_PATH
2011-03-14 19:12:20 -04:00
New kind of open files - "location only".
2011-03-15 02:21:45 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2011-03-21 10:05:22 -07:00
Merge branch 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
2011-03-28 15:31:05 -07:00
block: fix non-atomic access to genhd inflight structures
2011-03-22 08:35:35 +01:00
mm: add __GFP_OTHER_NODE flag
2011-03-22 17:44:05 -07:00
Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', 'upstream' and 'upstream-fixes' into for-linus
2011-03-17 14:31:46 +01:00
i2c: Drop i2c_adapter.id
2011-03-20 14:50:53 +01:00
ipv6: Convert to use flowi6 where applicable.
2011-03-12 15:08:54 -08:00
mac80211: Self-protected management frames are not robust
2011-05-11 14:44:48 -04:00
headers: use __aligned_xx types for userspace
2011-03-18 15:14:45 -07:00
eeepc-wmi: add camera keys
2011-03-28 06:05:21 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-03-15 19:23:40 -07:00
userns: user namespaces: convert several capable() calls
2011-03-23 19:47:08 -07:00
genirq: Remove move_*irq leftovers
2011-03-29 14:50:32 +02:00
genirq: Remove compat code
2011-03-29 14:48:19 +02:00
jbd2: add COW fields to struct jbd2_journal_handle
2011-03-20 21:13:43 -04:00
jbd2: add the b_cow_tid field to journal_head struct
2011-03-20 20:08:48 -04:00
vsprintf: Introduce %pB format specifier
2011-03-24 08:36:10 +01:00
tty: stop using "delayed_work" in the tty layer
2011-03-22 16:17:32 -07:00
[media] omap3isp: Kconfig and Makefile
2011-03-22 04:53:54 -03:00
kstrto*: converting strings to integers done (hopefully) right
2011-03-22 17:44:14 -07:00
KGDB: Notify GDB of machine halt, reboot or power off
2011-03-18 16:54:31 +00:00
kthread: NUMA aware kthread_create_on_node()
2011-03-22 17:44:01 -07:00
KVM: Fix race between nmi injection and enabling nmi window
2011-03-17 13:08:30 -03:00
leds: add driver for LM3530 ALS
2011-03-22 17:43:59 -07:00
Merge git://git.infradead.org/battery-2.6
2011-03-25 21:00:29 -07:00
libata-sff: add ata_sff_queue_work() & ata_sff_queue_delayed_work()
2011-03-14 02:52:41 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
2011-03-18 22:33:38 -07:00
[media] media: Pick a free ioctls range
2011-03-22 04:53:56 -03:00
memcg: add memcg sanity checks at allocating and freeing pages
2011-03-23 19:46:25 -07:00
lib, arch: add filter argument to show_mem and fix private implementations
2011-03-24 17:49:37 -07:00
mm: mm_struct: remove 16 bytes of alignment padding on 64 bit builds
2011-03-22 17:44:03 -07:00
bcma: add Broadcom specific AMBA bus driver
2011-05-10 15:54:54 -04:00
don't pass 'mounting_here' flag to follow_down()
2011-03-18 09:04:20 -04:00
net: Fix dev dev_ethtool_get_rx_csum() for forced NETIF_F_RXCSUM
2011-04-01 20:23:25 -07:00
Merge branch 'nfs-for-2.6.39' into nfs-for-next
2011-03-24 17:03:14 -04:00
NFSv4.1: layoutcommit
2011-03-23 15:29:04 -04:00
NFS: Fix a hang in the writeback path
2011-03-27 17:48:07 +02:00
Merge branch 'nfs-for-2.6.39' into nfs-for-next
2011-03-24 17:03:14 -04:00
cfg80211: advertise possible interface combinations
2011-05-16 14:10:40 -04:00
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
2011-03-16 17:28:10 -07:00
dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table
2011-03-23 14:55:56 -06:00
[media] omap3isp: OMAP3 ISP core
2011-03-22 04:53:46 -03:00
mm: remove unused TestSetPageLocked() interface
2011-03-22 17:44:03 -07:00
memcg: remove direct page_cgroup-to-page pointer
2011-03-23 19:46:28 -07:00
Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
2011-03-24 10:16:26 -07:00
ata/pata_arasan_cf: fill dma chan->private from pdata->dma_priv
2011-03-14 02:58:03 -04:00
PCI: PCIe links may not get configured for ASPM under POWERSAVE mode
2011-03-21 09:40:43 -07:00
PCI/ACPI: Report ASPM support to BIOS if not disabled from command line
2011-03-21 09:38:02 -07:00
pci_ids: Add Intel Tunnel Creek LPC Bridge device ID.
2011-03-23 10:42:08 +01:00
perf_events: Fix stale ->cgrp pointer in update_cgrp_time_from_cpuctx()
2011-03-23 16:07:22 +01:00
pid: remove the child_reaper special case in init/main.c
2011-03-23 19:46:57 -07:00
Introduce ARCH_NO_SYSDEV_OPS config option (v2)
2011-03-23 22:16:41 +01:00
PM: Do not create wakeup sysfs files for devices that cannot wake up
2011-03-15 00:43:14 +01:00
PM: Do not create wakeup sysfs files for devices that cannot wake up
2011-03-15 00:43:14 +01:00
proc: make struct proc_dir_entry::namelen unsigned int
2011-03-23 19:46:37 -07:00
pwm_backlight: add check_fb() hook
2011-03-22 17:44:00 -07:00
fs: protect inode->i_state with inode->i_lock
2011-03-24 21:16:31 -04:00
reiserfs: use little-endian bitops
2011-03-23 19:46:18 -07:00
memcg: simplify the way memory limits are checked
2011-03-23 19:46:23 -07:00
rfkill: Regulator consumer driver for rfkill
2011-04-19 15:38:02 -04:00
rapidio: modify mport ID assignment
2011-03-23 19:46:43 -07:00
rapidio: add architecture specific callbacks
2011-03-23 19:46:41 -07:00
mm: simplify anon_vma refcounts
2011-03-22 17:44:03 -07:00
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-03-25 17:59:38 -07:00
userns: security: make capabilities relative to the user namespace
2011-03-23 19:47:02 -07:00
sigma-firmware: loader for Analog Devices' SigmaStudio
2011-03-22 17:44:15 -07:00
net: Fix warnings caused by MAX_SKB_FRAGS change.
2011-03-29 23:34:08 -07:00
slub: Add statistics for this_cmpxchg_double failures
2011-03-22 20:48:04 +02:00
video, sm501: add I/O functions for use on powerpc
2011-03-22 17:16:34 +09:00
smp: add missing init.h include
2011-03-23 07:48:42 -07:00
sony-laptop: ignore hard switch rfkill events (SPIC)
2011-03-28 06:05:24 -04:00
PM: Drop pm_flags that is not necessary
2011-03-15 00:43:16 +01:00
svga: Make svga_set_timings() take an iomem regbase pointer.
2011-03-22 15:47:22 +09:00
Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
2011-03-24 10:16:26 -07:00
introduce sys_syncfs to sync a single file system
2011-03-21 00:40:29 -04:00
PM / Core: Introduce struct syscore_ops for core subsystems PM
2011-03-15 00:43:46 +01:00
Introduce ARCH_NO_SYSDEV_OPS config option (v2)
2011-03-23 22:16:41 +01:00
tipc: Correct misnamed references to neighbor discovery domain
2011-03-13 16:35:18 -04:00
tty: stop using "delayed_work" in the tty layer
2011-03-22 16:17:32 -07:00
add the common dma_addr_t typedef to include/linux/types.h
2011-03-22 17:44:09 -07:00
userns: allow sethostname in a container
2011-03-23 19:47:03 -07:00
[media] v4l: Add missing 12 bits bayer media bus formats
2011-03-22 04:53:37 -03:00
[media] v4l: v4l2_subdev userspace crop API
2011-03-22 04:53:33 -03:00
[media] gspca - nw80x: New subdriver for Divio based webcams
2011-03-22 04:54:51 -03:00
NOMMU: support SMP dynamic percpu_alloc
2011-03-28 12:53:29 +01:00
mm: add __GFP_OTHER_NODE flag
2011-03-22 17:44:05 -07:00
wl12xx: Handle platforms without level trigger interrupts
2011-04-19 16:49:20 +03:00
fs: rename inode_lock to inode_hash_lock
2011-03-24 21:17:51 -04:00
xfrm: Add basic infrastructure to support IPsec extended sequence numbers
2011-03-13 20:22:28 -07:00
zlib: slim down zlib_deflate() workspace when possible
2011-03-22 17:44:17 -07:00
