libertas: separate libertas' Kconfig in it's own file

[safe/jmp/linux-2.6] / drivers / net / atp.c

diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 1d6b74c..9043294 100644 (file)
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -199,13 +199,13 @@ static int net_open(struct net_device *dev);
 static void hardware_init(struct net_device *dev);
 static void write_packet(long ioaddr, int length, unsigned char *packet, int pad, int mode);
 static void trigger_send(long ioaddr, int length);
-static int     atp_send_packet(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t atp_send_packet(struct sk_buff *skb,
+                                  struct net_device *dev);
 static irqreturn_t atp_interrupt(int irq, void *dev_id);
 static void net_rx(struct net_device *dev);
 static void read_block(long ioaddr, int length, unsigned char *buffer, int data_mode);
 static int net_close(struct net_device *dev);
-static void set_rx_mode_8002(struct net_device *dev);
-static void set_rx_mode_8012(struct net_device *dev);
+static void set_rx_mode(struct net_device *dev);
 static void tx_timeout(struct net_device *dev);
 
 
@@ -242,6 +242,17 @@ static int __init atp_init(void)
        return -ENODEV;
 }
 
+static const struct net_device_ops atp_netdev_ops = {
+       .ndo_open               = net_open,
+       .ndo_stop               = net_close,
+       .ndo_start_xmit         = atp_send_packet,
+       .ndo_set_multicast_list = set_rx_mode,
+       .ndo_tx_timeout         = tx_timeout,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_validate_addr      = eth_validate_addr,
+};
+
 static int __init atp_probe1(long ioaddr)
 {
        struct net_device *dev = NULL;
@@ -342,12 +353,7 @@ static int __init atp_probe1(long ioaddr)
        if (dev->mem_end & 0xf)
                net_debug = dev->mem_end & 7;
 
-       dev->open               = net_open;
-       dev->stop               = net_close;
-       dev->hard_start_xmit    = atp_send_packet;
-       dev->set_multicast_list =
-         lp->chip_type == RTL8002 ? &set_rx_mode_8002 : &set_rx_mode_8012;
-       dev->tx_timeout         = tx_timeout;
+       dev->netdev_ops         = &atp_netdev_ops;
        dev->watchdog_timeo     = TX_TIMEOUT;
 
        res = register_netdev(dev);
@@ -547,7 +553,8 @@ static void tx_timeout(struct net_device *dev)
        dev->stats.tx_errors++;
 }
 
-static int atp_send_packet(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t atp_send_packet(struct sk_buff *skb,
+                                  struct net_device *dev)
 {
        struct net_local *lp = netdev_priv(dev);
        long ioaddr = dev->base_addr;
@@ -582,7 +589,7 @@ static int atp_send_packet(struct sk_buff *skb, struct net_device *dev)
 
        dev->trans_start = jiffies;
        dev_kfree_skb (skb);
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 
@@ -802,21 +809,22 @@ static void net_rx(struct net_device *dev)
 
 static void read_block(long ioaddr, int length, unsigned char *p, int data_mode)
 {
-
        if (data_mode <= 3) { /* Mode 0 or 1 */
                outb(Ctrl_LNibRead, ioaddr + PAR_CONTROL);
                outb(length == 8  ?  RdAddr | HNib | MAR  :  RdAddr | MAR,
                         ioaddr + PAR_DATA);
                if (data_mode <= 1) { /* Mode 0 or 1 */
-                       do  *p++ = read_byte_mode0(ioaddr);  while (--length > 0);
-               } else  /* Mode 2 or 3 */
-                       do  *p++ = read_byte_mode2(ioaddr);  while (--length > 0);
-       } else if (data_mode <= 5)
-               do      *p++ = read_byte_mode4(ioaddr);  while (--length > 0);
-       else
-               do      *p++ = read_byte_mode6(ioaddr);  while (--length > 0);
+                       do { *p++ = read_byte_mode0(ioaddr); } while (--length > 0);
+               } else { /* Mode 2 or 3 */
+                       do { *p++ = read_byte_mode2(ioaddr); } while (--length > 0);
+               }
+       } else if (data_mode <= 5) {
+               do { *p++ = read_byte_mode4(ioaddr); } while (--length > 0);
+       } else {
+               do { *p++ = read_byte_mode6(ioaddr); } while (--length > 0);
+       }
 
-    outb(EOC+HNib+MAR, ioaddr + PAR_DATA);
+       outb(EOC+HNib+MAR, ioaddr + PAR_DATA);
        outb(Ctrl_SelData, ioaddr + PAR_CONTROL);
 }
 
@@ -902,6 +910,17 @@ static void set_rx_mode_8012(struct net_device *dev)
     write_reg(ioaddr, CMR2, CMR2_IRQOUT); /* Switch back to page 0 */
 }
 
+static void set_rx_mode(struct net_device *dev)
+{
+       struct net_local *lp = netdev_priv(dev);
+
+       if (lp->chip_type == RTL8002)
+               return set_rx_mode_8002(dev);
+       else
+               return set_rx_mode_8012(dev);
+}
+
+
 static int __init atp_init_module(void) {
        if (debug)                                      /* Emit version even if no cards detected. */
                printk(KERN_INFO "%s", version);