Merged the changes from Realtek's v2.6.6.0.20110401 release. There is also a patch from Larry Finger, aiding kmemleak tracking, and a re-send of a "return-values" patch from mid-July. The firmware update, in farray.h, has already been submitted by Larry Finger. Ali Bahar (20): staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. staging: r8712u: Merging Realtek's latest (v2.6.6). Renamed _netdev_priv. staging: r8712u: Merging Realtek's latest (v2.6.6). Removed os_free_netdev. staging: r8712u: Merging Realtek's latest (v2.6.6). Removed _usb_alloc_urb. staging: r8712u: Merging Realtek's latest (v2.6.6). Removed _usb_submit_urb. staging: r8712u: Merging Realtek's latest (v2.6.6). Removed unused MSECS. staging: r8712u: Merging Realtek's latest (v2.6.6). Redundant NULL check. staging: r8712u: Merging Realtek's latest (v2.6.6). Updated include directives. staging: r8712u: Merging Realtek's latest (v2.6.6). Removed redundant .mem. staging: r8712u: Merging Realtek's latest (v2.6.6). No power tracking OID. staging: r8712u: Merging Realtek's latest (v2.6.6). stop_drv_timers moved. staging: r8712u: Merging Realtek's latest (v2.6.6). Use stack, not malloc. staging: r8712u: Merging Realtek's latest (v2.6.6). Tx-code refactoring. staging: r8712u: Merging Realtek's latest (v2.6.6). Rework efuse data handling. staging: r8712u: Merging Realtek's latest (v2.6.6). tx: NULL _in_ spin lock. staging: r8712u: Merging Realtek's latest (v2.6.6). New decl's and defines. staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. staging: r8712u: Merging Realtek's latest (v2.6.6). Tx aggregation. staging: r8712u: Most return-values changed from -1 to proper errno macros. Larry Finger (1): staging: r8712u: Tracking kmemleak false positives. drivers/staging/rtl8712/Kconfig | 7 + drivers/staging/rtl8712/basic_types.h | 25 ++ drivers/staging/rtl8712/drv_types.h | 28 +++ drivers/staging/rtl8712/hal_init.c | 5 + drivers/staging/rtl8712/ieee80211.c | 35 +--- drivers/staging/rtl8712/ieee80211.h | 31 +++- drivers/staging/rtl8712/os_intfs.c | 19 +- drivers/staging/rtl8712/osdep_intf.h | 25 ++ drivers/staging/rtl8712/osdep_service.h | 68 +++--- drivers/staging/rtl8712/recv_linux.c | 6 +- drivers/staging/rtl8712/rtl8712_cmd.c | 18 ++ drivers/staging/rtl8712/rtl8712_cmd.h | 87 +++++++ drivers/staging/rtl8712/rtl8712_efuse.c | 75 ++++--- drivers/staging/rtl8712/rtl8712_event.h | 25 ++ drivers/staging/rtl8712/rtl8712_led.c | 2 +- drivers/staging/rtl8712/rtl8712_recv.c | 24 +- drivers/staging/rtl8712/rtl8712_recv.h | 31 +++- drivers/staging/rtl8712/rtl8712_xmit.c | 303 ++++++++++++++++++++++-- drivers/staging/rtl8712/rtl8712_xmit.h | 37 +++ drivers/staging/rtl8712/rtl871x_cmd.c | 172 +++++++++++++-- drivers/staging/rtl8712/rtl871x_cmd.h | 77 ++++++- drivers/staging/rtl8712/rtl871x_debug.h | 25 ++ drivers/staging/rtl8712/rtl871x_io.h | 25 ++ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 278 +++++++++++++++++------ drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 25 ++ drivers/staging/rtl8712/rtl871x_ioctl_set.c | 3 +- drivers/staging/rtl8712/rtl871x_ioctl_set.h | 2 +- drivers/staging/rtl8712/rtl871x_led.h | 25 ++ drivers/staging/rtl8712/rtl871x_mlme.c | 58 ++---- drivers/staging/rtl8712/rtl871x_mlme.h | 28 ++- drivers/staging/rtl8712/rtl871x_mp.c | 26 ++- drivers/staging/rtl8712/rtl871x_mp.h | 1 - drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 29 ++- drivers/staging/rtl8712/rtl871x_recv.c | 4 + drivers/staging/rtl8712/rtl871x_security.c | 15 ++ drivers/staging/rtl8712/rtl871x_xmit.c | 31 ++- drivers/staging/rtl8712/rtl871x_xmit.h | 52 ++++- drivers/staging/rtl8712/sta_info.h | 29 +++- drivers/staging/rtl8712/usb_intf.c | 18 +- drivers/staging/rtl8712/usb_ops_linux.c | 29 ++-- drivers/staging/rtl8712/usb_osintf.h | 1 + drivers/staging/rtl8712/wifi.h | 25 ++ drivers/staging/rtl8712/wlan_bssdef.h | 25 ++ drivers/staging/rtl8712/xmit_linux.c | 27 ++- drivers/staging/rtl8712/xmit_osdep.h | 26 ++ 45 files changed, 1566 insertions(+), 341 deletions(-) -- 1.7.6 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel