diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:06:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:06:13 -0700 |
| commit | 710ad849ae76bc2f938a885e928b90cdbbe61a6e (patch) | |
| tree | 28d53ccd6cf3888453fb7e588f5c62edcc595f69 /drivers/staging/rtl8192su/r8192U_core.c | |
| parent | b32b8e645ea764620ececc0c9a66a7fc08536d4d (diff) | |
| parent | 749d00dbf154fc2f9ac59df669205039de0d5b45 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: rspiusb: Fix buffer overflow
staging: add dependencies on PCI for drivers that require it
Staging: rtl8192su: fix build error
Staging: rt2870: Revert d44ca7 Removal of kernel_thread() API
Staging: rt2870: Add USB ID for Linksys, Planex Communications, Belkin
Diffstat (limited to 'drivers/staging/rtl8192su/r8192U_core.c')
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c index 4ab250743e8..70f81a8f129 100644 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c @@ -12142,7 +12142,7 @@ static const struct net_device_ops rtl8192_netdev_ops = { .ndo_set_mac_address = r8192_set_mac_adr, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = eth_change_mtu, - .ndo_start_xmit = ieee80211_xmit, + .ndo_start_xmit = rtl8192_ieee80211_xmit, }; #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) |