aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/asix.c2
-rw-r--r--drivers/net/usb/cdc-phonet.c8
-rw-r--r--drivers/net/usb/hso.c2
-rw-r--r--drivers/net/usb/ipheth.c13
-rw-r--r--drivers/net/usb/kaweth.c2
-rw-r--r--drivers/net/usb/net1080.c4
-rw-r--r--drivers/net/usb/pegasus.c125
-rw-r--r--drivers/net/usb/pegasus.h296
-rw-r--r--drivers/net/usb/sierra_net.c2
-rw-r--r--drivers/net/usb/usbnet.c2
10 files changed, 228 insertions, 228 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 9516f382a6ba..aea4645be7f6 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -179,7 +179,7 @@ struct ax88172_int_data {
179 __le16 res2; 179 __le16 res2;
180 u8 status; 180 u8 status;
181 __le16 res3; 181 __le16 res3;
182} __attribute__ ((packed)); 182} __packed;
183 183
184static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, 184static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
185 u16 size, void *data) 185 u16 size, void *data)
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index dc9444525b49..109751bad3bb 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -97,8 +97,9 @@ static void tx_complete(struct urb *req)
97 struct sk_buff *skb = req->context; 97 struct sk_buff *skb = req->context;
98 struct net_device *dev = skb->dev; 98 struct net_device *dev = skb->dev;
99 struct usbpn_dev *pnd = netdev_priv(dev); 99 struct usbpn_dev *pnd = netdev_priv(dev);
100 int status = req->status;
100 101
101 switch (req->status) { 102 switch (status) {
102 case 0: 103 case 0:
103 dev->stats.tx_bytes += skb->len; 104 dev->stats.tx_bytes += skb->len;
104 break; 105 break;
@@ -109,7 +110,7 @@ static void tx_complete(struct urb *req)
109 dev->stats.tx_aborted_errors++; 110 dev->stats.tx_aborted_errors++;
110 default: 111 default:
111 dev->stats.tx_errors++; 112 dev->stats.tx_errors++;
112 dev_dbg(&dev->dev, "TX error (%d)\n", req->status); 113 dev_dbg(&dev->dev, "TX error (%d)\n", status);
113 } 114 }
114 dev->stats.tx_packets++; 115 dev->stats.tx_packets++;
115 116
@@ -150,8 +151,9 @@ static void rx_complete(struct urb *req)
150 struct page *page = virt_to_page(req->transfer_buffer); 151 struct page *page = virt_to_page(req->transfer_buffer);
151 struct sk_buff *skb; 152 struct sk_buff *skb;
152 unsigned long flags; 153 unsigned long flags;
154 int status = req->status;
153 155
154 switch (req->status) { 156 switch (status) {
155 case 0: 157 case 0:
156 spin_lock_irqsave(&pnd->rx_lock, flags); 158 spin_lock_irqsave(&pnd->rx_lock, flags);
157 skb = pnd->rx_skb; 159 skb = pnd->rx_skb;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 4dd23513c5af..39422f71e1d0 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -211,7 +211,7 @@ struct hso_serial_state_notification {
211 u16 wIndex; 211 u16 wIndex;
212 u16 wLength; 212 u16 wLength;
213 u16 UART_state_bitmap; 213 u16 UART_state_bitmap;
214} __attribute__((packed)); 214} __packed;
215 215
216struct hso_tiocmget { 216struct hso_tiocmget {
217 struct mutex mutex; 217 struct mutex mutex;
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 197c352c47fb..08e7b6abacdd 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -193,7 +193,7 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
193 case 0: 193 case 0:
194 break; 194 break;
195 default: 195 default:
196 err("%s: urb status: %d", __func__, urb->status); 196 err("%s: urb status: %d", __func__, status);
197 return; 197 return;
198 } 198 }
199 199
@@ -222,16 +222,17 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
222static void ipheth_sndbulk_callback(struct urb *urb) 222static void ipheth_sndbulk_callback(struct urb *urb)
223{ 223{
224 struct ipheth_device *dev; 224 struct ipheth_device *dev;
225 int status = urb->status;
225 226
226 dev = urb->context; 227 dev = urb->context;
227 if (dev == NULL) 228 if (dev == NULL)
228 return; 229 return;
229 230
230 if (urb->status != 0 && 231 if (status != 0 &&
231 urb->status != -ENOENT && 232 status != -ENOENT &&
232 urb->status != -ECONNRESET && 233 status != -ECONNRESET &&
233 urb->status != -ESHUTDOWN) 234 status != -ESHUTDOWN)
234 err("%s: urb status: %d", __func__, urb->status); 235 err("%s: urb status: %d", __func__, status);
235 236
236 dev_kfree_skb_irq(dev->tx_skb); 237 dev_kfree_skb_irq(dev->tx_skb);
237 netif_wake_queue(dev->net); 238 netif_wake_queue(dev->net);
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index d6078b8c4273..2b7b39cad1ce 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -207,7 +207,7 @@ struct kaweth_ethernet_configuration
207 __le16 segment_size; 207 __le16 segment_size;
208 __u16 max_multicast_filters; 208 __u16 max_multicast_filters;
209 __u8 reserved3; 209 __u8 reserved3;
210} __attribute__ ((packed)); 210} __packed;
211 211
212/**************************************************************** 212/****************************************************************
213 * kaweth_device 213 * kaweth_device
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
index 961a8ed38d8f..ba72a7281cb0 100644
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
@@ -64,13 +64,13 @@ struct nc_header { // packed:
64 // all else is optional, and must start with: 64 // all else is optional, and must start with:
65 // __le16 vendorId; // from usb-if 65 // __le16 vendorId; // from usb-if
66 // __le16 productId; 66 // __le16 productId;
67} __attribute__((__packed__)); 67} __packed;
68 68
69#define PAD_BYTE ((unsigned char)0xAC) 69#define PAD_BYTE ((unsigned char)0xAC)
70 70
71struct nc_trailer { 71struct nc_trailer {
72 __le16 packet_id; 72 __le16 packet_id;
73} __attribute__((__packed__)); 73} __packed;
74 74
75// packets may use FLAG_FRAMING_NC and optional pad 75// packets may use FLAG_FRAMING_NC and optional pad
76#define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \ 76#define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 974d17f0263e..6710f09346d6 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -21,11 +21,11 @@
21 * behaves. Pegasus II support added since this version. 21 * behaves. Pegasus II support added since this version.
22 * TODO: suppressing HCD warnings spewage on disconnect. 22 * TODO: suppressing HCD warnings spewage on disconnect.
23 * v0.4.13 Ethernet address is now set at probe(), not at open() 23 * v0.4.13 Ethernet address is now set at probe(), not at open()
24 * time as this seems to break dhcpd. 24 * time as this seems to break dhcpd.
25 * v0.5.0 branch to 2.5.x kernels 25 * v0.5.0 branch to 2.5.x kernels
26 * v0.5.1 ethtool support added 26 * v0.5.1 ethtool support added
27 * v0.5.5 rx socket buffers are in a pool and the their allocation 27 * v0.5.5 rx socket buffers are in a pool and the their allocation
28 * is out of the interrupt routine. 28 * is out of the interrupt routine.
29 */ 29 */
30 30
31#include <linux/sched.h> 31#include <linux/sched.h>
@@ -55,9 +55,9 @@ static const char driver_name[] = "pegasus";
55#define BMSR_MEDIA (BMSR_10HALF | BMSR_10FULL | BMSR_100HALF | \ 55#define BMSR_MEDIA (BMSR_10HALF | BMSR_10FULL | BMSR_100HALF | \
56 BMSR_100FULL | BMSR_ANEGCAPABLE) 56 BMSR_100FULL | BMSR_ANEGCAPABLE)
57 57
58static int loopback = 0; 58static int loopback;
59static int mii_mode = 0; 59static int mii_mode;
60static char *devid=NULL; 60static char *devid;
61 61
62static struct usb_eth_dev usb_dev_id[] = { 62static struct usb_eth_dev usb_dev_id[] = {
63#define PEGASUS_DEV(pn, vid, pid, flags) \ 63#define PEGASUS_DEV(pn, vid, pid, flags) \
@@ -102,8 +102,8 @@ MODULE_PARM_DESC(devid, "The format is: 'DEV_name:VendorID:DeviceID:Flags'");
102 102
103/* use ethtool to change the level for any given device */ 103/* use ethtool to change the level for any given device */
104static int msg_level = -1; 104static int msg_level = -1;
105module_param (msg_level, int, 0); 105module_param(msg_level, int, 0);
106MODULE_PARM_DESC (msg_level, "Override default message level"); 106MODULE_PARM_DESC(msg_level, "Override default message level");
107 107
108MODULE_DEVICE_TABLE(usb, pegasus_ids); 108MODULE_DEVICE_TABLE(usb, pegasus_ids);
109static const struct net_device_ops pegasus_netdev_ops; 109static const struct net_device_ops pegasus_netdev_ops;
@@ -141,7 +141,7 @@ static void ctrl_callback(struct urb *urb)
141 wake_up(&pegasus->ctrl_wait); 141 wake_up(&pegasus->ctrl_wait);
142} 142}
143 143
144static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 144static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size,
145 void *data) 145 void *data)
146{ 146{
147 int ret; 147 int ret;
@@ -196,7 +196,7 @@ out:
196 return ret; 196 return ret;
197} 197}
198 198
199static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 199static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size,
200 void *data) 200 void *data)
201{ 201{
202 int ret; 202 int ret;
@@ -248,7 +248,7 @@ out:
248 return ret; 248 return ret;
249} 249}
250 250
251static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data) 251static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data)
252{ 252{
253 int ret; 253 int ret;
254 char *tmp; 254 char *tmp;
@@ -299,7 +299,7 @@ out:
299 return ret; 299 return ret;
300} 300}
301 301
302static int update_eth_regs_async(pegasus_t * pegasus) 302static int update_eth_regs_async(pegasus_t *pegasus)
303{ 303{
304 int ret; 304 int ret;
305 305
@@ -326,7 +326,7 @@ static int update_eth_regs_async(pegasus_t * pegasus)
326} 326}
327 327
328/* Returns 0 on success, error on failure */ 328/* Returns 0 on success, error on failure */
329static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd) 329static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
330{ 330{
331 int i; 331 int i;
332 __u8 data[4] = { phy, 0, 0, indx }; 332 __u8 data[4] = { phy, 0, 0, indx };
@@ -334,7 +334,7 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd)
334 int ret; 334 int ret;
335 335
336 set_register(pegasus, PhyCtrl, 0); 336 set_register(pegasus, PhyCtrl, 0);
337 set_registers(pegasus, PhyAddr, sizeof (data), data); 337 set_registers(pegasus, PhyAddr, sizeof(data), data);
338 set_register(pegasus, PhyCtrl, (indx | PHY_READ)); 338 set_register(pegasus, PhyCtrl, (indx | PHY_READ));
339 for (i = 0; i < REG_TIMEOUT; i++) { 339 for (i = 0; i < REG_TIMEOUT; i++) {
340 ret = get_registers(pegasus, PhyCtrl, 1, data); 340 ret = get_registers(pegasus, PhyCtrl, 1, data);
@@ -366,7 +366,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int loc)
366 return (int)res; 366 return (int)res;
367} 367}
368 368
369static int write_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 regd) 369static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 regd)
370{ 370{
371 int i; 371 int i;
372 __u8 data[4] = { phy, 0, 0, indx }; 372 __u8 data[4] = { phy, 0, 0, indx };
@@ -402,7 +402,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int val)
402 write_mii_word(pegasus, phy_id, loc, val); 402 write_mii_word(pegasus, phy_id, loc, val);
403} 403}
404 404
405static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata) 405static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata)
406{ 406{
407 int i; 407 int i;
408 __u8 tmp; 408 __u8 tmp;
@@ -433,7 +433,7 @@ fail:
433} 433}
434 434
435#ifdef PEGASUS_WRITE_EEPROM 435#ifdef PEGASUS_WRITE_EEPROM
436static inline void enable_eprom_write(pegasus_t * pegasus) 436static inline void enable_eprom_write(pegasus_t *pegasus)
437{ 437{
438 __u8 tmp; 438 __u8 tmp;
439 int ret; 439 int ret;
@@ -442,7 +442,7 @@ static inline void enable_eprom_write(pegasus_t * pegasus)
442 set_register(pegasus, EthCtrl2, tmp | EPROM_WR_ENABLE); 442 set_register(pegasus, EthCtrl2, tmp | EPROM_WR_ENABLE);
443} 443}
444 444
445static inline void disable_eprom_write(pegasus_t * pegasus) 445static inline void disable_eprom_write(pegasus_t *pegasus)
446{ 446{
447 __u8 tmp; 447 __u8 tmp;
448 int ret; 448 int ret;
@@ -452,7 +452,7 @@ static inline void disable_eprom_write(pegasus_t * pegasus)
452 set_register(pegasus, EthCtrl2, tmp & ~EPROM_WR_ENABLE); 452 set_register(pegasus, EthCtrl2, tmp & ~EPROM_WR_ENABLE);
453} 453}
454 454
455static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data) 455static int write_eprom_word(pegasus_t *pegasus, __u8 index, __u16 data)
456{ 456{
457 int i; 457 int i;
458 __u8 tmp, d[4] = { 0x3f, 0, 0, EPROM_WRITE }; 458 __u8 tmp, d[4] = { 0x3f, 0, 0, EPROM_WRITE };
@@ -484,7 +484,7 @@ fail:
484} 484}
485#endif /* PEGASUS_WRITE_EEPROM */ 485#endif /* PEGASUS_WRITE_EEPROM */
486 486
487static inline void get_node_id(pegasus_t * pegasus, __u8 * id) 487static inline void get_node_id(pegasus_t *pegasus, __u8 *id)
488{ 488{
489 int i; 489 int i;
490 __u16 w16; 490 __u16 w16;
@@ -495,7 +495,7 @@ static inline void get_node_id(pegasus_t * pegasus, __u8 * id)
495 } 495 }
496} 496}
497 497
498static void set_ethernet_addr(pegasus_t * pegasus) 498static void set_ethernet_addr(pegasus_t *pegasus)
499{ 499{
500 __u8 node_id[6]; 500 __u8 node_id[6];
501 501
@@ -503,12 +503,12 @@ static void set_ethernet_addr(pegasus_t * pegasus)
503 get_registers(pegasus, 0x10, sizeof(node_id), node_id); 503 get_registers(pegasus, 0x10, sizeof(node_id), node_id);
504 } else { 504 } else {
505 get_node_id(pegasus, node_id); 505 get_node_id(pegasus, node_id);
506 set_registers(pegasus, EthID, sizeof (node_id), node_id); 506 set_registers(pegasus, EthID, sizeof(node_id), node_id);
507 } 507 }
508 memcpy(pegasus->net->dev_addr, node_id, sizeof (node_id)); 508 memcpy(pegasus->net->dev_addr, node_id, sizeof(node_id));
509} 509}
510 510
511static inline int reset_mac(pegasus_t * pegasus) 511static inline int reset_mac(pegasus_t *pegasus)
512{ 512{
513 __u8 data = 0x8; 513 __u8 data = 0x8;
514 int i; 514 int i;
@@ -563,7 +563,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
563 data[1] = 0; 563 data[1] = 0;
564 data[2] = (loopback & 1) ? 0x09 : 0x01; 564 data[2] = (loopback & 1) ? 0x09 : 0x01;
565 565
566 memcpy(pegasus->eth_regs, data, sizeof (data)); 566 memcpy(pegasus->eth_regs, data, sizeof(data));
567 ret = set_registers(pegasus, EthCtrl0, 3, data); 567 ret = set_registers(pegasus, EthCtrl0, 3, data);
568 568
569 if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS || 569 if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS ||
@@ -577,7 +577,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
577 return ret; 577 return ret;
578} 578}
579 579
580static void fill_skb_pool(pegasus_t * pegasus) 580static void fill_skb_pool(pegasus_t *pegasus)
581{ 581{
582 int i; 582 int i;
583 583
@@ -595,7 +595,7 @@ static void fill_skb_pool(pegasus_t * pegasus)
595 } 595 }
596} 596}
597 597
598static void free_skb_pool(pegasus_t * pegasus) 598static void free_skb_pool(pegasus_t *pegasus)
599{ 599{
600 int i; 600 int i;
601 601
@@ -667,11 +667,11 @@ static void read_bulk_callback(struct urb *urb)
667 netif_dbg(pegasus, rx_err, net, 667 netif_dbg(pegasus, rx_err, net,
668 "RX packet error %x\n", rx_status); 668 "RX packet error %x\n", rx_status);
669 pegasus->stats.rx_errors++; 669 pegasus->stats.rx_errors++;
670 if (rx_status & 0x06) // long or runt 670 if (rx_status & 0x06) /* long or runt */
671 pegasus->stats.rx_length_errors++; 671 pegasus->stats.rx_length_errors++;
672 if (rx_status & 0x08) 672 if (rx_status & 0x08)
673 pegasus->stats.rx_crc_errors++; 673 pegasus->stats.rx_crc_errors++;
674 if (rx_status & 0x10) // extra bits 674 if (rx_status & 0x10) /* extra bits */
675 pegasus->stats.rx_frame_errors++; 675 pegasus->stats.rx_frame_errors++;
676 goto goon; 676 goto goon;
677 } 677 }
@@ -748,9 +748,8 @@ static void rx_fixup(unsigned long data)
748 if (pegasus->flags & PEGASUS_RX_URB_FAIL) 748 if (pegasus->flags & PEGASUS_RX_URB_FAIL)
749 if (pegasus->rx_skb) 749 if (pegasus->rx_skb)
750 goto try_again; 750 goto try_again;
751 if (pegasus->rx_skb == NULL) { 751 if (pegasus->rx_skb == NULL)
752 pegasus->rx_skb = pull_skb(pegasus); 752 pegasus->rx_skb = pull_skb(pegasus);
753 }
754 if (pegasus->rx_skb == NULL) { 753 if (pegasus->rx_skb == NULL) {
755 netif_warn(pegasus, rx_err, pegasus->net, "low on memory\n"); 754 netif_warn(pegasus, rx_err, pegasus->net, "low on memory\n");
756 tasklet_schedule(&pegasus->rx_tl); 755 tasklet_schedule(&pegasus->rx_tl);
@@ -835,7 +834,7 @@ static void intr_callback(struct urb *urb)
835 } 834 }
836 835
837 if (urb->actual_length >= 6) { 836 if (urb->actual_length >= 6) {
838 u8 * d = urb->transfer_buffer; 837 u8 *d = urb->transfer_buffer;
839 838
840 /* byte 0 == tx_status1, reg 2B */ 839 /* byte 0 == tx_status1, reg 2B */
841 if (d[0] & (TX_UNDERRUN|EXCESSIVE_COL 840 if (d[0] & (TX_UNDERRUN|EXCESSIVE_COL
@@ -918,14 +917,14 @@ static struct net_device_stats *pegasus_netdev_stats(struct net_device *dev)
918 return &((pegasus_t *) netdev_priv(dev))->stats; 917 return &((pegasus_t *) netdev_priv(dev))->stats;
919} 918}
920 919
921static inline void disable_net_traffic(pegasus_t * pegasus) 920static inline void disable_net_traffic(pegasus_t *pegasus)
922{ 921{
923 __le16 tmp = cpu_to_le16(0); 922 __le16 tmp = cpu_to_le16(0);
924 923
925 set_registers(pegasus, EthCtrl0, sizeof(tmp), &tmp); 924 set_registers(pegasus, EthCtrl0, sizeof(tmp), &tmp);
926} 925}
927 926
928static inline void get_interrupt_interval(pegasus_t * pegasus) 927static inline void get_interrupt_interval(pegasus_t *pegasus)
929{ 928{
930 u16 data; 929 u16 data;
931 u8 interval; 930 u8 interval;
@@ -961,7 +960,7 @@ static void set_carrier(struct net_device *net)
961 netif_carrier_off(net); 960 netif_carrier_off(net);
962} 961}
963 962
964static void free_all_urbs(pegasus_t * pegasus) 963static void free_all_urbs(pegasus_t *pegasus)
965{ 964{
966 usb_free_urb(pegasus->intr_urb); 965 usb_free_urb(pegasus->intr_urb);
967 usb_free_urb(pegasus->tx_urb); 966 usb_free_urb(pegasus->tx_urb);
@@ -969,7 +968,7 @@ static void free_all_urbs(pegasus_t * pegasus)
969 usb_free_urb(pegasus->ctrl_urb); 968 usb_free_urb(pegasus->ctrl_urb);
970} 969}
971 970
972static void unlink_all_urbs(pegasus_t * pegasus) 971static void unlink_all_urbs(pegasus_t *pegasus)
973{ 972{
974 usb_kill_urb(pegasus->intr_urb); 973 usb_kill_urb(pegasus->intr_urb);
975 usb_kill_urb(pegasus->tx_urb); 974 usb_kill_urb(pegasus->tx_urb);
@@ -977,12 +976,11 @@ static void unlink_all_urbs(pegasus_t * pegasus)
977 usb_kill_urb(pegasus->ctrl_urb); 976 usb_kill_urb(pegasus->ctrl_urb);
978} 977}
979 978
980static int alloc_urbs(pegasus_t * pegasus) 979static int alloc_urbs(pegasus_t *pegasus)
981{ 980{
982 pegasus->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL); 981 pegasus->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
983 if (!pegasus->ctrl_urb) { 982 if (!pegasus->ctrl_urb)
984 return 0; 983 return 0;
985 }
986 pegasus->rx_urb = usb_alloc_urb(0, GFP_KERNEL); 984 pegasus->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
987 if (!pegasus->rx_urb) { 985 if (!pegasus->rx_urb) {
988 usb_free_urb(pegasus->ctrl_urb); 986 usb_free_urb(pegasus->ctrl_urb);
@@ -1019,7 +1017,7 @@ static int pegasus_open(struct net_device *net)
1019 return -ENOMEM; 1017 return -ENOMEM;
1020 1018
1021 res = set_registers(pegasus, EthID, 6, net->dev_addr); 1019 res = set_registers(pegasus, EthID, 6, net->dev_addr);
1022 1020
1023 usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, 1021 usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
1024 usb_rcvbulkpipe(pegasus->usb, 1), 1022 usb_rcvbulkpipe(pegasus->usb, 1),
1025 pegasus->rx_skb->data, PEGASUS_MTU + 8, 1023 pegasus->rx_skb->data, PEGASUS_MTU + 8,
@@ -1033,7 +1031,7 @@ static int pegasus_open(struct net_device *net)
1033 1031
1034 usb_fill_int_urb(pegasus->intr_urb, pegasus->usb, 1032 usb_fill_int_urb(pegasus->intr_urb, pegasus->usb,
1035 usb_rcvintpipe(pegasus->usb, 3), 1033 usb_rcvintpipe(pegasus->usb, 3),
1036 pegasus->intr_buff, sizeof (pegasus->intr_buff), 1034 pegasus->intr_buff, sizeof(pegasus->intr_buff),
1037 intr_callback, pegasus, pegasus->intr_interval); 1035 intr_callback, pegasus, pegasus->intr_interval);
1038 if ((res = usb_submit_urb(pegasus->intr_urb, GFP_KERNEL))) { 1036 if ((res = usb_submit_urb(pegasus->intr_urb, GFP_KERNEL))) {
1039 if (res == -ENODEV) 1037 if (res == -ENODEV)
@@ -1076,9 +1074,9 @@ static void pegasus_get_drvinfo(struct net_device *dev,
1076 struct ethtool_drvinfo *info) 1074 struct ethtool_drvinfo *info)
1077{ 1075{
1078 pegasus_t *pegasus = netdev_priv(dev); 1076 pegasus_t *pegasus = netdev_priv(dev);
1079 strncpy(info->driver, driver_name, sizeof (info->driver) - 1); 1077 strncpy(info->driver, driver_name, sizeof(info->driver) - 1);
1080 strncpy(info->version, DRIVER_VERSION, sizeof (info->version) - 1); 1078 strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1);
1081 usb_make_path(pegasus->usb, info->bus_info, sizeof (info->bus_info)); 1079 usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info));
1082} 1080}
1083 1081
1084/* also handles three patterns of some kind in hardware */ 1082/* also handles three patterns of some kind in hardware */
@@ -1098,7 +1096,7 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
1098{ 1096{
1099 pegasus_t *pegasus = netdev_priv(dev); 1097 pegasus_t *pegasus = netdev_priv(dev);
1100 u8 reg78 = 0x04; 1098 u8 reg78 = 0x04;
1101 1099
1102 if (wol->wolopts & ~WOL_SUPPORTED) 1100 if (wol->wolopts & ~WOL_SUPPORTED)
1103 return -EINVAL; 1101 return -EINVAL;
1104 1102
@@ -1118,7 +1116,7 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
1118static inline void pegasus_reset_wol(struct net_device *dev) 1116static inline void pegasus_reset_wol(struct net_device *dev)
1119{ 1117{
1120 struct ethtool_wolinfo wol; 1118 struct ethtool_wolinfo wol;
1121 1119
1122 memset(&wol, 0, sizeof wol); 1120 memset(&wol, 0, sizeof wol);
1123 (void) pegasus_set_wol(dev, &wol); 1121 (void) pegasus_set_wol(dev, &wol);
1124} 1122}
@@ -1178,7 +1176,7 @@ static const struct ethtool_ops ops = {
1178 1176
1179static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd) 1177static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
1180{ 1178{
1181 __u16 *data = (__u16 *) & rq->ifr_ifru; 1179 __u16 *data = (__u16 *) &rq->ifr_ifru;
1182 pegasus_t *pegasus = netdev_priv(net); 1180 pegasus_t *pegasus = netdev_priv(net);
1183 int res; 1181 int res;
1184 1182
@@ -1223,7 +1221,7 @@ static void pegasus_set_multicast(struct net_device *net)
1223 ctrl_callback(pegasus->ctrl_urb); 1221 ctrl_callback(pegasus->ctrl_urb);
1224} 1222}
1225 1223
1226static __u8 mii_phy_probe(pegasus_t * pegasus) 1224static __u8 mii_phy_probe(pegasus_t *pegasus)
1227{ 1225{
1228 int i; 1226 int i;
1229 __u16 tmp; 1227 __u16 tmp;
@@ -1239,10 +1237,10 @@ static __u8 mii_phy_probe(pegasus_t * pegasus)
1239 return 0xff; 1237 return 0xff;
1240} 1238}
1241 1239
1242static inline void setup_pegasus_II(pegasus_t * pegasus) 1240static inline void setup_pegasus_II(pegasus_t *pegasus)
1243{ 1241{
1244 __u8 data = 0xa5; 1242 __u8 data = 0xa5;
1245 1243
1246 set_register(pegasus, Reg1d, 0); 1244 set_register(pegasus, Reg1d, 0);
1247 set_register(pegasus, Reg7b, 1); 1245 set_register(pegasus, Reg7b, 1);
1248 mdelay(100); 1246 mdelay(100);
@@ -1254,16 +1252,15 @@ static inline void setup_pegasus_II(pegasus_t * pegasus)
1254 set_register(pegasus, 0x83, data); 1252 set_register(pegasus, 0x83, data);
1255 get_registers(pegasus, 0x83, 1, &data); 1253 get_registers(pegasus, 0x83, 1, &data);
1256 1254
1257 if (data == 0xa5) { 1255 if (data == 0xa5)
1258 pegasus->chip = 0x8513; 1256 pegasus->chip = 0x8513;
1259 } else { 1257 else
1260 pegasus->chip = 0; 1258 pegasus->chip = 0;
1261 }
1262 1259
1263 set_register(pegasus, 0x80, 0xc0); 1260 set_register(pegasus, 0x80, 0xc0);
1264 set_register(pegasus, 0x83, 0xff); 1261 set_register(pegasus, 0x83, 0xff);
1265 set_register(pegasus, 0x84, 0x01); 1262 set_register(pegasus, 0x84, 0x01);
1266 1263
1267 if (pegasus->features & HAS_HOME_PNA && mii_mode) 1264 if (pegasus->features & HAS_HOME_PNA && mii_mode)
1268 set_register(pegasus, Reg81, 6); 1265 set_register(pegasus, Reg81, 6);
1269 else 1266 else
@@ -1272,7 +1269,7 @@ static inline void setup_pegasus_II(pegasus_t * pegasus)
1272 1269
1273 1270
1274static int pegasus_count; 1271static int pegasus_count;
1275static struct workqueue_struct *pegasus_workqueue = NULL; 1272static struct workqueue_struct *pegasus_workqueue;
1276#define CARRIER_CHECK_DELAY (2 * HZ) 1273#define CARRIER_CHECK_DELAY (2 * HZ)
1277 1274
1278static void check_carrier(struct work_struct *work) 1275static void check_carrier(struct work_struct *work)
@@ -1367,7 +1364,7 @@ static int pegasus_probe(struct usb_interface *intf,
1367 pegasus->mii.phy_id_mask = 0x1f; 1364 pegasus->mii.phy_id_mask = 0x1f;
1368 pegasus->mii.reg_num_mask = 0x1f; 1365 pegasus->mii.reg_num_mask = 0x1f;
1369 spin_lock_init(&pegasus->rx_pool_lock); 1366 spin_lock_init(&pegasus->rx_pool_lock);
1370 pegasus->msg_enable = netif_msg_init (msg_level, NETIF_MSG_DRV 1367 pegasus->msg_enable = netif_msg_init(msg_level, NETIF_MSG_DRV
1371 | NETIF_MSG_PROBE | NETIF_MSG_LINK); 1368 | NETIF_MSG_PROBE | NETIF_MSG_LINK);
1372 1369
1373 pegasus->features = usb_dev_id[dev_index].private; 1370 pegasus->features = usb_dev_id[dev_index].private;
@@ -1442,11 +1439,11 @@ static void pegasus_disconnect(struct usb_interface *intf)
1442 pegasus_dec_workqueue(); 1439 pegasus_dec_workqueue();
1443} 1440}
1444 1441
1445static int pegasus_suspend (struct usb_interface *intf, pm_message_t message) 1442static int pegasus_suspend(struct usb_interface *intf, pm_message_t message)
1446{ 1443{
1447 struct pegasus *pegasus = usb_get_intfdata(intf); 1444 struct pegasus *pegasus = usb_get_intfdata(intf);
1448 1445
1449 netif_device_detach (pegasus->net); 1446 netif_device_detach(pegasus->net);
1450 cancel_delayed_work(&pegasus->carrier_check); 1447 cancel_delayed_work(&pegasus->carrier_check);
1451 if (netif_running(pegasus->net)) { 1448 if (netif_running(pegasus->net)) {
1452 usb_kill_urb(pegasus->rx_urb); 1449 usb_kill_urb(pegasus->rx_urb);
@@ -1455,11 +1452,11 @@ static int pegasus_suspend (struct usb_interface *intf, pm_message_t message)
1455 return 0; 1452 return 0;
1456} 1453}
1457 1454
1458static int pegasus_resume (struct usb_interface *intf) 1455static int pegasus_resume(struct usb_interface *intf)
1459{ 1456{
1460 struct pegasus *pegasus = usb_get_intfdata(intf); 1457 struct pegasus *pegasus = usb_get_intfdata(intf);
1461 1458
1462 netif_device_attach (pegasus->net); 1459 netif_device_attach(pegasus->net);
1463 if (netif_running(pegasus->net)) { 1460 if (netif_running(pegasus->net)) {
1464 pegasus->rx_urb->status = 0; 1461 pegasus->rx_urb->status = 0;
1465 pegasus->rx_urb->actual_length = 0; 1462 pegasus->rx_urb->actual_length = 0;
@@ -1498,8 +1495,8 @@ static struct usb_driver pegasus_driver = {
1498 1495
1499static void __init parse_id(char *id) 1496static void __init parse_id(char *id)
1500{ 1497{
1501 unsigned int vendor_id=0, device_id=0, flags=0, i=0; 1498 unsigned int vendor_id = 0, device_id = 0, flags = 0, i = 0;
1502 char *token, *name=NULL; 1499 char *token, *name = NULL;
1503 1500
1504 if ((token = strsep(&id, ":")) != NULL) 1501 if ((token = strsep(&id, ":")) != NULL)
1505 name = token; 1502 name = token;
@@ -1510,14 +1507,14 @@ static void __init parse_id(char *id)
1510 device_id = simple_strtoul(token, NULL, 16); 1507 device_id = simple_strtoul(token, NULL, 16);
1511 flags = simple_strtoul(id, NULL, 16); 1508 flags = simple_strtoul(id, NULL, 16);
1512 pr_info("%s: new device %s, vendor ID 0x%04x, device ID 0x%04x, flags: 0x%x\n", 1509 pr_info("%s: new device %s, vendor ID 0x%04x, device ID 0x%04x, flags: 0x%x\n",
1513 driver_name, name, vendor_id, device_id, flags); 1510 driver_name, name, vendor_id, device_id, flags);
1514 1511
1515 if (vendor_id > 0x10000 || vendor_id == 0) 1512 if (vendor_id > 0x10000 || vendor_id == 0)
1516 return; 1513 return;
1517 if (device_id > 0x10000 || device_id == 0) 1514 if (device_id > 0x10000 || device_id == 0)
1518 return; 1515 return;
1519 1516
1520 for (i=0; usb_dev_id[i].name; i++); 1517 for (i = 0; usb_dev_id[i].name; i++);
1521 usb_dev_id[i].name = name; 1518 usb_dev_id[i].name = name;
1522 usb_dev_id[i].vendor = vendor_id; 1519 usb_dev_id[i].vendor = vendor_id;
1523 usb_dev_id[i].device = device_id; 1520 usb_dev_id[i].device = device_id;
diff --git a/drivers/net/usb/pegasus.h b/drivers/net/usb/pegasus.h
index 29f5211e645b..65b78b35b73c 100644
--- a/drivers/net/usb/pegasus.h
+++ b/drivers/net/usb/pegasus.h
@@ -68,7 +68,7 @@ enum pegasus_registers {
68 EpromData = 0x21, /* 0x21 low, 0x22 high byte */ 68 EpromData = 0x21, /* 0x21 low, 0x22 high byte */
69 EpromCtrl = 0x23, 69 EpromCtrl = 0x23,
70 PhyAddr = 0x25, 70 PhyAddr = 0x25,
71 PhyData = 0x26, /* 0x26 low, 0x27 high byte */ 71 PhyData = 0x26, /* 0x26 low, 0x27 high byte */
72 PhyCtrl = 0x28, 72 PhyCtrl = 0x28,
73 UsbStst = 0x2a, 73 UsbStst = 0x2a,
74 EthTxStat0 = 0x2b, 74 EthTxStat0 = 0x2b,
@@ -154,162 +154,162 @@ struct usb_eth_dev {
154 154
155#else /* PEGASUS_DEV */ 155#else /* PEGASUS_DEV */
156 156
157PEGASUS_DEV( "3Com USB Ethernet 3C460B", VENDOR_3COM, 0x4601, 157PEGASUS_DEV("3Com USB Ethernet 3C460B", VENDOR_3COM, 0x4601,
158 DEFAULT_GPIO_RESET | PEGASUS_II ) 158 DEFAULT_GPIO_RESET | PEGASUS_II)
159PEGASUS_DEV( "ATEN USB Ethernet UC-110T", VENDOR_ATEN, 0x2007, 159PEGASUS_DEV("ATEN USB Ethernet UC-110T", VENDOR_ATEN, 0x2007,
160 DEFAULT_GPIO_RESET | PEGASUS_II ) 160 DEFAULT_GPIO_RESET | PEGASUS_II)
161PEGASUS_DEV( "USB HPNA/Ethernet", VENDOR_ABOCOM, 0x110c, 161PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x110c,
162 DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA ) 162 DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
163PEGASUS_DEV( "USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4104, 163PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4104,
164 DEFAULT_GPIO_RESET | HAS_HOME_PNA ) 164 DEFAULT_GPIO_RESET | HAS_HOME_PNA)
165PEGASUS_DEV( "USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4004, 165PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4004,
166 DEFAULT_GPIO_RESET | HAS_HOME_PNA ) 166 DEFAULT_GPIO_RESET | HAS_HOME_PNA)
167PEGASUS_DEV( "USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4007, 167PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4007,
168 DEFAULT_GPIO_RESET | HAS_HOME_PNA ) 168 DEFAULT_GPIO_RESET | HAS_HOME_PNA)
169PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4102, 169PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4102,
170 DEFAULT_GPIO_RESET | PEGASUS_II ) 170 DEFAULT_GPIO_RESET | PEGASUS_II)
171PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4002, 171PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4002,
172 DEFAULT_GPIO_RESET ) 172 DEFAULT_GPIO_RESET)
173PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400b, 173PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400b,
174 DEFAULT_GPIO_RESET | PEGASUS_II ) 174 DEFAULT_GPIO_RESET | PEGASUS_II)
175PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400c, 175PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400c,
176 DEFAULT_GPIO_RESET | PEGASUS_II ) 176 DEFAULT_GPIO_RESET | PEGASUS_II)
177PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0xabc1, 177PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0xabc1,
178 DEFAULT_GPIO_RESET ) 178 DEFAULT_GPIO_RESET)
179PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x200c, 179PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x200c,
180 DEFAULT_GPIO_RESET | PEGASUS_II ) 180 DEFAULT_GPIO_RESET | PEGASUS_II)
181PEGASUS_DEV( "Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046, 181PEGASUS_DEV("Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046,
182 DEFAULT_GPIO_RESET ) 182 DEFAULT_GPIO_RESET)
183PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046, 183PEGASUS_DEV("SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046,
184 DEFAULT_GPIO_RESET | PEGASUS_II ) 184 DEFAULT_GPIO_RESET | PEGASUS_II)
185PEGASUS_DEV( "Philips USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004, 185PEGASUS_DEV("Philips USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004,
186 DEFAULT_GPIO_RESET | PEGASUS_II ) 186 DEFAULT_GPIO_RESET | PEGASUS_II)
187PEGASUS_DEV( "ADMtek ADM8511 \"Pegasus II\" USB Ethernet", 187PEGASUS_DEV("ADMtek ADM8511 \"Pegasus II\" USB Ethernet",
188 VENDOR_ADMTEK, 0x8511, 188 VENDOR_ADMTEK, 0x8511,
189 DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA ) 189 DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
190PEGASUS_DEV( "ADMtek ADM8513 \"Pegasus II\" USB Ethernet", 190PEGASUS_DEV("ADMtek ADM8513 \"Pegasus II\" USB Ethernet",
191 VENDOR_ADMTEK, 0x8513, 191 VENDOR_ADMTEK, 0x8513,
192 DEFAULT_GPIO_RESET | PEGASUS_II ) 192 DEFAULT_GPIO_RESET | PEGASUS_II)
193PEGASUS_DEV( "ADMtek ADM8515 \"Pegasus II\" USB-2.0 Ethernet", 193PEGASUS_DEV("ADMtek ADM8515 \"Pegasus II\" USB-2.0 Ethernet",
194 VENDOR_ADMTEK, 0x8515, 194 VENDOR_ADMTEK, 0x8515,
195 DEFAULT_GPIO_RESET | PEGASUS_II ) 195 DEFAULT_GPIO_RESET | PEGASUS_II)
196PEGASUS_DEV( "ADMtek AN986 \"Pegasus\" USB Ethernet (evaluation board)", 196PEGASUS_DEV("ADMtek AN986 \"Pegasus\" USB Ethernet (evaluation board)",
197 VENDOR_ADMTEK, 0x0986, 197 VENDOR_ADMTEK, 0x0986,
198 DEFAULT_GPIO_RESET | HAS_HOME_PNA ) 198 DEFAULT_GPIO_RESET | HAS_HOME_PNA)
199PEGASUS_DEV( "AN986A USB MAC", VENDOR_ADMTEK, 1986, 199PEGASUS_DEV("AN986A USB MAC", VENDOR_ADMTEK, 1986,
200 DEFAULT_GPIO_RESET | PEGASUS_II ) 200 DEFAULT_GPIO_RESET | PEGASUS_II)
201PEGASUS_DEV( "AEI USB Fast Ethernet Adapter", VENDOR_AEILAB, 0x1701, 201PEGASUS_DEV("AEI USB Fast Ethernet Adapter", VENDOR_AEILAB, 0x1701,
202 DEFAULT_GPIO_RESET | PEGASUS_II ) 202 DEFAULT_GPIO_RESET | PEGASUS_II)
203PEGASUS_DEV( "Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100, 203PEGASUS_DEV("Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100,
204 DEFAULT_GPIO_RESET | PEGASUS_II ) 204 DEFAULT_GPIO_RESET | PEGASUS_II)
205/* 205/*
206 * Distinguish between this Belkin adaptor and the Belkin bluetooth adaptors 206 * Distinguish between this Belkin adaptor and the Belkin bluetooth adaptors
207 * with the same product IDs by checking the device class too. 207 * with the same product IDs by checking the device class too.
208 */ 208 */
209PEGASUS_DEV_CLASS( "Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00, 209PEGASUS_DEV_CLASS("Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00,
210 DEFAULT_GPIO_RESET | PEGASUS_II ) 210 DEFAULT_GPIO_RESET | PEGASUS_II)
211PEGASUS_DEV( "Belkin F5U122 10/100 USB Ethernet", VENDOR_BELKIN, 0x0122, 211PEGASUS_DEV("Belkin F5U122 10/100 USB Ethernet", VENDOR_BELKIN, 0x0122,
212 DEFAULT_GPIO_RESET | PEGASUS_II ) 212 DEFAULT_GPIO_RESET | PEGASUS_II)
213PEGASUS_DEV( "Billionton USB-100", VENDOR_BILLIONTON, 0x0986, 213PEGASUS_DEV("Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
214 DEFAULT_GPIO_RESET ) 214 DEFAULT_GPIO_RESET)
215PEGASUS_DEV( "Billionton USBLP-100", VENDOR_BILLIONTON, 0x0987, 215PEGASUS_DEV("Billionton USBLP-100", VENDOR_BILLIONTON, 0x0987,
216 DEFAULT_GPIO_RESET | HAS_HOME_PNA ) 216 DEFAULT_GPIO_RESET | HAS_HOME_PNA)
217PEGASUS_DEV( "iPAQ Networking 10/100 USB", VENDOR_COMPAQ, 0x8511, 217PEGASUS_DEV("iPAQ Networking 10/100 USB", VENDOR_COMPAQ, 0x8511,
218 DEFAULT_GPIO_RESET | PEGASUS_II ) 218 DEFAULT_GPIO_RESET | PEGASUS_II)
219PEGASUS_DEV( "Billionton USBEL-100", VENDOR_BILLIONTON, 0x0988, 219PEGASUS_DEV("Billionton USBEL-100", VENDOR_BILLIONTON, 0x0988,
220 DEFAULT_GPIO_RESET ) 220 DEFAULT_GPIO_RESET)
221PEGASUS_DEV( "Billionton USBE-100", VENDOR_BILLIONTON, 0x8511, 221PEGASUS_DEV("Billionton USBE-100", VENDOR_BILLIONTON, 0x8511,
222 DEFAULT_GPIO_RESET | PEGASUS_II ) 222 DEFAULT_GPIO_RESET | PEGASUS_II)
223PEGASUS_DEV( "Corega FEther USB-TX", VENDOR_COREGA, 0x0004, 223PEGASUS_DEV("Corega FEther USB-TX", VENDOR_COREGA, 0x0004,
224 DEFAULT_GPIO_RESET ) 224 DEFAULT_GPIO_RESET)
225PEGASUS_DEV( "Corega FEther USB-TXS", VENDOR_COREGA, 0x000d, 225PEGASUS_DEV("Corega FEther USB-TXS", VENDOR_COREGA, 0x000d,
226 DEFAULT_GPIO_RESET | PEGASUS_II ) 226 DEFAULT_GPIO_RESET | PEGASUS_II)
227PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4001, 227PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4001,
228 DEFAULT_GPIO_RESET ) 228 DEFAULT_GPIO_RESET)
229PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4002, 229PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4002,
230 DEFAULT_GPIO_RESET ) 230 DEFAULT_GPIO_RESET)
231PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4102, 231PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4102,
232 DEFAULT_GPIO_RESET | PEGASUS_II ) 232 DEFAULT_GPIO_RESET | PEGASUS_II)
233PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x400b, 233PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x400b,
234 DEFAULT_GPIO_RESET | PEGASUS_II ) 234 DEFAULT_GPIO_RESET | PEGASUS_II)
235PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x200c, 235PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x200c,
236 DEFAULT_GPIO_RESET | PEGASUS_II ) 236 DEFAULT_GPIO_RESET | PEGASUS_II)
237PEGASUS_DEV( "D-Link DSB-650TX(PNA)", VENDOR_DLINK, 0x4003, 237PEGASUS_DEV("D-Link DSB-650TX(PNA)", VENDOR_DLINK, 0x4003,
238 DEFAULT_GPIO_RESET | HAS_HOME_PNA ) 238 DEFAULT_GPIO_RESET | HAS_HOME_PNA)
239PEGASUS_DEV( "D-Link DSB-650", VENDOR_DLINK, 0xabc1, 239PEGASUS_DEV("D-Link DSB-650", VENDOR_DLINK, 0xabc1,
240 DEFAULT_GPIO_RESET ) 240 DEFAULT_GPIO_RESET)
241PEGASUS_DEV( "GOLDPFEIL USB Adapter", VENDOR_ELCON, 0x0002, 241PEGASUS_DEV("GOLDPFEIL USB Adapter", VENDOR_ELCON, 0x0002,
242 DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA ) 242 DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
243PEGASUS_DEV( "ELECOM USB Ethernet LD-USB20", VENDOR_ELECOM, 0x4010, 243PEGASUS_DEV("ELECOM USB Ethernet LD-USB20", VENDOR_ELECOM, 0x4010,
244 DEFAULT_GPIO_RESET | PEGASUS_II ) 244 DEFAULT_GPIO_RESET | PEGASUS_II)
245PEGASUS_DEV( "EasiDock Ethernet", VENDOR_MOBILITY, 0x0304, 245PEGASUS_DEV("EasiDock Ethernet", VENDOR_MOBILITY, 0x0304,
246 DEFAULT_GPIO_RESET ) 246 DEFAULT_GPIO_RESET)
247PEGASUS_DEV( "Elsa Micolink USB2Ethernet", VENDOR_ELSA, 0x3000, 247PEGASUS_DEV("Elsa Micolink USB2Ethernet", VENDOR_ELSA, 0x3000,
248 DEFAULT_GPIO_RESET )
249PEGASUS_DEV( "GIGABYTE GN-BR402W Wireless Router", VENDOR_GIGABYTE, 0x8002,
250 DEFAULT_GPIO_RESET )
251PEGASUS_DEV( "Hawking UF100 10/100 Ethernet", VENDOR_HAWKING, 0x400c,
252 DEFAULT_GPIO_RESET | PEGASUS_II )
253PEGASUS_DEV( "HP hn210c Ethernet USB", VENDOR_HP, 0x811c,
254 DEFAULT_GPIO_RESET | PEGASUS_II )
255PEGASUS_DEV( "IO DATA USB ET/TX", VENDOR_IODATA, 0x0904,
256 DEFAULT_GPIO_RESET )
257PEGASUS_DEV( "IO DATA USB ET/TX-S", VENDOR_IODATA, 0x0913,
258 DEFAULT_GPIO_RESET | PEGASUS_II )
259PEGASUS_DEV( "IO DATA USB ETX-US2", VENDOR_IODATA, 0x093a,
260 DEFAULT_GPIO_RESET | PEGASUS_II )
261PEGASUS_DEV( "Kingston KNU101TX Ethernet", VENDOR_KINGSTON, 0x000a,
262 DEFAULT_GPIO_RESET) 248 DEFAULT_GPIO_RESET)
263PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x4002, 249PEGASUS_DEV("GIGABYTE GN-BR402W Wireless Router", VENDOR_GIGABYTE, 0x8002,
264 DEFAULT_GPIO_RESET ) 250 DEFAULT_GPIO_RESET)
265PEGASUS_DEV( "LANEED USB Ethernet LD-USBL/TX", VENDOR_LANEED, 0x4005, 251PEGASUS_DEV("Hawking UF100 10/100 Ethernet", VENDOR_HAWKING, 0x400c,
266 DEFAULT_GPIO_RESET | PEGASUS_II) 252 DEFAULT_GPIO_RESET | PEGASUS_II)
267PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x400b, 253PEGASUS_DEV("HP hn210c Ethernet USB", VENDOR_HP, 0x811c,
268 DEFAULT_GPIO_RESET | PEGASUS_II ) 254 DEFAULT_GPIO_RESET | PEGASUS_II)
269PEGASUS_DEV( "LANEED USB Ethernet LD-USB/T", VENDOR_LANEED, 0xabc1, 255PEGASUS_DEV("IO DATA USB ET/TX", VENDOR_IODATA, 0x0904,
270 DEFAULT_GPIO_RESET ) 256 DEFAULT_GPIO_RESET)
271PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x200c, 257PEGASUS_DEV("IO DATA USB ET/TX-S", VENDOR_IODATA, 0x0913,
272 DEFAULT_GPIO_RESET | PEGASUS_II ) 258 DEFAULT_GPIO_RESET | PEGASUS_II)
273PEGASUS_DEV( "Linksys USB10TX", VENDOR_LINKSYS, 0x2202, 259PEGASUS_DEV("IO DATA USB ETX-US2", VENDOR_IODATA, 0x093a,
274 DEFAULT_GPIO_RESET ) 260 DEFAULT_GPIO_RESET | PEGASUS_II)
275PEGASUS_DEV( "Linksys USB100TX", VENDOR_LINKSYS, 0x2203, 261PEGASUS_DEV("Kingston KNU101TX Ethernet", VENDOR_KINGSTON, 0x000a,
276 DEFAULT_GPIO_RESET ) 262 DEFAULT_GPIO_RESET)
277PEGASUS_DEV( "Linksys USB100TX", VENDOR_LINKSYS, 0x2204, 263PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x4002,
278 DEFAULT_GPIO_RESET | HAS_HOME_PNA ) 264 DEFAULT_GPIO_RESET)
279PEGASUS_DEV( "Linksys USB10T Ethernet Adapter", VENDOR_LINKSYS, 0x2206, 265PEGASUS_DEV("LANEED USB Ethernet LD-USBL/TX", VENDOR_LANEED, 0x4005,
280 DEFAULT_GPIO_RESET | PEGASUS_II) 266 DEFAULT_GPIO_RESET | PEGASUS_II)
281PEGASUS_DEV( "Linksys USBVPN1", VENDOR_LINKSYS2, 0x08b4, 267PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x400b,
282 DEFAULT_GPIO_RESET ) 268 DEFAULT_GPIO_RESET | PEGASUS_II)
283PEGASUS_DEV( "Linksys USB USB100TX", VENDOR_LINKSYS, 0x400b, 269PEGASUS_DEV("LANEED USB Ethernet LD-USB/T", VENDOR_LANEED, 0xabc1,
284 DEFAULT_GPIO_RESET | PEGASUS_II ) 270 DEFAULT_GPIO_RESET)
285PEGASUS_DEV( "Linksys USB10TX", VENDOR_LINKSYS, 0x200c, 271PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x200c,
286 DEFAULT_GPIO_RESET | PEGASUS_II ) 272 DEFAULT_GPIO_RESET | PEGASUS_II)
287PEGASUS_DEV( "MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0001, 273PEGASUS_DEV("Linksys USB10TX", VENDOR_LINKSYS, 0x2202,
288 DEFAULT_GPIO_RESET ) 274 DEFAULT_GPIO_RESET)
289PEGASUS_DEV( "MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0005, 275PEGASUS_DEV("Linksys USB100TX", VENDOR_LINKSYS, 0x2203,
290 DEFAULT_GPIO_RESET ) 276 DEFAULT_GPIO_RESET)
291PEGASUS_DEV( "MELCO/BUFFALO LUA2-TX", VENDOR_MELCO, 0x0009, 277PEGASUS_DEV("Linksys USB100TX", VENDOR_LINKSYS, 0x2204,
292 DEFAULT_GPIO_RESET | PEGASUS_II ) 278 DEFAULT_GPIO_RESET | HAS_HOME_PNA)
293PEGASUS_DEV( "Microsoft MN-110", VENDOR_MICROSOFT, 0x007a, 279PEGASUS_DEV("Linksys USB10T Ethernet Adapter", VENDOR_LINKSYS, 0x2206,
294 DEFAULT_GPIO_RESET | PEGASUS_II ) 280 DEFAULT_GPIO_RESET | PEGASUS_II)
295PEGASUS_DEV( "NETGEAR FA101", VENDOR_NETGEAR, 0x1020, 281PEGASUS_DEV("Linksys USBVPN1", VENDOR_LINKSYS2, 0x08b4,
296 DEFAULT_GPIO_RESET | PEGASUS_II ) 282 DEFAULT_GPIO_RESET)
297PEGASUS_DEV( "OCT Inc.", VENDOR_OCT, 0x0109, 283PEGASUS_DEV("Linksys USB USB100TX", VENDOR_LINKSYS, 0x400b,
298 DEFAULT_GPIO_RESET | PEGASUS_II ) 284 DEFAULT_GPIO_RESET | PEGASUS_II)
299PEGASUS_DEV( "OCT USB TO Ethernet", VENDOR_OCT, 0x0901, 285PEGASUS_DEV("Linksys USB10TX", VENDOR_LINKSYS, 0x200c,
300 DEFAULT_GPIO_RESET | PEGASUS_II ) 286 DEFAULT_GPIO_RESET | PEGASUS_II)
301PEGASUS_DEV( "smartNIC 2 PnP Adapter", VENDOR_SMARTBRIDGES, 0x0003, 287PEGASUS_DEV("MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0001,
302 DEFAULT_GPIO_RESET | PEGASUS_II ) 288 DEFAULT_GPIO_RESET)
303PEGASUS_DEV( "SMC 202 USB Ethernet", VENDOR_SMC, 0x0200, 289PEGASUS_DEV("MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0005,
304 DEFAULT_GPIO_RESET ) 290 DEFAULT_GPIO_RESET)
305PEGASUS_DEV( "SMC 2206 USB Ethernet", VENDOR_SMC, 0x0201, 291PEGASUS_DEV("MELCO/BUFFALO LUA2-TX", VENDOR_MELCO, 0x0009,
306 DEFAULT_GPIO_RESET | PEGASUS_II) 292 DEFAULT_GPIO_RESET | PEGASUS_II)
307PEGASUS_DEV( "SOHOware NUB100 Ethernet", VENDOR_SOHOWARE, 0x9100, 293PEGASUS_DEV("Microsoft MN-110", VENDOR_MICROSOFT, 0x007a,
308 DEFAULT_GPIO_RESET ) 294 DEFAULT_GPIO_RESET | PEGASUS_II)
309PEGASUS_DEV( "SOHOware NUB110 Ethernet", VENDOR_SOHOWARE, 0x9110, 295PEGASUS_DEV("NETGEAR FA101", VENDOR_NETGEAR, 0x1020,
310 DEFAULT_GPIO_RESET | PEGASUS_II ) 296 DEFAULT_GPIO_RESET | PEGASUS_II)
311PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_SIEMENS, 0x1001, 297PEGASUS_DEV("OCT Inc.", VENDOR_OCT, 0x0109,
312 DEFAULT_GPIO_RESET | PEGASUS_II ) 298 DEFAULT_GPIO_RESET | PEGASUS_II)
299PEGASUS_DEV("OCT USB TO Ethernet", VENDOR_OCT, 0x0901,
300 DEFAULT_GPIO_RESET | PEGASUS_II)
301PEGASUS_DEV("smartNIC 2 PnP Adapter", VENDOR_SMARTBRIDGES, 0x0003,
302 DEFAULT_GPIO_RESET | PEGASUS_II)
303PEGASUS_DEV("SMC 202 USB Ethernet", VENDOR_SMC, 0x0200,
304 DEFAULT_GPIO_RESET)
305PEGASUS_DEV("SMC 2206 USB Ethernet", VENDOR_SMC, 0x0201,
306 DEFAULT_GPIO_RESET | PEGASUS_II)
307PEGASUS_DEV("SOHOware NUB100 Ethernet", VENDOR_SOHOWARE, 0x9100,
308 DEFAULT_GPIO_RESET)
309PEGASUS_DEV("SOHOware NUB110 Ethernet", VENDOR_SOHOWARE, 0x9110,
310 DEFAULT_GPIO_RESET | PEGASUS_II)
311PEGASUS_DEV("SpeedStream USB 10/100 Ethernet", VENDOR_SIEMENS, 0x1001,
312 DEFAULT_GPIO_RESET | PEGASUS_II)
313 313
314 314
315#endif /* PEGASUS_DEV */ 315#endif /* PEGASUS_DEV */
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index f1942d69a0d5..ee85c8b9a858 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -165,7 +165,7 @@ struct lsi_umts {
165 u8 gw_addr_len; /* NW-supplied GW address len */ 165 u8 gw_addr_len; /* NW-supplied GW address len */
166 u8 gw_addr[16]; /* NW-supplied GW address (bigendian) */ 166 u8 gw_addr[16]; /* NW-supplied GW address (bigendian) */
167 u8 reserved[8]; 167 u8 reserved[8];
168} __attribute__ ((packed)); 168} __packed;
169 169
170#define SIERRA_NET_LSI_COMMON_LEN 4 170#define SIERRA_NET_LSI_COMMON_LEN 4
171#define SIERRA_NET_LSI_UMTS_LEN (sizeof(struct lsi_umts)) 171#define SIERRA_NET_LSI_UMTS_LEN (sizeof(struct lsi_umts))
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 81c76ada8e56..7eab4071ea26 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -643,7 +643,7 @@ int usbnet_stop (struct net_device *net)
643 netif_stop_queue (net); 643 netif_stop_queue (net);
644 644
645 netif_info(dev, ifdown, dev->net, 645 netif_info(dev, ifdown, dev->net,
646 "stop stats: rx/tx %ld/%ld, errs %ld/%ld\n", 646 "stop stats: rx/tx %lu/%lu, errs %lu/%lu\n",
647 net->stats.rx_packets, net->stats.tx_packets, 647 net->stats.rx_packets, net->stats.tx_packets,
648 net->stats.rx_errors, net->stats.tx_errors); 648 net->stats.rx_errors, net->stats.tx_errors);
649 649
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-23 15:32:39 -0500