Commit 6dd6a21b authored by Petko Manolov's avatar Petko Manolov Committed by David S. Miller

[PATCH] USB: rtl8150 update

set_mac_address is now added to the driver.  thanks to Orjan Friberg <orjan.friberg@axis.com>
the actual writing to the eeprom is disabled by default
parent 48452f9f
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
/* Version Information */ /* Version Information */
#define DRIVER_VERSION "v0.5.5 (2002/07/22)" #define DRIVER_VERSION "v0.5.6 (2002/09/19)"
#define DRIVER_AUTHOR "Petko Manolov <petkan@users.sourceforge.net>" #define DRIVER_AUTHOR "Petko Manolov <petkan@users.sourceforge.net>"
#define DRIVER_DESC "rtl8150 based usb-ethernet driver" #define DRIVER_DESC "rtl8150 based usb-ethernet driver"
#define IRD 0x0120 #define IDR 0x0120
#define MAR 0x0126 #define MAR 0x0126
#define CR 0x012e #define CR 0x012e
#define TCR 0x012f #define TCR 0x012f
...@@ -45,6 +45,8 @@ ...@@ -45,6 +45,8 @@
#define ANLP 0x0146 #define ANLP 0x0146
#define AER 0x0148 #define AER 0x0148
#define IDR_EEPROM 0x1202
#define PHY_READ 0 #define PHY_READ 0
#define PHY_WRITE 0x20 #define PHY_WRITE 0x20
#define PHY_GO 0x40 #define PHY_GO 0x40
...@@ -73,6 +75,8 @@ ...@@ -73,6 +75,8 @@
#define PRODUCT_ID_RTL8150 0x8150 #define PRODUCT_ID_RTL8150 0x8150
#define PRODUCT_ID_LUAKTX 0x0012 #define PRODUCT_ID_LUAKTX 0x0012
#undef EEPROM_WRITE
/* table of devices that work with this driver */ /* table of devices that work with this driver */
static struct usb_device_id rtl8150_table[] = { static struct usb_device_id rtl8150_table[] = {
{USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8150)}, {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8150)},
...@@ -111,7 +115,7 @@ static void free_skb_pool(rtl8150_t *); ...@@ -111,7 +115,7 @@ static void free_skb_pool(rtl8150_t *);
static inline struct sk_buff *pull_skb(rtl8150_t *); static inline struct sk_buff *pull_skb(rtl8150_t *);
static void rtl8150_disconnect(struct usb_interface *intf); static void rtl8150_disconnect(struct usb_interface *intf);
static int rtl8150_probe(struct usb_interface *intf, static int rtl8150_probe(struct usb_interface *intf,
const struct usb_device_id *id); const struct usb_device_id *id);
static struct usb_driver rtl8150_driver = { static struct usb_driver rtl8150_driver = {
.name = "rtl8150", .name = "rtl8150",
...@@ -231,10 +235,51 @@ static inline void set_ethernet_addr(rtl8150_t * dev) ...@@ -231,10 +235,51 @@ 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); get_registers(dev, IDR, sizeof(node_id), node_id);
memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id)); memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id));
} }
static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
{
struct sockaddr *addr = p;
rtl8150_t *dev;
int i;
if (netif_running(netdev))
return -EBUSY;
dev = netdev->priv;
if (dev == NULL) {
return -ENODEV;
}
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
dbg("%s: Setting MAC address to ", netdev->name);
for (i = 0; i < 5; i++)
dbg("%02X:", netdev->dev_addr[i]);
dbg("%02X\n", netdev->dev_addr[i]);
/* Set the IDR registers. */
set_registers(dev, IDR, sizeof(netdev->dev_addr), netdev->dev_addr);
#ifdef EEPROM_WRITE
{
u8 cr;
/* Get the CR contents. */
get_registers(dev, CR, 1, &cr);
/* Set the WEPROM bit (eeprom write enable). */
cr |= 0x20;
set_registers(dev, CR, 1, &cr);
/* Write the MAC address into eeprom. Eeprom writes must be word-sized,
so we need to split them up. */
for (i = 0; i * 2 < netdev->addr_len; i++) {
set_registers(dev, IDR_EEPROM + (i * 2), 2,
netdev->dev_addr + (i * 2));
}
/* Clear the WEPROM bit (preventing accidental eeprom writes). */
cr &= 0xdf;
set_registers(dev, CR, 1, &cr);
}
#endif
return 0;
}
static int rtl8150_reset(rtl8150_t * dev) static int rtl8150_reset(rtl8150_t * dev)
{ {
u8 data = 0x10; u8 data = 0x10;
...@@ -764,6 +809,7 @@ static int rtl8150_probe(struct usb_interface *intf, ...@@ -764,6 +809,7 @@ static int rtl8150_probe(struct usb_interface *intf,
netdev->tx_timeout = rtl8150_tx_timeout; netdev->tx_timeout = rtl8150_tx_timeout;
netdev->hard_start_xmit = rtl8150_start_xmit; netdev->hard_start_xmit = rtl8150_start_xmit;
netdev->set_multicast_list = rtl8150_set_multicast; netdev->set_multicast_list = rtl8150_set_multicast;
netdev->set_mac_address = rtl8150_set_mac_address;
netdev->get_stats = rtl8150_netdev_stats; netdev->get_stats = rtl8150_netdev_stats;
netdev->mtu = RTL8150_MTU; netdev->mtu = RTL8150_MTU;
dev->intr_interval = 100; /* 100ms */ dev->intr_interval = 100; /* 100ms */
...@@ -782,7 +828,7 @@ static int rtl8150_probe(struct usb_interface *intf, ...@@ -782,7 +828,7 @@ static int rtl8150_probe(struct usb_interface *intf,
info("%s: rtl8150 is detected", netdev->name); info("%s: rtl8150 is detected", netdev->name);
up(&dev->sem); up(&dev->sem);
dev_set_drvdata (&intf->dev, dev); dev_set_drvdata(&intf->dev, dev);
return 0; return 0;
err: err:
unregister_netdev(dev->netdev); unregister_netdev(dev->netdev);
...@@ -794,10 +840,9 @@ static int rtl8150_probe(struct usb_interface *intf, ...@@ -794,10 +840,9 @@ static int rtl8150_probe(struct usb_interface *intf,
static void rtl8150_disconnect(struct usb_interface *intf) static void rtl8150_disconnect(struct usb_interface *intf)
{ {
rtl8150_t *dev = dev_get_drvdata (&intf->dev); rtl8150_t *dev = dev_get_drvdata(&intf->dev);
dev_set_drvdata (&intf->dev, NULL);
dev_set_drvdata(&intf->dev, NULL);
if (dev) { if (dev) {
set_bit(RTL8150_UNPLUG, &dev->flags); set_bit(RTL8150_UNPLUG, &dev->flags);
unregister_netdev(dev->netdev); unregister_netdev(dev->netdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment