|
@@ -640,6 +640,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb,
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
static void rtl8139_poll_controller(struct net_device *dev);
|
|
static void rtl8139_poll_controller(struct net_device *dev);
|
|
#endif
|
|
#endif
|
|
|
|
+static int rtl8139_set_mac_address(struct net_device *dev, void *p);
|
|
static int rtl8139_poll(struct napi_struct *napi, int budget);
|
|
static int rtl8139_poll(struct napi_struct *napi, int budget);
|
|
static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance);
|
|
static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance);
|
|
static int rtl8139_close (struct net_device *dev);
|
|
static int rtl8139_close (struct net_device *dev);
|
|
@@ -917,7 +918,7 @@ static const struct net_device_ops rtl8139_netdev_ops = {
|
|
.ndo_stop = rtl8139_close,
|
|
.ndo_stop = rtl8139_close,
|
|
.ndo_get_stats = rtl8139_get_stats,
|
|
.ndo_get_stats = rtl8139_get_stats,
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
- .ndo_set_mac_address = eth_mac_addr,
|
|
|
|
|
|
+ .ndo_set_mac_address = rtl8139_set_mac_address,
|
|
.ndo_start_xmit = rtl8139_start_xmit,
|
|
.ndo_start_xmit = rtl8139_start_xmit,
|
|
.ndo_set_multicast_list = rtl8139_set_rx_mode,
|
|
.ndo_set_multicast_list = rtl8139_set_rx_mode,
|
|
.ndo_do_ioctl = netdev_ioctl,
|
|
.ndo_do_ioctl = netdev_ioctl,
|
|
@@ -2215,6 +2216,29 @@ static void rtl8139_poll_controller(struct net_device *dev)
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+static int rtl8139_set_mac_address(struct net_device *dev, void *p)
|
|
|
|
+{
|
|
|
|
+ struct rtl8139_private *tp = netdev_priv(dev);
|
|
|
|
+ void __iomem *ioaddr = tp->mmio_addr;
|
|
|
|
+ struct sockaddr *addr = p;
|
|
|
|
+
|
|
|
|
+ if (!is_valid_ether_addr(addr->sa_data))
|
|
|
|
+ return -EADDRNOTAVAIL;
|
|
|
|
+
|
|
|
|
+ memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
|
|
|
|
+
|
|
|
|
+ spin_lock_irq(&tp->lock);
|
|
|
|
+
|
|
|
|
+ RTL_W8_F(Cfg9346, Cfg9346_Unlock);
|
|
|
|
+ RTL_W32_F(MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0)));
|
|
|
|
+ RTL_W32_F(MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4)));
|
|
|
|
+ RTL_W8_F(Cfg9346, Cfg9346_Lock);
|
|
|
|
+
|
|
|
|
+ spin_unlock_irq(&tp->lock);
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
|
static int rtl8139_close (struct net_device *dev)
|
|
static int rtl8139_close (struct net_device *dev)
|
|
{
|
|
{
|
|
struct rtl8139_private *tp = netdev_priv(dev);
|
|
struct rtl8139_private *tp = netdev_priv(dev);
|