diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-12 14:37:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-12 14:37:29 -0800 |
| commit | ddd535c713c788f3c23c6548c4ba985a7593113c (patch) | |
| tree | bb7ed2fc52c1e99803c47e4c2134ced01161f1f2 /drivers | |
| parent | e23a59e1ca6d177a57a7791b3629db93ff1d9813 (diff) | |
| parent | f7cd168645dda3e9067f24fabbfa787f9a237488 (diff) | |
| download | op-kernel-dev-ddd535c713c788f3c23c6548c4ba985a7593113c.zip op-kernel-dev-ddd535c713c788f3c23c6548c4ba985a7593113c.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_wlan.h | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/rtl8187_dev.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h index ffdf487..a68f97c 100644 --- a/drivers/net/wireless/hostap/hostap_wlan.h +++ b/drivers/net/wireless/hostap/hostap_wlan.h @@ -918,9 +918,12 @@ struct hostap_interface { /* * TX meta data - stored in skb->cb buffer, so this must not be increased over - * the 40-byte limit + * the 48-byte limit. + * THE PADDING THIS STARTS WITH IS A HORRIBLE HACK THAT SHOULD NOT LIVE + * TO SEE THE DAY. */ struct hostap_skb_tx_data { + unsigned int __padding_for_default_qdiscs; u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */ u8 rate; /* transmit rate */ #define HOSTAP_TX_FLAGS_WDS BIT(0) diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 431e3c7..69eb013 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c @@ -48,6 +48,9 @@ static struct usb_device_id rtl8187_table[] __devinitdata = { {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187}, /* Sitecom */ {USB_DEVICE(0x0df6, 0x000d), .driver_info = DEVICE_RTL8187}, + {USB_DEVICE(0x0df6, 0x0028), .driver_info = DEVICE_RTL8187B}, + /* Abocom */ + {USB_DEVICE(0x13d1, 0xabe6), .driver_info = DEVICE_RTL8187}, {} }; |
