|
@@ -577,7 +577,7 @@ static void at91ether_sethashtable(struct net_device *dev)
|
|
/*
|
|
/*
|
|
* Enable/Disable promiscuous and multicast modes.
|
|
* Enable/Disable promiscuous and multicast modes.
|
|
*/
|
|
*/
|
|
-static void at91ether_set_rx_mode(struct net_device *dev)
|
|
|
|
|
|
+static void at91ether_set_multicast_list(struct net_device *dev)
|
|
{
|
|
{
|
|
unsigned long cfg;
|
|
unsigned long cfg;
|
|
|
|
|
|
@@ -808,7 +808,7 @@ static int at91ether_close(struct net_device *dev)
|
|
/*
|
|
/*
|
|
* Transmit packet.
|
|
* Transmit packet.
|
|
*/
|
|
*/
|
|
-static int at91ether_tx(struct sk_buff *skb, struct net_device *dev)
|
|
|
|
|
|
+static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
{
|
|
struct at91_private *lp = netdev_priv(dev);
|
|
struct at91_private *lp = netdev_priv(dev);
|
|
|
|
|
|
@@ -828,7 +828,7 @@ static int at91ether_tx(struct sk_buff *skb, struct net_device *dev)
|
|
|
|
|
|
dev->trans_start = jiffies;
|
|
dev->trans_start = jiffies;
|
|
} else {
|
|
} else {
|
|
- printk(KERN_ERR "at91_ether.c: at91ether_tx() called, but device is busy!\n");
|
|
|
|
|
|
+ printk(KERN_ERR "at91_ether.c: at91ether_start_xmit() called, but device is busy!\n");
|
|
return 1; /* if we return anything but zero, dev.c:1055 calls kfree_skb(skb)
|
|
return 1; /* if we return anything but zero, dev.c:1055 calls kfree_skb(skb)
|
|
on this skb, he also reports -ENETDOWN and printk's, so either
|
|
on this skb, he also reports -ENETDOWN and printk's, so either
|
|
we free and return(0) or don't free and return 1 */
|
|
we free and return(0) or don't free and return 1 */
|
|
@@ -965,6 +965,21 @@ static void at91ether_poll_controller(struct net_device *dev)
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+static const struct net_device_ops at91ether_netdev_ops = {
|
|
|
|
+ .ndo_open = at91ether_open,
|
|
|
|
+ .ndo_stop = at91ether_close,
|
|
|
|
+ .ndo_start_xmit = at91ether_start_xmit,
|
|
|
|
+ .ndo_get_stats = at91ether_stats,
|
|
|
|
+ .ndo_set_multicast_list = at91ether_set_multicast_list,
|
|
|
|
+ .ndo_set_mac_address = set_mac_address,
|
|
|
|
+ .ndo_do_ioctl = at91ether_ioctl,
|
|
|
|
+ .ndo_validate_addr = eth_validate_addr,
|
|
|
|
+ .ndo_change_mtu = eth_change_mtu,
|
|
|
|
+#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
+ .ndo_poll_controller = at91ether_poll_controller,
|
|
|
|
+#endif
|
|
|
|
+};
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* Initialize the ethernet interface
|
|
* Initialize the ethernet interface
|
|
*/
|
|
*/
|
|
@@ -1005,17 +1020,8 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
|
|
spin_lock_init(&lp->lock);
|
|
spin_lock_init(&lp->lock);
|
|
|
|
|
|
ether_setup(dev);
|
|
ether_setup(dev);
|
|
- dev->open = at91ether_open;
|
|
|
|
- dev->stop = at91ether_close;
|
|
|
|
- dev->hard_start_xmit = at91ether_tx;
|
|
|
|
- dev->get_stats = at91ether_stats;
|
|
|
|
- dev->set_multicast_list = at91ether_set_rx_mode;
|
|
|
|
- dev->set_mac_address = set_mac_address;
|
|
|
|
|
|
+ dev->netdev_ops = &at91ether_netdev_ops;
|
|
dev->ethtool_ops = &at91ether_ethtool_ops;
|
|
dev->ethtool_ops = &at91ether_ethtool_ops;
|
|
- dev->do_ioctl = at91ether_ioctl;
|
|
|
|
-#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
- dev->poll_controller = at91ether_poll_controller;
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
SET_NETDEV_DEV(dev, &pdev->dev);
|
|
SET_NETDEV_DEV(dev, &pdev->dev);
|
|
|
|
|