diff options
Diffstat (limited to 'drivers/usb/net')
| -rw-r--r-- | drivers/usb/net/usbnet.c | 3 | ||||
| -rw-r--r-- | drivers/usb/net/zd1201.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index a45ea7c97356..f6bc6b3b333c 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c | |||
| @@ -4071,6 +4071,9 @@ static const struct usb_device_id products [] = { | |||
| 4071 | USB_DEVICE (0x8086, 0x07d3), // "blob" bootloader | 4071 | USB_DEVICE (0x8086, 0x07d3), // "blob" bootloader |
| 4072 | .driver_info = (unsigned long) &blob_info, | 4072 | .driver_info = (unsigned long) &blob_info, |
| 4073 | }, { | 4073 | }, { |
| 4074 | USB_DEVICE (0x22b8, 0x600c), // USBNET Motorola E680 | ||
| 4075 | .driver_info = (unsigned long) &linuxdev_info, | ||
| 4076 | }, { | ||
| 4074 | // Linux Ethernet/RNDIS gadget on pxa210/25x/26x | 4077 | // Linux Ethernet/RNDIS gadget on pxa210/25x/26x |
| 4075 | // e.g. Gumstix, current OpenZaurus, ... | 4078 | // e.g. Gumstix, current OpenZaurus, ... |
| 4076 | USB_DEVICE_VER (0x0525, 0xa4a2, 0x0203, 0x0203), | 4079 | USB_DEVICE_VER (0x0525, 0xa4a2, 0x0203, 0x0203), |
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c index f98cb2af024e..341ae5f732dd 100644 --- a/drivers/usb/net/zd1201.c +++ b/drivers/usb/net/zd1201.c | |||
| @@ -183,7 +183,7 @@ static void zd1201_usbtx(struct urb *urb, struct pt_regs *regs) | |||
| 183 | return; | 183 | return; |
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | /* Incomming data */ | 186 | /* Incoming data */ |
| 187 | static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) | 187 | static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) |
| 188 | { | 188 | { |
| 189 | struct zd1201 *zd = urb->context; | 189 | struct zd1201 *zd = urb->context; |
| @@ -772,7 +772,7 @@ static int zd1201_net_stop(struct net_device *dev) | |||
| 772 | /* | 772 | /* |
| 773 | RFC 1042 encapsulates Ethernet frames in 802.11 frames | 773 | RFC 1042 encapsulates Ethernet frames in 802.11 frames |
| 774 | by prefixing them with 0xaa, 0xaa, 0x03) followed by a SNAP OID of 0 | 774 | by prefixing them with 0xaa, 0xaa, 0x03) followed by a SNAP OID of 0 |
| 775 | (0x00, 0x00, 0x00). Zd requires an additionnal padding, copy | 775 | (0x00, 0x00, 0x00). Zd requires an additional padding, copy |
| 776 | of ethernet addresses, length of the standard RFC 1042 packet | 776 | of ethernet addresses, length of the standard RFC 1042 packet |
| 777 | and a command byte (which is nul for tx). | 777 | and a command byte (which is nul for tx). |
| 778 | 778 | ||
| @@ -1098,7 +1098,7 @@ static int zd1201_get_range(struct net_device *dev, | |||
| 1098 | 1098 | ||
| 1099 | /* Little bit of magic here: we only get the quality if we poll | 1099 | /* Little bit of magic here: we only get the quality if we poll |
| 1100 | * for it, and we never get an actual request to trigger such | 1100 | * for it, and we never get an actual request to trigger such |
| 1101 | * a poll. Therefore we 'asume' that the user will soon ask for | 1101 | * a poll. Therefore we 'assume' that the user will soon ask for |
| 1102 | * the stats after asking the bssid. | 1102 | * the stats after asking the bssid. |
| 1103 | */ | 1103 | */ |
| 1104 | static int zd1201_get_wap(struct net_device *dev, | 1104 | static int zd1201_get_wap(struct net_device *dev, |
| @@ -1108,7 +1108,7 @@ static int zd1201_get_wap(struct net_device *dev, | |||
| 1108 | unsigned char buffer[6]; | 1108 | unsigned char buffer[6]; |
| 1109 | 1109 | ||
| 1110 | if (!zd1201_getconfig(zd, ZD1201_RID_COMMSQUALITY, buffer, 6)) { | 1110 | if (!zd1201_getconfig(zd, ZD1201_RID_COMMSQUALITY, buffer, 6)) { |
| 1111 | /* Unfortunatly the quality and noise reported is useless. | 1111 | /* Unfortunately the quality and noise reported is useless. |
| 1112 | they seem to be accumulators that increase until you | 1112 | they seem to be accumulators that increase until you |
| 1113 | read them, unless we poll on a fixed interval we can't | 1113 | read them, unless we poll on a fixed interval we can't |
| 1114 | use them | 1114 | use them |
