Hi Greg,
This patch adds one more device to the list and removes redundant check in
probe(); It is bulky because i've run the thing through indent long
time ago. Oh, and the usual limitation to GPL v2 only...
Petko
On Tue, 23 Jul 2002, Pete Zaitcev wrote:
> This got me thinking:
>
> @@ -671,8 +675,11 @@
> err("usb_set_configuration() failed");
> return NULL;
> }
> - if ((udev->descriptor.idVendor != VENDOR_ID_REALTEK) ||
> - (udev->descriptor.idProduct != PRODUCT_ID_RTL8150)) {
> + if ((udev->descriptor.idVendor == VENDOR_ID_REALTEK) ||
> + (udev->descriptor.idProduct == PRODUCT_ID_RTL8150) ||
> + ((udev->descriptor.idVendor == VENDOR_ID_MELCO) &&
> + (udev->descriptor.idProduct == PRODUCT_ID_LUAKTX))) {
> + } else {
> err("Not the one we are interested about");
> return NULL;
> }
>
> I think you better drop this if statement altogether.
I did. If you need smaller patch (excluding the indent crap) against what
is in rc3 i can do that and send it.
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2002-07-22 22:56:07-07:00, [EMAIL PROTECTED]
changing the license to version 2 only;
adding another vendor/device ID;
i've run this through indent, haven't i? shit, next time i'll be more careful..
rtl8150.c | 391 +++++++++++++++++++++++++++-----------------------------------
1 files changed, 174 insertions(+), 217 deletions(-)
diff -Nru a/drivers/usb/rtl8150.c b/drivers/usb/rtl8150.c
--- a/drivers/usb/rtl8150.c Mon Jul 22 22:56:59 2002
+++ b/drivers/usb/rtl8150.c Mon Jul 22 22:56:59 2002
@@ -1,11 +1,9 @@
/*
- * Copyright (c) 2002 Petko Manolov ([EMAIL PROTECTED])
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * Copyright (c) 2002 Petko Manolov ([EMAIL PROTECTED])
*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
*/
#include <linux/config.h>
@@ -19,17 +17,13 @@
#include <linux/ethtool.h>
#include <linux/devfs_fs_kernel.h>
#include <linux/usb.h>
-#include <linux/init.h>
#include <asm/uaccess.h>
-
-
/* Version Information */
-#define DRIVER_VERSION "v0.4.0 (2002/03/28)"
+#define DRIVER_VERSION "v0.4.1 (2002/07/22)"
#define DRIVER_AUTHOR "Petko Manolov <[EMAIL PROTECTED]>"
#define DRIVER_DESC "rtl8150 based usb-ethernet driver"
-
#define IRD 0x0120
#define MAR 0x0126
#define CR 0x012e
@@ -69,49 +63,48 @@
#define RX_REG_SET 1
#define RTL8150_UNPLUG 2
-
/* Define these values to match your device */
#define VENDOR_ID_REALTEK 0x0bda
+#define VENDOR_ID_MELCO 0x0411
+
#define PRODUCT_ID_RTL8150 0x8150
+#define PRODUCT_ID_LUAKTX 0x0012
/* table of devices that work with this driver */
-static struct usb_device_id rtl8150_table [] = {
- { USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8150) },
- { }
+static struct usb_device_id rtl8150_table[] = {
+ {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8150)},
+ {USB_DEVICE(VENDOR_ID_MELCO, PRODUCT_ID_LUAKTX)},
+ {}
};
-MODULE_DEVICE_TABLE (usb, rtl8150_table);
-
+MODULE_DEVICE_TABLE(usb, rtl8150_table);
struct rtl8150 {
- unsigned long flags;
- struct usb_device *udev;
- struct usb_interface *interface;
- struct semaphore sem;
- struct net_device_stats stats;
- struct net_device *netdev;
- struct urb *rx_urb, *tx_urb, *intr_urb, *ctrl_urb;
- devrequest dr;
- int intr_interval;
- u16 rx_creg;
- u8 rx_buff[RTL8150_MAX_MTU];
- u8 tx_buff[RTL8150_MAX_MTU];
- u8 intr_buff[8];
- u8 phy;
+ unsigned int flags;
+ struct usb_device *udev;
+ struct usb_interface *interface;
+ struct semaphore sem;
+ struct net_device_stats stats;
+ struct net_device *netdev;
+ struct urb *rx_urb, *tx_urb, *intr_urb, *ctrl_urb;
+ devrequest dr;
+ int intr_interval;
+ u16 rx_creg;
+ u8 rx_buff[RTL8150_MAX_MTU];
+ u8 tx_buff[RTL8150_MAX_MTU];
+ u8 intr_buff[8];
+ u8 phy;
};
-typedef struct rtl8150 rtl8150_t;
-
+typedef struct rtl8150 rtl8150_t;
/* the global usb devfs handle */
extern devfs_handle_t usb_devfs_handle;
unsigned long multicast_filter_limit = 32;
-
static void rtl8150_disconnect(struct usb_device *dev, void *ptr);
-static void * rtl8150_probe(struct usb_device *dev, unsigned int ifnum,
- const struct usb_device_id *id);
-
+static void *rtl8150_probe(struct usb_device *dev, unsigned int ifnum,
+ const struct usb_device_id *id);
static struct usb_driver rtl8150_driver = {
name: "rtl8150",
@@ -120,33 +113,29 @@
id_table: rtl8150_table,
};
-
-
/*
**
** device related part of the code
**
*/
-static int get_registers(rtl8150_t *dev, u16 indx, u16 size, void *data)
+static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
{
- return usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev,0),
- RTL8150_REQ_GET_REGS, RTL8150_REQT_READ,
- indx, 0, data, size, HZ/2);
+ return usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
+ RTL8150_REQ_GET_REGS, RTL8150_REQT_READ,
+ indx, 0, data, size, HZ / 2);
}
-
-static int set_registers(rtl8150_t *dev, u16 indx, u16 size, void *data)
+static int set_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
{
- return usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev,0),
- RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE,
- indx, 0, data, size, HZ/2);
+ return usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
+ RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE,
+ indx, 0, data, size, HZ / 2);
}
-
static void ctrl_callback(struct urb *urb)
{
- rtl8150_t *dev;
-
+ rtl8150_t *dev;
+
switch (urb->status) {
case 0:
break;
@@ -161,22 +150,22 @@
clear_bit(RX_REG_SET, &dev->flags);
}
-
-static int async_set_registers(rtl8150_t *dev, u16 indx, u16 size, void *data)
+static int async_set_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
{
- int ret;
+ int ret;
if (test_bit(RX_REG_SET, &dev->flags))
return -EAGAIN;
-
+
dev->dr.requesttype = RTL8150_REQT_WRITE;
dev->dr.request = RTL8150_REQ_SET_REGS;
dev->dr.value = cpu_to_le16(indx);
dev->dr.index = 0;
dev->dr.length = cpu_to_le16(2);
dev->ctrl_urb->transfer_buffer_length = 2;
- FILL_CONTROL_URB(dev->ctrl_urb, dev->udev, usb_sndctrlpipe(dev->udev,0),
- (char*)&dev->dr, &dev->rx_creg, 2, ctrl_callback, dev);
+ FILL_CONTROL_URB(dev->ctrl_urb, dev->udev,
+ usb_sndctrlpipe(dev->udev, 0), (char *) &dev->dr,
+ &dev->rx_creg, 2, ctrl_callback, dev);
if ((ret = usb_submit_urb(dev->ctrl_urb)))
err("control request submission failed: %d", ret);
else
@@ -185,11 +174,10 @@
return ret;
}
-
-static int read_mii_word(rtl8150_t *dev, u8 phy, __u8 indx, u16 *reg)
+static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg)
{
- int i;
- u8 data[3], tmp;
+ int i;
+ u8 data[3], tmp;
data[0] = phy;
data[1] = data[2] = 0;
@@ -204,17 +192,16 @@
if (i < HZ) {
get_registers(dev, PHYDAT, 2, data);
- *reg = le16_to_cpup(data);
+ *reg = le16_to_cpup((u16 *)data);
return 0;
} else
return 1;
}
-
-static int write_mii_word(rtl8150_t *dev, u8 phy, __u8 indx, u16 reg)
+static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
{
- int i;
- u8 data[3], tmp;
+ int i;
+ u8 data[3], tmp;
data[0] = phy;
*(data + 1) = cpu_to_le16p(®);
@@ -225,7 +212,7 @@
set_registers(dev, PHYCNT, 1, &tmp);
do {
get_registers(dev, PHYCNT, 1, data);
- } while((data[0] & PHY_GO) && (i++ < HZ));
+ } while ((data[0] & PHY_GO) && (i++ < HZ));
if (i < HZ)
return 0;
@@ -233,31 +220,28 @@
return 1;
}
-
-static inline void set_ethernet_addr(rtl8150_t *dev)
+static inline void set_ethernet_addr(rtl8150_t * dev)
{
- u8 node_id[6];
+ u8 node_id[6];
get_registers(dev, IRD, sizeof(node_id), node_id);
memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id));
}
-
-static int rtl8150_reset(rtl8150_t *dev)
+static int rtl8150_reset(rtl8150_t * dev)
{
- u8 data=0x10;
- int i=HZ;
+ u8 data = 0x10;
+ int i = HZ;
set_registers(dev, CR, 1, &data);
do {
get_registers(dev, CR, 1, &data);
} while ((data & 0x10) && --i);
-
+
return (i > 0) ? 0 : -1;
}
-
-static int alloc_all_urbs(rtl8150_t *dev)
+static int alloc_all_urbs(rtl8150_t * dev)
{
dev->rx_urb = usb_alloc_urb(0);
if (!dev->rx_urb)
@@ -284,8 +268,7 @@
return 1;
}
-
-static void free_all_urbs(rtl8150_t *dev)
+static void free_all_urbs(rtl8150_t * dev)
{
usb_free_urb(dev->rx_urb);
usb_free_urb(dev->tx_urb);
@@ -293,8 +276,7 @@
usb_free_urb(dev->ctrl_urb);
}
-
-static void unlink_all_urbs(rtl8150_t *dev)
+static void unlink_all_urbs(rtl8150_t * dev)
{
usb_unlink_urb(dev->rx_urb);
usb_unlink_urb(dev->tx_urb);
@@ -302,14 +284,13 @@
usb_unlink_urb(dev->ctrl_urb);
}
-
static void read_bulk_callback(struct urb *urb)
{
- rtl8150_t *dev;
- int pkt_len, res;
- struct sk_buff *skb;
+ rtl8150_t *dev;
+ int pkt_len, res;
+ struct sk_buff *skb;
struct net_device *netdev;
- u16 rx_stat;
+ u16 rx_stat;
dev = urb->context;
if (!dev) {
@@ -333,11 +314,11 @@
warn("Rx status %d", urb->status);
goto goon;
}
-
+
pkt_len = urb->actual_length - 4;
- rx_stat = le16_to_cpu(*(u16 *)(dev->rx_buff + pkt_len));
+ rx_stat = le16_to_cpu(*(u16 *) (dev->rx_buff + pkt_len));
- if (!(skb = dev_alloc_skb(pkt_len + 2)))
+ if (!(skb = dev_alloc_skb(pkt_len + 2)))
goto goon;
skb->dev = netdev;
skb_reserve(skb, 2);
@@ -348,16 +329,15 @@
dev->stats.rx_packets++;
dev->stats.rx_bytes += pkt_len;
goon:
- FILL_BULK_URB(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev,1),
- dev->rx_buff, RTL8150_MAX_MTU, read_bulk_callback, dev);
- if ((res=usb_submit_urb(dev->rx_urb)))
+ FILL_BULK_URB(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
+ dev->rx_buff, RTL8150_MAX_MTU, read_bulk_callback, dev);
+ if ((res = usb_submit_urb(dev->rx_urb)))
warn("%s: Rx urb submission failed %d", netdev->name, res);
}
-
static void write_bulk_callback(struct urb *urb)
{
- rtl8150_t *dev;
+ rtl8150_t *dev;
dev = urb->context;
if (!dev)
@@ -370,36 +350,32 @@
netif_wake_queue(dev->netdev);
}
-
void intr_callback(struct urb *urb)
{
- rtl8150_t *dev;
+ rtl8150_t *dev;
dev = urb->context;
if (!dev)
return;
switch (urb->status) {
- case 0:
- break;
- case -ENOENT:
- return;
- default:
- info("%s: intr status %d", dev->netdev->name,
- urb->status);
+ case 0:
+ break;
+ case -ENOENT:
+ return;
+ default:
+ info("%s: intr status %d", dev->netdev->name, urb->status);
}
}
-
/*
**
** network related part of the code
**
*/
-
-static int enable_net_traffic(rtl8150_t *dev)
+static int enable_net_traffic(rtl8150_t * dev)
{
- u8 cr, tcr, rcr, msr;
+ u8 cr, tcr, rcr, msr;
if (rtl8150_reset(dev)) {
warn("%s - device reset failed", __FUNCTION__);
@@ -415,26 +391,23 @@
return 0;
}
-
-static void disable_net_traffic(rtl8150_t *dev)
+static void disable_net_traffic(rtl8150_t * dev)
{
- u8 cr;
+ u8 cr;
get_registers(dev, CR, 1, &cr);
cr &= 0xf3;
set_registers(dev, CR, 1, &cr);
}
-
static struct net_device_stats *rtl8150_netdev_stats(struct net_device *dev)
{
- return &((rtl8150_t *)dev->priv)->stats;
+ return &((rtl8150_t *) dev->priv)->stats;
}
-
static void rtl8150_tx_timeout(struct net_device *netdev)
{
- rtl8150_t *dev;
+ rtl8150_t *dev;
dev = netdev->priv;
if (!dev)
@@ -445,10 +418,9 @@
dev->stats.tx_errors++;
}
-
static void rtl8150_set_multicast(struct net_device *netdev)
{
- rtl8150_t *dev;
+ rtl8150_t *dev;
dev = netdev->priv;
netif_stop_queue(netdev);
@@ -456,7 +428,7 @@
dev->rx_creg |= 0x0001;
info("%s: promiscuous mode", netdev->name);
} else if ((netdev->mc_count > multicast_filter_limit) ||
- (netdev->flags & IFF_ALLMULTI)) {
+ (netdev->flags & IFF_ALLMULTI)) {
dev->rx_creg &= 0xfffe;
dev->rx_creg |= 0x0002;
info("%s: allmulti set", netdev->name);
@@ -468,18 +440,17 @@
netif_wake_queue(netdev);
}
-
static int rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev)
{
- rtl8150_t *dev;
- int count, res;
+ rtl8150_t *dev;
+ int count, res;
netif_stop_queue(netdev);
dev = netdev->priv;
count = (skb->len < 60) ? 60 : skb->len;
count = (count & 0x3f) ? count : count + 1;
memcpy(dev->tx_buff, skb->data, skb->len);
- FILL_BULK_URB(dev->tx_urb, dev->udev, usb_sndbulkpipe(dev->udev,2),
+ FILL_BULK_URB(dev->tx_urb, dev->udev, usb_sndbulkpipe(dev->udev, 2),
dev->tx_buff, RTL8150_MAX_MTU, write_bulk_callback, dev);
dev->tx_urb->transfer_buffer_length = count;
@@ -497,26 +468,25 @@
return 0;
}
-
static int rtl8150_open(struct net_device *netdev)
{
- rtl8150_t *dev;
- int res;
-
+ rtl8150_t *dev;
+ int res;
+
dev = netdev->priv;
if (dev == NULL) {
return -ENODEV;
}
down(&dev->sem);
- FILL_BULK_URB(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev,1),
- dev->rx_buff, RTL8150_MAX_MTU, read_bulk_callback, dev);
- if ((res=usb_submit_urb(dev->rx_urb)))
+ FILL_BULK_URB(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
+ dev->rx_buff, RTL8150_MAX_MTU, read_bulk_callback, dev);
+ if ((res = usb_submit_urb(dev->rx_urb)))
warn("%s: rx_urb submit failed: %d", __FUNCTION__, res);
- FILL_INT_URB(dev->intr_urb, dev->udev, usb_rcvintpipe(dev->udev,3),
- dev->intr_buff, sizeof(dev->intr_buff), intr_callback,
- dev, dev->intr_interval);
- if ((res=usb_submit_urb(dev->intr_urb)))
+ FILL_INT_URB(dev->intr_urb, dev->udev, usb_rcvintpipe(dev->udev, 3),
+ dev->intr_buff, sizeof(dev->intr_buff), intr_callback,
+ dev, dev->intr_interval);
+ if ((res = usb_submit_urb(dev->intr_urb)))
warn("%s: intr_urb submit failed: %d", __FUNCTION__, res);
netif_start_queue(netdev);
enable_net_traffic(dev);
@@ -525,7 +495,6 @@
return res;
}
-
static int rtl8150_close(struct net_device *netdev)
{
rtl8150_t *dev;
@@ -545,93 +514,92 @@
return res;
}
-
static int rtl8150_ethtool_ioctl(struct net_device *netdev, void *uaddr)
{
- rtl8150_t *dev;
- int cmd;
- char tmp[128];
+ rtl8150_t *dev;
+ int cmd;
+ char tmp[128];
dev = netdev->priv;
- if (get_user(cmd, (int *)uaddr))
+ if (get_user(cmd, (int *) uaddr))
return -EFAULT;
switch (cmd) {
- case ETHTOOL_GDRVINFO: {
- struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
-
- strncpy(info.driver, DRIVER_DESC, ETHTOOL_BUSINFO_LEN);
- strncpy(info.version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
- sprintf(tmp, "usb%d:%d", dev->udev->bus->busnum,
- dev->udev->devnum);
- strncpy(info.bus_info, tmp, ETHTOOL_BUSINFO_LEN);
- if (copy_to_user(uaddr, &info, sizeof(info)))
- return -EFAULT;
- return 0;
- }
- case ETHTOOL_GSET: {
- struct ethtool_cmd ecmd;
- short lpa, bmcr;
-
- if (copy_from_user(&ecmd, uaddr, sizeof(ecmd)))
- return -EFAULT;
- ecmd.supported = (SUPPORTED_10baseT_Half |
- SUPPORTED_10baseT_Full |
- SUPPORTED_100baseT_Half |
- SUPPORTED_100baseT_Full |
- SUPPORTED_Autoneg |
- SUPPORTED_TP |
- SUPPORTED_MII);
- ecmd.port = PORT_TP;
- ecmd.transceiver = XCVR_INTERNAL;
- ecmd.phy_address = dev->phy;
- get_registers(dev, BMCR, 2, &bmcr);
- get_registers(dev, ANLP, 2, &lpa);
- if (bmcr & BMCR_ANENABLE) {
- ecmd.autoneg = AUTONEG_ENABLE;
- ecmd.speed = (lpa & (LPA_100HALF | LPA_100FULL)) ?
- SPEED_100 : SPEED_10;
- if (ecmd.speed == SPEED_100)
- ecmd.duplex = (lpa & LPA_100FULL) ?
- DUPLEX_FULL : DUPLEX_HALF;
- else
- ecmd.duplex = (lpa & LPA_10FULL) ?
- DUPLEX_FULL : DUPLEX_HALF;
- } else {
- ecmd.autoneg = AUTONEG_DISABLE;
- ecmd.speed = (bmcr & BMCR_SPEED100) ?
- SPEED_100 : SPEED_10;
- ecmd.duplex = (bmcr & BMCR_FULLDPLX) ?
- DUPLEX_FULL : DUPLEX_HALF;
+ case ETHTOOL_GDRVINFO:{
+ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
+
+ strncpy(info.driver, DRIVER_DESC, ETHTOOL_BUSINFO_LEN);
+ strncpy(info.version, DRIVER_VERSION,
+ ETHTOOL_BUSINFO_LEN);
+ sprintf(tmp, "usb%d:%d", dev->udev->bus->busnum,
+ dev->udev->devnum);
+ strncpy(info.bus_info, tmp, ETHTOOL_BUSINFO_LEN);
+ if (copy_to_user(uaddr, &info, sizeof(info)))
+ return -EFAULT;
+ return 0;
+ }
+ case ETHTOOL_GSET:{
+ struct ethtool_cmd ecmd;
+ short lpa, bmcr;
+
+ if (copy_from_user(&ecmd, uaddr, sizeof(ecmd)))
+ return -EFAULT;
+ ecmd.supported = (SUPPORTED_10baseT_Half |
+ SUPPORTED_10baseT_Full |
+ SUPPORTED_100baseT_Half |
+ SUPPORTED_100baseT_Full |
+ SUPPORTED_Autoneg |
+ SUPPORTED_TP | SUPPORTED_MII);
+ ecmd.port = PORT_TP;
+ ecmd.transceiver = XCVR_INTERNAL;
+ ecmd.phy_address = dev->phy;
+ get_registers(dev, BMCR, 2, &bmcr);
+ get_registers(dev, ANLP, 2, &lpa);
+ if (bmcr & BMCR_ANENABLE) {
+ ecmd.autoneg = AUTONEG_ENABLE;
+ ecmd.speed =
+ (lpa & (LPA_100HALF | LPA_100FULL)) ?
+ SPEED_100 : SPEED_10;
+ if (ecmd.speed == SPEED_100)
+ ecmd.duplex = (lpa & LPA_100FULL) ?
+ DUPLEX_FULL : DUPLEX_HALF;
+ else
+ ecmd.duplex = (lpa & LPA_10FULL) ?
+ DUPLEX_FULL : DUPLEX_HALF;
+ } else {
+ ecmd.autoneg = AUTONEG_DISABLE;
+ ecmd.speed = (bmcr & BMCR_SPEED100) ?
+ SPEED_100 : SPEED_10;
+ ecmd.duplex = (bmcr & BMCR_FULLDPLX) ?
+ DUPLEX_FULL : DUPLEX_HALF;
+ }
+ if (copy_to_user(uaddr, &ecmd, sizeof(ecmd)))
+ return -EFAULT;
+ return 0;
}
- if (copy_to_user(uaddr, &ecmd, sizeof(ecmd)))
- return -EFAULT;
- return 0;
- }
case ETHTOOL_SSET:
return -ENOTSUPP;
- case ETHTOOL_GLINK: {
- struct ethtool_value edata = {ETHTOOL_GLINK};
+ case ETHTOOL_GLINK:{
+ struct ethtool_value edata = { ETHTOOL_GLINK };
- edata.data = netif_carrier_ok(netdev);
- if (copy_to_user(uaddr, &edata, sizeof(edata)))
- return -EFAULT;
- return 0;
- }
+ edata.data = netif_carrier_ok(netdev);
+ if (copy_to_user(uaddr, &edata, sizeof(edata)))
+ return -EFAULT;
+ return 0;
+ }
default:
return -EOPNOTSUPP;
}
}
-
-static int rtl8150_ioctl (struct net_device *netdev, struct ifreq *rq, int cmd)
+static int rtl8150_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
{
rtl8150_t *dev;
- u16 *data;
- int res;
+ u16 *data;
+ int res;
dev = netdev->priv;
- data = (u16 *)&rq->ifr_data;
+ data = (u16 *) & rq->ifr_data;
res = 0;
down(&dev->sem);
@@ -641,10 +609,10 @@
break;
case SIOCDEVPRIVATE:
data[0] = dev->phy;
- case SIOCDEVPRIVATE+1:
+ case SIOCDEVPRIVATE + 1:
read_mii_word(dev, dev->phy, (data[1] & 0x1f), &data[3]);
break;
- case SIOCDEVPRIVATE+2:
+ case SIOCDEVPRIVATE + 2:
if (!capable(CAP_NET_ADMIN)) {
up(&dev->sem);
return -EPERM;
@@ -659,9 +627,8 @@
return res;
}
-
-static void * rtl8150_probe(struct usb_device *udev, unsigned int ifnum,
- const struct usb_device_id *id)
+static void *rtl8150_probe(struct usb_device *udev, unsigned int ifnum,
+ const struct usb_device_id *id)
{
rtl8150_t *dev;
struct net_device *netdev;
@@ -671,14 +638,9 @@
err("usb_set_configuration() failed");
return NULL;
}
- if ((udev->descriptor.idVendor != VENDOR_ID_REALTEK) ||
- (udev->descriptor.idProduct != PRODUCT_ID_RTL8150)) {
- err("Not the one we are interested about");
- return NULL;
- }
dev = kmalloc(sizeof(rtl8150_t), GFP_KERNEL);
if (!dev) {
- err ("Out of memory");
+ err("Out of memory");
goto exit;
} else
memset(dev, 0, sizeof(rtl8150_t));
@@ -690,7 +652,7 @@
dev = NULL;
goto exit;
}
-
+
init_MUTEX(&dev->sem);
dev->udev = udev;
dev->netdev = netdev;
@@ -724,7 +686,6 @@
return dev;
}
-
static void rtl8150_disconnect(struct usb_device *udev, void *ptr)
{
rtl8150_t *dev;
@@ -740,20 +701,16 @@
dev = NULL;
}
-
-
static int __init usb_rtl8150_init(void)
{
info(DRIVER_DESC " " DRIVER_VERSION);
return usb_register(&rtl8150_driver);
}
-
static void __exit usb_rtl8150_exit(void)
{
usb_deregister(&rtl8150_driver);
}
-
module_init(usb_rtl8150_init);
module_exit(usb_rtl8150_exit);
===================================================================
This BitKeeper patch contains the following changesets:
1.739
## Wrapped with gzip_uu ##
begin 664 bkpatch777
M'XL(`"OP/#T``]49:W/:2/(S^A5SV5JO<##66^"<LTLL[%#!F,.0RVV24@DQ
M&)6%1$:2$U^<_W[=/<(\3)SD<E=7YTK4TDQW3[^FIWOXA8TR+HXJ"YY?!XGR
M"WN99OE191YD>70=U./DT\=ZF,YA8I"F,'%89.(P$R'`\8%1MQ28Z0=Y.&,W
M7&1'%;UNWH_DMPM^5!FTST;=UD!1CH_9R2Q(KO@ES]GQL3*^_F-2\+A^+=)@
M5D_%U=W]])VA:;IF:[IA6HYFW&FNIMMWCCL)7,O4FK9M372N*U>"7_TAR4'&
M37)#<PT3@6'<Z;IK&XK']+IK-IEF'&KNH6$PPSBRG2/-/=#<(TUCT@1_;*O.
MGNKL0%->L)^7]T0)68@T47+%\AEG<13R).,L3\E\49HP@Z5)?/L,,/$OF$P0
M-TA20!>`E$Q2<3CA-T#(.MX2+?KMAC-1),`TRN`ATN)JQJ)DPI.\QF8!T/V6
ML^AWQK)9!",)_Y2S/)ISH([EMAIL PROTECTED]#P:1'7Z\HKIAM.TU+Z*Y<I!S_X
MIRA:H"G/V9:7)B)"73&`#D4>-W1;JX?28Y9FZX[=-.T[W6[JQITQ,:8Z']M3
M`PS9;!A?<]%C/#$*;-O1S#O;M72;PG`G.H;D?T[4'V#E&IK>,!H8-@W-<BE.
MK0=1:GXS2EV+'1BZ^S^(U.^(TO]"A$I_7K`#\9'^0<3U=[OVWPA=SV".TG&9
MKK!]QD[2Q:V(KF8Y4\,J0Z^Q/O@A9>>@<YS>,+5T2P')-*MG:2%"/@7#\WK"
M\ZK2:3`3&0U1^85(KT0P9_`Z%9RS+)WF'T&O9^PV+4##A`D^B;)<1.,B!_US
M,.SD,!7(8)[email protected]&NR;F89RR=TL=9;\3.>,)%$+-^,0:WL6[I.J1?
M^2X`07`^F_$)&]\2\2F*<UF*PTY36"/(`;T.YC#`%)YA,\BC1@/>._3\9<*G
M4<*9-^B\;@]\^'_9N>BQ)S=:W:KK3$53R3BN/E$\DYBX^.Q`M!I+\LKK=L^[
M&/@=SS]O=T\N*I6*]DFS=%UY!XCV:IU*?W#AC4Z&B-D=M5X-WQ`F1#.P11MW
M&AJSE"P'L4,&)BQ"L%0V]F4L^M&$E4'AY\$XYF_?LV/V6:E\'EV^\+WVZ\Y)
M6UW),FBWNL/VJQI;6W4P[")Y]4OM:U2DP0:-E%22?%&\A@F:=QH6J'4..-UV
MR<,?MEYTVRJ(6]N4LOH,B"`4+:6C0P8`6"F2++I*P'-1DK-I'%QESY3*`WW9
M?@$OFS-`P,4TP,G[UQ5&QN?!8H8[#=Y6PQ#$2Q.B;3-&SUWS;!_>-Q<58[8O
M/OD`:VP_7[[`XJ)\#7,1XRO0`*7@'PJ>Y;"3X1O5(TR2]2:(8:S0'0;\0DBP
M^-7`CW$QG;XM?>.?M][XY\/1>SF;/SI+S&F^48XL9I#3/%TC+^D:N@D+&0C`
M94"5SEDY"?%U#6-;UPV,0EW'Z"[#\":%L-M?(L/N'W-UAZL`UMB&7Z-I4LPA
M:"H5..+#-`&C[`SI_6B"(0(I'7>G;J(D'0E*$9#;%?@(3`:)!7*`>B\[)`6Y
M,E@5TO$G^99%_^2U4G+(`4$5^4K53`M`1?"\$`D)`I+E(HW]>7:E`JN#YX5D
M"%,BO$'G+J(%7Y_2JDNM\&_IF$'[;_Y9>PCP[+*V/HI#+6^=1`JJU1C*5BNE
M??DG.V0&6<)TR7EF8],$V<^:P-+(!);Q_2;(DLF/F>!RMPG^/N@,VS]B`\NF
M@+0:9`JK":"RIC+MT7>`X%B$X-B;M@JRVR3T?]IBCDO!2(!V,U@-I7-U&B>`
M4KA23+>)ECWM=+O^R45O.+CH^J/!"VFX99JHL94=R1Z/FQF.[%D@V'Z5[='$
M1$@J^54FDAHS:HP6"(,X'@?A-:U"AFQ(T1K-30,)'DS\>13Y'U,QV6$:RB0U
MYON4998VV@>Z*S1,4R>N30/]0KM=IA\TW%OS?8WE\P6L#N4A';8$*I5]H(8C
M*^:ZX^>I'RZ*A:H2WRI9'"ETRER&;FW*^U%$.?]Q@:6X!KP14_<;XI:U`8'*
M%_9Q%L6<J2JA:>_9'NN__(=_=@'.V&-J]/0I^RO$;)7D-N42IKLN=XS5!844
MAB+'^A(/&Z@XQ;8***;9I.4)H'A).L$4^[email protected]>+/D(#FOLXBKW
MD"'W4*DT>$'[I&O+,PH^7_Z):]@V24#@'7XWB=;9RL8096GHPQ,C^L'.PD4;
ME,.,QEH.(SM@S?@H85/:L>EN$19HS.O'2*%3PIQA:E1*F;I&:6XK9Y"^B^O<
MCWD"A0I?*P.R:SI*V7YV#8>Y9^I4Z4FP/+91(IPS'9HC\`Z_&_*;`J?$VXQT
M=;^,=*8NMRZM]G0I#861:='Q)T$EFC+U+RJ(`ZR`R)=FAV^UI`%JHUI%W6V=
ME+;-^PST8M1]M4H_RQ+FX1$W+N+K[<2C4WZ7F7I=VE56+^N0FDPDR.-![B'Q
M53`Q2$])KAC/HQS%6!>I%-\EUSE2>P(/7.>9KDE8KC0^@1U8T&F[,`VAYRB5
M,(#>03L";<8@Z?6S<N2@W;MH]X8X+@]"JMZF01'G.!8ETU1]\FMV1!46U8M%
MQGZ=/"D-**M$@,$<S@S0XN"YQ"$?-JE1,)NT=RQM:^_P!*MB'_-`+H+I-`IW
MQ+*E4?!)@)LV%)"D\"'P,<^@O/0LG7:VI3>W]@KT7]^SAD&GF`1R#61*R<^S
M3#E)8%DL[*GK;*K2%@OH6:M2_PSI34O2NY+>W>DDRY*KV'(56]^-93?E-"5$
MC$=U:7GJ&B`A=TY/_5:W>S[J#CO5*G1#GD6G,@"J#"S7WE4Z4!H(H47,RR3@
M60UI<0*[=E"^>P?!T;UK!QFP@SR;?`\`=V7'AOSTM8Q$,D`BL64%;NO6_^4^
MMB'#62A^$X`4O],;KJ1?M4T/Y8>Y;?'-E?@K<BD_5FOI5-T<AG*)WN\U6*.N
MK;%8MF/?H=Q28JF>W!NV#%Y;YEQ;YMS=$3:?8,;!"@XJC+>Z@6T:$%("DX`$
MP.X&+U]4(("2#TEA>Q58)]"ZD!`M1^DX$$&V7J:P]O#E\`(JS#-O\+K3.[TX
M^HR%87F60:F1IU#23\0-YC)&CV/V^0$5^X)Q)PF3<'&K(F9=WD/5EA<C7OOR
MI'9/^F)TB91^M]U#`VZ1EG<TM:U+%:I:*U]G`5DDR:<J6*G&GH`C?IT<K=)M
M0<]QD=%CV596UN;@`<,[Q`%\'U^HQ'M$!_1"F"YN\;0F3Y#Q:VQ/$I?AAA\8
M";AZF1,/VJ<M2#[$I!S"LJKR9=M-T!GM=!&XG'$9*#`W2T7.X@6T1.,YYN-W
M&\)-13J7XNUQ"I52RE(\''M$/)RN9\5B`6M`DW[,U,M1OW\Q&+8]7]?&(.W0
M?QG$4W9''&#K/)P_+>)X]_PW&7R#0ZO(TP3Z@QU3PSZ[6_L\[W2J*X50&]`%
MYP!Q-0X'7Y*%'`,9IM^<O!Y@+FH/>JWN&O'LEJIQGF6RQH+S#&]08'[SQH$R
MR(OSDP'U6GOHG.K7T%J];E^B@2-7X84T<&(A$[_5:_?PO@Q/K,I2F*"TP#%K
MC887O?:9+Y&>K5"R!4?/*96RDU9A!>"I=OLMM/#+5O<43%5^G8ZZ73@3?[_'
MONRWI2?8T?V[9([RK2]PO,*5X227GQ2+F'_"R)'KKB]4KD,+>:-^M_W&QW%8
MJOQ"X4I5XHQ_D^L/,OW"D.OCYO0ZE[OMN>D<4ATU_R[3;:FPS@A%]?K=-^N,
MOJ'%H[E([OGOV^RK7.0YT'Y;`&1K[=#MWE9RZG9ZKW9F)S@E"\YXV3-^WJ3`
MPP/8.LP&MH8&`.V!N/62`,JU:`KGL1`1%WYZ7=9OW\BY?'4IA(K2W<#W9EW/
M,:B#=`R7[>R3HS3,8_6K5[^UY2UE!*WJ![8O/E!1@4<YG,2.J1%S4Z=F&ALZ
ME&Z]B@,<K(`[$E1*0RR;OSTF/D!5,16^I/,<2V(3D%Z!\_+$:[_NPP':&K:A
MQ]./$,^5>.[7\0S$<ZB"=)P?O\,M?NX2%]:&FML&T*"J7@((""'4)Q=%CC_R
MS/D\%;=/L$URFB9A$7B'/ZQ0#^A:=`_L4DL``&ND^]_DPQD/K[-B?FQK^EB;
,!*[R+^M%2&$"(```
`
end
