vserver 1.9.3

[linux-2.6.git] / drivers / net / acenic.h

diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index eb516e1..6eb134e 100644 (file)
--- a/drivers/net/acenic.h
+++ b/drivers/net/acenic.h
@@ -693,7 +693,7 @@ struct ace_private
        int                     board_idx;
        u16                     pci_command;
        u8                      pci_latency;
-       char                    name[48];
+       const char              *name;
 #ifdef INDEX_DEBUG
        spinlock_t              debug_lock
                                __attribute__ ((aligned (SMP_CACHE_BYTES)));
@@ -790,7 +790,6 @@ static void ace_tasklet(unsigned long dev);
 static void ace_dump_trace(struct ace_private *ap);
 static void ace_set_multicast_list(struct net_device *dev);
 static int ace_change_mtu(struct net_device *dev, int new_mtu);
-static int ace_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 static int ace_set_mac_addr(struct net_device *dev, void *p);
 static void ace_set_rxtx_parms(struct net_device *dev, int jumbo);
 static int ace_allocate_descriptors(struct net_device *dev);