diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-13 10:24:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-13 10:24:43 -0700 |
| commit | 4a390e07fc53ce9dd615d7b788e9ecc73f87ad94 (patch) | |
| tree | 1086088a8efb55be1d2878cff8fefd1514301c15 /drivers/staging/rtl8192su/ieee80211/ieee80211_module.c | |
| parent | a4dc32374ed6dd56e09039ea8b7151c3a3e2307d (diff) | |
| parent | f6387184f5196242edecbb5385bcc3481fae212a (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: stlc45xx: convert config_interface to bss_info_changed, fixing a build error
Staging: comedi: s626: use subvendor:subdevice ids for SAA7146 board
Staging: prevent rtl8192su from crashing dev_ioctl in SIOCGIWNAME
Staging: prevent rtl8187se from crashing dev_ioctl() in SIOCGIWNAME
Staging: rtl8192su: convert to net_device_ops
Staging: serqt_usb2: declare qt_open static in serqt_usb2
Staging: serqt_usb2: fix qt_close parameters in serqt_usb2
Staging: comedi: jr3_pci.c: add required includes
Staging: meilhaus: add email address to TODO
Staging: rspiusb: use NULL virtual address instead of a bogus one
Staging: vt6655: compile fix
Staging: rt2870: Add USB ID for Sitecom WL-608
Diffstat (limited to 'drivers/staging/rtl8192su/ieee80211/ieee80211_module.c')
| -rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211_module.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c index f408b4583b8..759032db4a3 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c @@ -118,7 +118,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv) #else ieee = (struct ieee80211_device *)dev->priv; #endif - dev->hard_start_xmit = ieee80211_xmit; memset(ieee, 0, sizeof(struct ieee80211_device)+sizeof_priv); ieee->dev = dev; |