diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2004-02-06 10:56:48 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-02-06 10:56:48 -0500 |
| commit | 56549962cdf1c243be200a6a92de37df1f7418c6 (patch) | |
| tree | 1ece86cc29c255c4dabb44809d1723116b321a60 /include/linux | |
| parent | 2f4fcd07bb3822ec4c570fbb8ddb72663b11c5f1 (diff) | |
| parent | 5747eaf7280183ba8d1de092d737d01f21624af7 (diff) | |
Merge redhat.com:/spare/repo/netdev-2.6/netdev-alloc-5
into redhat.com:/spare/repo/net-drivers-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/arcdevice.h | 1 | ||||
| -rw-r--r-- | include/linux/com20020.h | 1 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 7 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h index 66c7495e1834..3a3759fcebdb 100644 --- a/include/linux/arcdevice.h +++ b/include/linux/arcdevice.h @@ -331,6 +331,7 @@ void arcnet_dump_packet(struct net_device *dev, int bufnum, char *desc); void arcnet_unregister_proto(struct ArcProto *proto); irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs); void arcdev_setup(struct net_device *dev); +struct net_device *alloc_arcdev(char *name); void arcnet_rx(struct net_device *dev, int bufnum); #endif /* __KERNEL__ */ diff --git a/include/linux/com20020.h b/include/linux/com20020.h index 2c5fc4294a06..c88d530bf637 100644 --- a/include/linux/com20020.h +++ b/include/linux/com20020.h @@ -29,7 +29,6 @@ int com20020_check(struct net_device *dev); int com20020_found(struct net_device *dev, int shared); -void com20020_remove(struct net_device *dev); /* The number of low I/O ports used by the card. */ #define ARCNET_TOTAL_SIZE 8 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1a77c3caf115..ebc9426684ba 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -474,8 +474,15 @@ struct net_device /* class/net/name entry */ struct class_device class_dev; struct net_device_stats* (*last_stats)(struct net_device *); + /* how much padding had been added by alloc_netdev() */ + int padded; }; +static inline void *netdev_priv(struct net_device *dev) +{ + return (char *)dev + ((sizeof(struct net_device) + 31) & ~31); +} + #define SET_MODULE_OWNER(dev) do { } while (0) /* Set the sysfs physical device reference for the network logical device * if set prior to registration will cause a symlink during initialization. |