summaryrefslogtreecommitdiffstats
path: root/net/ax25/ax25_dev.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /net/ax25/ax25_dev.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'net/ax25/ax25_dev.c')
-rw-r--r--net/ax25/ax25_dev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index 3f4f46ad4..0436db903 100644
--- a/net/ax25/ax25_dev.c
+++ b/net/ax25/ax25_dev.c
@@ -42,7 +42,7 @@
ax25_dev *ax25_dev_list = NULL;
-ax25_dev *ax25_dev_ax25dev(struct device *dev)
+ax25_dev *ax25_dev_ax25dev(struct net_device *dev)
{
ax25_dev *ax25_dev;
@@ -68,7 +68,7 @@ ax25_dev *ax25_addr_ax25dev(ax25_address *addr)
* This is called when an interface is brought up. These are
* reasonable defaults.
*/
-void ax25_dev_device_up(struct device *dev)
+void ax25_dev_device_up(struct net_device *dev)
{
ax25_dev *ax25_dev;
unsigned long flags;
@@ -112,7 +112,7 @@ void ax25_dev_device_up(struct device *dev)
#endif
}
-void ax25_dev_device_down(struct device *dev)
+void ax25_dev_device_down(struct net_device *dev)
{
ax25_dev *s, *ax25_dev;
unsigned long flags;
@@ -196,7 +196,7 @@ int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)
return 0;
}
-struct device *ax25_fwd_dev(struct device *dev)
+struct net_device *ax25_fwd_dev(struct net_device *dev)
{
ax25_dev *ax25_dev;