Dave,
Here is the latest batch of wireless bits intended for 2.6.39. It seems
I neglected to send a pull request last week, so this one is a bit big
-- I apologize!
This includes a rather large batch of bluetooth bits by way of Gustavo.
It looks like a variety of bits, including some code refactoring, some
protocol support enhancements, some bugfixes, etc. -- nothing too
unusual.
Other items of interest include a new driver from Realtek, some ssb
support enhancements, and the usual sort of updates for mac80211 and a
variety of drivers. Also included is a wireless-2.6 pull to resolve
some build breakage.
Please let me know if there are problems!
John
---
The following changes since commit db62983a1e4b2af9e79c97af768f0c8b80bd93f0:
Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6 (2011-02-22 11:15:29 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git for-davem
Andrei Emeltchenko (3):
Bluetooth: Use non-flushable by default L2CAP data packets
Bluetooth: Do not use assignments in IF conditions
Bluetooth: fix crash by disabling tasklet in sock accept
Andrei Warkentin (1):
Bluetooth: Make hci a child of the corresponding tty device.
Bala Shanmugam (1):
Bluetooth: Add firmware support for Atheros 3012
Ben Greear (7):
ath9k: Print channel-type in chan-change dbg message.
mac80211: Properly set work-item channel-type.
mac80211: Allow scanning on existing channel-type.
mac80211: Allow work items to use existing channel type.
ath9k: Add debug info for configuring power level.
mac80211: Ensure power-level set properly for scanning.
mac80211: Add power to debugfs.
Bob Copeland (1):
ath5k: move external function definitions to a header file
Cho, Yu-Chen (1):
Bluetooth: Add Atheros BT AR5BBU12 fw supported
Christian Lamparter (6):
p54: sort channel list by frequency instead of channel index
p54: p54_generate_band cleanup
p54: enhance rssi->dBm database import
p54spi: update sample eeprom
p54: implement flush callback
ar9170usb: mark the old driver as obsolete
Claudio Takahasi (3):
Bluetooth: Add LE signaling commands handling
Bluetooth: Add connection parameter update response
Bluetooth: Send LE Connection Update Command
Eliad Peller (4):
wl12xx: mcp2.5 - add config_ps acx
wl12xx: move to new firmware (6.1.3.50.49)
wl12xx: use the conf struct instead of macros for memory configuration
wl12xx: set supported_rates after association
George (9):
rtlwifi: Add usb driver
rtlwifi: Add headers for rtl8187cu
rtlwifi: rtl8192cu: Add routines dm, fw, led and sw
rtlwifi: rtl8192cu: Add routine hw
rtlwifi: rtl8192cu: Add routine mac
rtlwifi: rtl8192cu: Add routine phy
rtlwifi: rtl8192cu: Add routine rf
rtlwifi: rtl8192cu: Add routine table
rtlwifi: rtl8192cu: Add routine trx
Gustavo F. Padovan (27):
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6 into wireless
Bluetooth: Fix setting of MTU for ERTM and Streaming Mode
Bluetooth: Rename l2cap.c to l2cap_core.c
Bluetooth: Initial work for L2CAP split.
Bluetooth: move l2cap_sock_ops to l2cap_sock.c
Bluetooth: move l2cap_sock_release() to l2cap_sock.c
Bluetooth: move l2cap_sock_bind()/listen() to l2cap_sock.c
Bluetooth: move l2cap_sock_accept() to l2cap_sock.c
Bluetooth: move l2cap_sock_getname() to l2cap_sock.c
Bluetooth: move l2cap_sock_setsockopt() to l2cap_sock.c
Bluetooth: move l2cap_sock_getsockopt() to l2cap_sock.c
Bluetooth: move l2cap_sock_connect() to l2cap_sock.c
Bluetooth: move l2cap_sock_recvmsg() to l2cap_sock.c
Bluetooth: move l2cap_sock_shutdown() to l2cap_sock.c
Bluetooth: move l2cap_sock_sendmsg() to l2cap_sock.c
Bluetooth: move L2CAP sock timers function to l2cap_sock.c
Bluetooth: move l2cap_sock_kill() to l2cap_sock.c
Bluetooth: move __l2cap_sock_close() to l2cap_sock.c
Bluetooth: update Bluetooth daemon name in Kconfig help
Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko
Bluetooth: remove l2cap_load() hack
Bluetooth: Add L2CAP mode to debugfs output
Bluetooth: Use usb_fill_int_urb()
Bluetooth: Fix crash when ioctl(HCIUARTSETPROTO) fails
Bluetooth: fix errors reported by checkpatch.pl
Bluetooth: Fix errors reported by checkpatch.pl
Bluetooth: fix checkpatch errors in af_bluetooth.c
Helmut Schaa (4):
mac80211: Remove superfluous if clause
rt2x00: Minor optimization for devices with RTS/CTS offload
Revert "rt2x00 : avoid timestamp for monitor injected frame."
rt2x00: Remove superfluos empty line
Henry Ptasinski (1):
wireless-next-2.6: brcm80211: fix compile issue
Jan Beulich (1):
small adjustment to net/mac80211/Kconfig
Jesper Juhl (1):
Bluetooth: Fix failure to release lock in read_index_list()
Johan Hedberg (25):
Bluetooth: Implement automatic setup procedure for local adapters
Bluetooth: Add support for management powered event
Bluetooth: Add support for set_powered management command
Bluetooth: Add support for set_discoverable management command
Bluetooth: Add set_connectable management command
Bluetooth: Unify mode related management messages to a single struct
Bluetooth: Add flag to track managment controlled adapters
Bluetooth: Add send_mode_rsp convenience function for mgmt.c
Bluetooth: Implement set_pairable managment command
Bluetooth: Implement UUID handling through the management interface
Bluetooth: Implement debugfs support for listing UUIDs
Bluetooth: Reject pairing requests when in non-pairable mode
Bluetooth: Add special handling with __hci_request and HCI_INIT
Bluetooth: Add controller side link key clearing to hci_init_req
Bluetooth: Remove page timeout setting from HCI init sequence
Bluetooth: Implement a more complete adapter initialization sequence
Bluetooth: Add class of device control to the management interface
Bluetooth: Implement link key handling for the management interface
Bluetooth: Add connected/disconnected management events
Bluetooth: Add disconnect managment command
Bluetooth: Add support for connect failed management event
Bluetooth: Add get_connections managment interface command
Bluetooth: Create common cmd_complete function for mgmt.c
Bluetooth: Add support for PIN code handling in the management interface
Bluetooth: Add set_io_capability management command
Johannes Berg (2):
mac80211: reply to directed probes in IBSS
mac80211: fix 2.4 GHz 40 MHz disabling
John W. Linville (5):
Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
Merge ssh://master.kernel.org/.../linville/wireless-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
Jussi Kivilinna (4):
zd1211rw: correct use of usb_bulk_msg on interrupt endpoints
zd1211rw: use async urb for write command
zd1211rw: move async iowrite16v up to callers
zd1211rw: add unlikely to ZD_ASSERT
Larry Finger (13):
rtlwifi: Modify core routines
rtlwifi: rtl8192ce: Refactor rtl8192ce/dm
rtlwifi: rtl8192ce: Refactor rtl8192ce/fw
rtlwifi: rtl8192ce: Rework rtl8192ce/phy.c
p54: Fix compile warning
rtlwifi: Make changes in rtlwifi/rtl8192ce/reg.h to support rtl8192cu
rtlwifi: Make changes in rtlwifi/rtl8192ce/def.h to support rtl8192cu
rtlwifi: Modify some rtl8192ce routines for merging rtl8192cu
rtlwifi: Modify wifi.h for rtl8192cu
rtlwifi: Move common parts of rtl8192ce/phy.c
rtlwifi: Modify build system for rtl8192cu
rtlwifi: rtl8192ce: Fix endian warnings
rtlwifi: Remove obsolete/unused macros
Michael Buesch (1):
ssb: Make ssb_wait_bit multi-bit safe
Mohammed Shafi Shajakhan (1):
ath9k: Fix ath9k prevents CPU to enter C3 states
Nikolay Ledovskikh (1):
ath5k: Correct channel setting for AR2317 chip
Oliver Neukum (1):
Bluetooth: fix crash with quirky dongles doing sound
RA-Jay Hung (2):
rt2x00: Add antenna setting for RT3070/RT3090/RT3390 with RX antenna diversity support
rt2x00: Fix rt2800 txpower setting to correct value
RA-Shiang Tu (1):
rt2x00: Add support for RT5390 chip
Rafał Miłecki (5):
ssb: extract boardflags2 for SPROMs rev 4 and 5
ssb: trivial: fix SPROM extract warning formatting
ssb: remove invalid define SSB_TMSLOW_PHYCLK
ssb: when needed, reject IM input while disabling device
ssb: reset device only if it was enabled
Rajkumar Manoharan (1):
ath9k: disable beaconing before stopping beacon queue
Randy Dunlap (1):
wl12xx: fix sdio_test kconfig/build errors
Rogério Brito (1):
Bluetooth: ath3k: Avoid duplication of code
Seth Forshee (1):
rt2x00: Check for errors from skb_pad() calls
Shiang Tu (2):
rt2x00: Add/Modify protection related register definitions
rt2x00: Add/Modify the GPIO register definition
Stanislaw Gruszka (4):
iwlwifi: cleanup iwl_recover_from_statistics
iwlwifi: cleanup iwl_good_ack_health
iwlwifi: fix ack health for WiFi/BT combo devices
mac80211: fix conn_mon_timer running after disassociate
Steve Brown (1):
ath9k: Remove redundant beacon_interval
Sujith Manoharan (1):
ath9k_hw: Fix power on reset
Szymon Janc (5):
Bluetooth: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
Bluetooth: Clean up hci_sniff_subrate_evt function
Bluetooth: Fix some code style issues in hci_core.h
Bluetooth: Fix some code style issues in hci_core.c
Bluetooth: Fix some code style issues in hci_event.c
Vasanthakumar Thiagarajan (1):
ath9k: Implement op_flush()
Vasiliy Kulikov (3):
Bluetooth: l2cap: fix 1 byte infoleak to userspace
Bluetooth: bnep: fix buffer overflow
Bluetooth: sco: fix information leak to userspace
Ville Tervo (9):
Bluetooth: Add low energy commands and events
Bluetooth: Add LE connect support
Bluetooth: Use LE buffers for LE traffic
Bluetooth: Add LE connection support to L2CAP
Bluetooth: Add server socket support for LE connection
Bluetooth: Do not send disconn comand over LE links
Bluetooth: Treat LE and ACL links separately on timeout
Bluetooth: Add SMP command structures
Bluetooth: Use proper timer for hci command timout
Vinicius Costa Gomes (1):
Bluetooth: Fix initiated LE connections
Vivek Natarajan (3):
ath9k_htc: Fix a compilation warning.
ath9k_hw: Updates for AR9485 1.1 chipsets.
mac80211: Clear PS related flag on disabling power save.
Vladislav P (1):
Bluetooth: Release BTM while sleeping to avoid deadlock
Wey-Yi Guy (2):
iwlagn: donot process bt update when bt coex disable
iwlagn: handle bt defer work in 2000 series
Wojciech Dubowik (1):
ath5k: Enable AR2315 chipset recognition
Xose Vazquez Perez (1):
wireless: rt2x00: rt2800pci.c: add two ids
Documentation/feature-removal-schedule.txt | 11 +
MAINTAINERS | 2 +-
drivers/bluetooth/ath3k.c | 290 +++-
drivers/bluetooth/btusb.c | 20 +-
drivers/bluetooth/hci_ldisc.c | 1 +
drivers/net/wireless/ath/ar9170/Kconfig | 4 +-
drivers/net/wireless/ath/ath5k/ath5k.h | 20 +
drivers/net/wireless/ath/ath5k/attach.c | 3 +-
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 17 -
drivers/net/wireless/ath/ath5k/phy.c | 1 +
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 112 +-
drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 1141 +++++++++
drivers/net/wireless/ath/ath9k/ath9k.h | 13 +-
drivers/net/wireless/ath/ath9k/beacon.c | 43 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +-
drivers/net/wireless/ath/ath9k/hw.c | 1 -
drivers/net/wireless/ath/ath9k/init.c | 8 -
drivers/net/wireless/ath/ath9k/main.c | 124 +-
drivers/net/wireless/ath/ath9k/reg.h | 4 +
drivers/net/wireless/ath/ath9k/xmit.c | 30 +-
drivers/net/wireless/iwlwifi/iwl-2000.c | 3 +-
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 12 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 74 +-
drivers/net/wireless/iwlwifi/iwl-rx.c | 37 +-
drivers/net/wireless/p54/eeprom.c | 208 ++-
drivers/net/wireless/p54/eeprom.h | 7 +
drivers/net/wireless/p54/fwio.c | 12 +-
drivers/net/wireless/p54/lmac.h | 1 +
drivers/net/wireless/p54/main.c | 47 +-
drivers/net/wireless/p54/p54.h | 6 +-
drivers/net/wireless/p54/p54spi_eeprom.h | 9 +-
drivers/net/wireless/p54/txrx.c | 6 +-
drivers/net/wireless/rt2x00/Kconfig | 12 +
drivers/net/wireless/rt2x00/rt2800.h | 129 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 747 +++++--
drivers/net/wireless/rt2x00/rt2800pci.c | 12 +
drivers/net/wireless/rt2x00/rt2x00.h | 4 +
drivers/net/wireless/rt2x00/rt2x00ht.c | 1 -
drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 9 +-
drivers/net/wireless/rt2x00/rt61pci.c | 12 +-
drivers/net/wireless/rt2x00/rt73usb.c | 12 +-
drivers/net/wireless/rtlwifi/Kconfig | 17 +-
drivers/net/wireless/rtlwifi/Makefile | 6 +-
drivers/net/wireless/rtlwifi/base.c | 76 +-
drivers/net/wireless/rtlwifi/base.h | 39 +-
drivers/net/wireless/rtlwifi/core.c | 14 +-
drivers/net/wireless/rtlwifi/debug.h | 1 +
drivers/net/wireless/rtlwifi/pci.c | 148 +-
drivers/net/wireless/rtlwifi/pci.h | 12 +-
drivers/net/wireless/rtlwifi/ps.c | 58 +-
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 1388 +++++++++++
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 2049 ++++++++++++++++
drivers/net/wireless/rtlwifi/rtl8192ce/Makefile | 2 +
drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 144 ++
drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 1361 +-----------
drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 1 +
drivers/net/wireless/rtlwifi/rtl8192ce/fw.c | 59 +-
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 153 +-
drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 6 +-
drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 2072 +----------------
drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 7 +-
drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 73 +-
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 7 +-
drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 2 +
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 170 +-
drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 464 ++--
drivers/net/wireless/rtlwifi/rtl8192cu/Makefile | 15 +
drivers/net/wireless/rtlwifi/rtl8192cu/def.h | 62 +
drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 116 +
drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 32 +
drivers/net/wireless/rtlwifi/rtl8192cu/fw.c | 30 +
drivers/net/wireless/rtlwifi/rtl8192cu/fw.h | 30 +
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2505 ++++++++++++++++++++
drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 107 +
drivers/net/wireless/rtlwifi/rtl8192cu/led.c | 142 ++
drivers/net/wireless/rtlwifi/rtl8192cu/led.h | 37 +
drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 1144 +++++++++
drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 180 ++
drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 611 +++++
drivers/net/wireless/rtlwifi/rtl8192cu/phy.h | 34 +
drivers/net/wireless/rtlwifi/rtl8192cu/reg.h | 30 +
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 493 ++++
drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 30 +
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 327 +++
drivers/net/wireless/rtlwifi/rtl8192cu/sw.h | 35 +
drivers/net/wireless/rtlwifi/rtl8192cu/table.c | 1888 +++++++++++++++
drivers/net/wireless/rtlwifi/rtl8192cu/table.h | 71 +
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 684 ++++++
drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 430 ++++
drivers/net/wireless/rtlwifi/usb.c | 1035 ++++++++
drivers/net/wireless/rtlwifi/usb.h | 164 ++
drivers/net/wireless/rtlwifi/wifi.h | 667 ++++--
drivers/net/wireless/wl12xx/Kconfig | 2 +-
drivers/net/wireless/wl12xx/acx.c | 86 +-
drivers/net/wireless/wl12xx/acx.h | 41 +-
drivers/net/wireless/wl12xx/cmd.c | 10 +-
drivers/net/wireless/wl12xx/cmd.h | 14 +-
drivers/net/wireless/wl12xx/conf.h | 49 +
drivers/net/wireless/wl12xx/event.c | 14 -
drivers/net/wireless/wl12xx/event.h | 2 -
drivers/net/wireless/wl12xx/init.c | 13 +
drivers/net/wireless/wl12xx/main.c | 143 +-
drivers/net/wireless/wl12xx/ps.c | 6 +-
drivers/net/wireless/wl12xx/rx.c | 6 +-
drivers/net/wireless/wl12xx/rx.h | 2 +-
drivers/net/wireless/wl12xx/tx.c | 22 -
drivers/net/wireless/wl12xx/wl12xx.h | 66 +-
drivers/net/wireless/zd1211rw/zd_chip.c | 35 +-
drivers/net/wireless/zd1211rw/zd_def.h | 2 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 177 ++-
drivers/net/wireless/zd1211rw/zd_usb.h | 9 +-
drivers/ssb/main.c | 44 +-
drivers/ssb/pci.c | 6 +-
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 +-
include/linux/ssb/ssb_regs.h | 7 +-
include/net/bluetooth/bluetooth.h | 33 +
include/net/bluetooth/hci.h | 122 +
include/net/bluetooth/hci_core.h | 152 +-
include/net/bluetooth/l2cap.h | 53 +-
include/net/bluetooth/mgmt.h | 142 ++
include/net/bluetooth/smp.h | 76 +
net/bluetooth/Kconfig | 16 +-
net/bluetooth/Makefile | 4 +-
net/bluetooth/af_bluetooth.c | 53 +-
net/bluetooth/bnep/core.c | 2 -
net/bluetooth/bnep/sock.c | 1 +
net/bluetooth/cmtp/capi.c | 3 +-
net/bluetooth/cmtp/core.c | 11 +-
net/bluetooth/hci_conn.c | 78 +-
net/bluetooth/hci_core.c | 345 +++-
net/bluetooth/hci_event.c | 622 +++++-
net/bluetooth/hci_sock.c | 6 +-
net/bluetooth/hci_sysfs.c | 58 +-
net/bluetooth/hidp/core.c | 11 +-
net/bluetooth/{l2cap.c => l2cap_core.c} | 1722 ++++----------
net/bluetooth/l2cap_sock.c | 1156 +++++++++
net/bluetooth/mgmt.c | 1312 ++++++++++-
net/bluetooth/rfcomm/core.c | 2 -
net/bluetooth/rfcomm/tty.c | 2 +
net/bluetooth/sco.c | 17 +-
net/mac80211/Kconfig | 2 +-
net/mac80211/cfg.c | 1 +
net/mac80211/debugfs.c | 6 +
net/mac80211/ibss.c | 11 +-
net/mac80211/ieee80211_i.h | 2 -
net/mac80211/main.c | 33 +-
net/mac80211/mlme.c | 8 +
net/mac80211/rx.c | 12 +-
net/mac80211/scan.c | 15 +-
net/mac80211/tx.c | 1 +
net/mac80211/util.c | 6 -
net/mac80211/work.c | 59 +-
153 files changed, 22844 insertions(+), 6512 deletions(-)
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/Makefile
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/def.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/dm.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/fw.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/fw.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/led.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/led.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/phy.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/reg.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/table.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/table.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
create mode 100644 drivers/net/wireless/rtlwifi/usb.c
create mode 100644 drivers/net/wireless/rtlwifi/usb.h
create mode 100644 include/net/bluetooth/smp.h
rename net/bluetooth/{l2cap.c => l2cap_core.c} (76%)
create mode 100644 net/bluetooth/l2cap_sock.c
Omnibus patch available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-next-2.6-2011-02-22.patch.bz2
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
On Fri, Feb 25, 2011 at 11:15:00AM -0800, David Miller wrote:
> From: David Miller <[email protected]>
> Date: Thu, 24 Feb 2011 22:43:44 -0800 (PST)
> > Pulled, thanks a lot John.
>
> John a few things:
>
> 1) I had to add some vmalloc.h includes to fix the build on sparc64,
> see commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac in net-next-2.6
I have a patch in my tree for that -- seems they hit it on ARM as well.
> 2) Something is screwey with the bluetooth config options now.
>
> I have an allmodconfig tree, and when I run "make oldconfig" after
> this pull, BT_L2CAP and BT_SCO both prompt me, claiming that they
> can only be built statically.
>
> I give it 'y' just to make it happen, for both, and afterways no
> matter how many times I rerun "make oldconfig" I keep seeing things
> like this in my build:
>
> scripts/kconfig/conf --silentoldconfig Kconfig
> include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
> include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
>
> First, what the heck is going on here? Second, why the heck can't these
> non-trivial pieces of code be built modular any more?
>
> You can't make something "bool", have it depend on something that
> might be modular, and then build it into what could in fact be a
> module. That's exactly what the bluetooth stuff seems to be doing
> now.
>
> I suspect commit 642745184f82688eb3ef0cdfaa4ba632055be9af
>
> Thanks.
Sorry, I overlooked that. Hopefully Gustavo will figure it out quickly.
Thanks,
John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
* Gustavo F. Padovan <[email protected]> [2011-02-25 16:36:18 -0300]:
> Hi David,
>
> * David Miller <[email protected]> [2011-02-25 11:15:00 -0800]:
>
> > From: David Miller <[email protected]>
> > Date: Thu, 24 Feb 2011 22:43:44 -0800 (PST)
> >
> > > From: "John W. Linville" <[email protected]>
> > > Date: Tue, 22 Feb 2011 16:52:30 -0500
> > >
> > >> Here is the latest batch of wireless bits intended for 2.6.39. It seems
> > >> I neglected to send a pull request last week, so this one is a bit big
> > >> -- I apologize!
> > >>
> > >> This includes a rather large batch of bluetooth bits by way of Gustavo.
> > >> It looks like a variety of bits, including some code refactoring, some
> > >> protocol support enhancements, some bugfixes, etc. -- nothing too
> > >> unusual.
> > >>
> > >> Other items of interest include a new driver from Realtek, some ssb
> > >> support enhancements, and the usual sort of updates for mac80211 and a
> > >> variety of drivers. Also included is a wireless-2.6 pull to resolve
> > >> some build breakage.
> > >>
> > >> Please let me know if there are problems!
> > >
> > > Pulled, thanks a lot John.
> >
> > John a few things:
> >
> > 1) I had to add some vmalloc.h includes to fix the build on sparc64,
> > see commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac in net-next-2.6
> >
> > 2) Something is screwey with the bluetooth config options now.
> >
> > I have an allmodconfig tree, and when I run "make oldconfig" after
> > this pull, BT_L2CAP and BT_SCO both prompt me, claiming that they
> > can only be built statically.
> >
> > I give it 'y' just to make it happen, for both, and afterways no
> > matter how many times I rerun "make oldconfig" I keep seeing things
> > like this in my build:
> >
> > scripts/kconfig/conf --silentoldconfig Kconfig
> > include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
> > include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
> >
> > First, what the heck is going on here? Second, why the heck can't these
> > non-trivial pieces of code be built modular any more?
>
> We now have L2CAP and SCO built-in in the main bluetooth.ko module.
>
> >
> > You can't make something "bool", have it depend on something that
> > might be modular, and then build it into what could in fact be a
> > module. That's exactly what the bluetooth stuff seems to be doing
> > now.
>
> Seems I did the Kconfig change wrong, I'll fix it ASAP and send it to you
> guys.
I Figured the problem. When I first wrote this I based the work in other
Kconfig in net/ (as it was my very first time doing such kind of changes in a
Kconfig). For example, net/decnet/ and net/ax25/ do exactly the same as the
Bluetooth Kconfig. "bool" depending on "tristate" and build both together.
But doing another look after your report there is some places where this is
done a bit different, net/ipv6 and net/mac80211 are examples. Then I changed
to this new approach to remove the direct dependency from BT_L2CAP and BT_SCO.
Patch follows this e-mail.
That point me out that we may have other subsystems doing it wrong and we have
to fix this.
--
Gustavo F. Padovan
http://profusion.mobi
Hi David,
* David Miller <[email protected]> [2011-02-25 11:15:00 -0800]:
> From: David Miller <[email protected]>
> Date: Thu, 24 Feb 2011 22:43:44 -0800 (PST)
>
> > From: "John W. Linville" <[email protected]>
> > Date: Tue, 22 Feb 2011 16:52:30 -0500
> >
> >> Here is the latest batch of wireless bits intended for 2.6.39. It seems
> >> I neglected to send a pull request last week, so this one is a bit big
> >> -- I apologize!
> >>
> >> This includes a rather large batch of bluetooth bits by way of Gustavo.
> >> It looks like a variety of bits, including some code refactoring, some
> >> protocol support enhancements, some bugfixes, etc. -- nothing too
> >> unusual.
> >>
> >> Other items of interest include a new driver from Realtek, some ssb
> >> support enhancements, and the usual sort of updates for mac80211 and a
> >> variety of drivers. Also included is a wireless-2.6 pull to resolve
> >> some build breakage.
> >>
> >> Please let me know if there are problems!
> >
> > Pulled, thanks a lot John.
>
> John a few things:
>
> 1) I had to add some vmalloc.h includes to fix the build on sparc64,
> see commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac in net-next-2.6
>
> 2) Something is screwey with the bluetooth config options now.
>
> I have an allmodconfig tree, and when I run "make oldconfig" after
> this pull, BT_L2CAP and BT_SCO both prompt me, claiming that they
> can only be built statically.
>
> I give it 'y' just to make it happen, for both, and afterways no
> matter how many times I rerun "make oldconfig" I keep seeing things
> like this in my build:
>
> scripts/kconfig/conf --silentoldconfig Kconfig
> include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
> include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
>
> First, what the heck is going on here? Second, why the heck can't these
> non-trivial pieces of code be built modular any more?
We now have L2CAP and SCO built-in in the main bluetooth.ko module.
>
> You can't make something "bool", have it depend on something that
> might be modular, and then build it into what could in fact be a
> module. That's exactly what the bluetooth stuff seems to be doing
> now.
Seems I did the Kconfig change wrong, I'll fix it ASAP and send it to you
guys.
--
Gustavo F. Padovan
http://profusion.mobi
From: David Miller <[email protected]>
Date: Thu, 24 Feb 2011 22:43:44 -0800 (PST)
> From: "John W. Linville" <[email protected]>
> Date: Tue, 22 Feb 2011 16:52:30 -0500
>
>> Here is the latest batch of wireless bits intended for 2.6.39. It seems
>> I neglected to send a pull request last week, so this one is a bit big
>> -- I apologize!
>>
>> This includes a rather large batch of bluetooth bits by way of Gustavo.
>> It looks like a variety of bits, including some code refactoring, some
>> protocol support enhancements, some bugfixes, etc. -- nothing too
>> unusual.
>>
>> Other items of interest include a new driver from Realtek, some ssb
>> support enhancements, and the usual sort of updates for mac80211 and a
>> variety of drivers. Also included is a wireless-2.6 pull to resolve
>> some build breakage.
>>
>> Please let me know if there are problems!
>
> Pulled, thanks a lot John.
John a few things:
1) I had to add some vmalloc.h includes to fix the build on sparc64,
see commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac in net-next-2.6
2) Something is screwey with the bluetooth config options now.
I have an allmodconfig tree, and when I run "make oldconfig" after
this pull, BT_L2CAP and BT_SCO both prompt me, claiming that they
can only be built statically.
I give it 'y' just to make it happen, for both, and afterways no
matter how many times I rerun "make oldconfig" I keep seeing things
like this in my build:
scripts/kconfig/conf --silentoldconfig Kconfig
include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
First, what the heck is going on here? Second, why the heck can't these
non-trivial pieces of code be built modular any more?
You can't make something "bool", have it depend on something that
might be modular, and then build it into what could in fact be a
module. That's exactly what the bluetooth stuff seems to be doing
now.
I suspect commit 642745184f82688eb3ef0cdfaa4ba632055be9af
Thanks.
From: "John W. Linville" <[email protected]>
Date: Tue, 22 Feb 2011 16:52:30 -0500
> Here is the latest batch of wireless bits intended for 2.6.39. It seems
> I neglected to send a pull request last week, so this one is a bit big
> -- I apologize!
>
> This includes a rather large batch of bluetooth bits by way of Gustavo.
> It looks like a variety of bits, including some code refactoring, some
> protocol support enhancements, some bugfixes, etc. -- nothing too
> unusual.
>
> Other items of interest include a new driver from Realtek, some ssb
> support enhancements, and the usual sort of updates for mac80211 and a
> variety of drivers. Also included is a wireless-2.6 pull to resolve
> some build breakage.
>
> Please let me know if there are problems!
Pulled, thanks a lot John.
On Fri, Mar 04, 2011 at 12:35:58PM +0800, Shan Wei wrote:
> John W. Linville wrote, at 02/23/2011 05:52 AM:
> > Please let me know if there are problems!
>
> Fail to compile with attached config under net-next tree.
>
> ======Error Begin================================================================
> drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_sw_chnl':
> /data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:803: multiple definition of `rtl92c_phy_sw_chnl'
> drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:803: first defined here
> drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_h2c_cmd':
This is already fixed in wireless-next-2.6:
commit 1472d3a87586eb7529d1d85f7c888055650b7208
Author: Larry Finger <[email protected]>
Date: Wed Feb 23 10:24:58 2011 -0600
rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig buil
As noted by Stephan Rothwell, an allyesconfig build fails since rtl8192cu
was merged with failures such as:
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_s
(.opd+0xf30): multiple definition of `rtl92c_phy_sw_chnl'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0xb70): first define
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_
(.opd+0x288): multiple definition of `rtl92c_fill_h2c_cmd'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0x288): first define
These are caused because the code shared between rtl8192ce and rtl8192cu
is included in both drivers. This has been fixed by creating a new modue tha
contains the shared code.
Signed-off-by: Larry Finger <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
It will be in my next pull request to Dave.
John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
John W. Linville wrote, at 02/23/2011 05:52 AM:
> Please let me know if there are problems!
Fail to compile with attached config under net-next tree.
======Error Begin================================================================
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_sw_chnl':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:803: multiple definition of `rtl92c_phy_sw_chnl'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:803: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_h2c_cmd':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192ce/fw.c:504: multiple definition of `rtl92c_fill_h2c_cmd'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c:504: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_rf6052_set_ofdm_txpower':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c:393: multiple definition of `rtl92c_phy_rf6052_set_ofdm_txpower'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c:415: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_sw_chnl_callback':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:775: multiple definition of `rtl92c_phy_sw_chnl_callback'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:775: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_query_bb_reg':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:69: multiple definition of `rtl92c_phy_query_bb_reg'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:69: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_io':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:1981: multiple definition of `rtl92c_phy_set_io'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:1981: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_get_hw_reg_originalvalue':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:415: multiple definition of `rtl92c_phy_get_hw_reg_originalvalue'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:415: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92ce_phy_set_rf_on':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:2010: multiple definition of `rtl92ce_phy_set_rf_on'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:2010: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl8192_phy_check_is_legal_rfpath':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:961: multiple definition of `rtl8192_phy_check_is_legal_rfpath'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:961: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_init_edca_turbo':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/dm_common.c:552: multiple definition of `dm_digtable'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../wifi.h:1793: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_bw_mode_callback':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c:356: multiple definition of `rtl92c_phy_set_bw_mode_callback'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:371: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_query_rf_reg':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c:44: multiple definition of `rtl92c_phy_query_rf_reg'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:44: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_scan_operation_backup':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:725: multiple definition of `rtl92c_phy_scan_operation_backup'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:725: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_rf_config':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:224: multiple definition of `rtl92c_phy_rf_config'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:224: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_rf6052_set_cck_txpower':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c:66: multiple definition of `rtl92c_phy_rf6052_set_cck_txpower'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c:66: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_dynamic_txpower':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c:41: multiple definition of `rtl92c_dm_dynamic_txpower'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c:41: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_bb_config':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c:121: multiple definition of `rtl92c_phy_bb_config'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:138: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_io_cmd':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:1943: multiple definition of `rtl92c_phy_set_io_cmd'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:1943: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_config_rf_with_headerfile':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c:268: multiple definition of `rtl92c_phy_config_rf_with_headerfile'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:281: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_mac_config':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c:108: multiple definition of `rtl92c_phy_mac_config'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:126: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_download_fw':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192ce/fw.c:224: multiple definition of `rtl92c_download_fw'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c:224: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_set_fw_joinbss_report_cmd':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192ce/fw.c:763: multiple definition of `rtl92c_set_fw_joinbss_report_cmd'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c:763: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_write_dig':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/dm_common.c:502: multiple definition of `rtl92c_dm_write_dig'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/dm_common.c:502: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_set_fw_pwrmode_cmd':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192ce/fw.c:542: multiple definition of `rtl92c_set_fw_pwrmode_cmd'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c:542: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_rf_saving':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/dm_common.c:1245: multiple definition of `rtl92c_dm_rf_saving'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/dm_common.c:1245: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_firmware_selfreset':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192ce/fw.c:522: multiple definition of `rtl92c_firmware_selfreset'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c:522: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_rf6052_set_bandwidth':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c:40: multiple definition of `rtl92c_phy_rf6052_set_bandwidth'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c:40: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_bb_reg':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:90: multiple definition of `rtl92c_phy_set_bb_reg'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:90: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_rf6052_config':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c:410: multiple definition of `rtl92c_phy_rf6052_config'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c:434: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_rf_power_state':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c:603: multiple definition of `rtl92c_phy_set_rf_power_state'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:622: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_init':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/dm_common.c:1352: multiple definition of `rtl92c_dm_init'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/dm_common.c:1352: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_iq_calibrate':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:1783: multiple definition of `rtl92c_phy_iq_calibrate'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:1783: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_init_edca_turbo':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/dm_common.c:551: multiple definition of `rtl92c_dm_init_edca_turbo'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/dm_common.c:551: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_beacon_hw_reg':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:667: multiple definition of `rtl92c_phy_set_beacon_hw_reg'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:667: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_lc_calibrate':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:1906: multiple definition of `rtl92c_phy_lc_calibrate'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:1906: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_bw_mode':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:755: multiple definition of `rtl92c_phy_set_bw_mode'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:755: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_update_txpower_dbm':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:633: multiple definition of `rtl92c_phy_update_txpower_dbm'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:633: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_init_rate_adaptive_mask':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/dm_common.c:1108: multiple definition of `rtl92c_dm_init_rate_adaptive_mask'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/dm_common.c:1108: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_watchdog':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/dm_common.c:1365: multiple definition of `rtl92c_dm_watchdog'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/dm_common.c:1365: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_dm_check_txpower_tracking':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/dm_common.c:1103: multiple definition of `rtl92c_dm_check_txpower_tracking'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/dm_common.c:1103: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_set_fw_rsvdpagepkt':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192ce/fw.c:679: multiple definition of `rtl92c_set_fw_rsvdpagepkt'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c:679: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_get_txpower_level':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:552: multiple definition of `rtl92c_phy_get_txpower_level'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:552: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_txpower_level':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:617: multiple definition of `rtl92c_phy_set_txpower_level'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:617: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_config_bb_external_pa':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:269: multiple definition of `rtl92c_phy_config_bb_external_pa'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:269: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_ap_calibrate':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:1919: multiple definition of `rtl92c_phy_ap_calibrate'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:1919: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_rfpath_switch':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:1933: multiple definition of `rtl92c_phy_set_rfpath_switch'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:1933: first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_set_rf_reg':
/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c:71: multiple definition of `rtl92c_phy_set_rf_reg'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:80: first defined here
CC drivers/net/tlan.o
make[4]: *** [drivers/net/wireless/rtlwifi/built-in.o] Error 1
make[3]: *** [drivers/net/wireless/rtlwifi] Error 2
make[2]: *** [drivers/net/wireless] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2