summaryrefslogtreecommitdiffstats
path: root/net/appletalk
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-03-03 01:22:27 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-03-03 01:22:27 +0000
commitf9bbe9da79dbc8557c74efeb158b431cd67ace52 (patch)
tree3220d014a35f9d88a48668a1468524e988daebff /net/appletalk
parent3d697109c1ff85ef563aec3d5e113ef225ed2792 (diff)
Upgrade to 2.1.73.
Diffstat (limited to 'net/appletalk')
-rw-r--r--net/appletalk/ddp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 9574da96c..335f17e16 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -56,7 +56,7 @@
#include <linux/if_ether.h>
#include <linux/notifier.h>
#include <linux/netdevice.h>
-/*#include <linux/inetdevice.h> -- coming soon */
+#include <linux/inetdevice.h>
#include <linux/route.h>
#include <linux/inet.h>
#include <linux/etherdevice.h>
@@ -1843,11 +1843,9 @@ static int atalk_ioctl(struct socket *sock,unsigned int cmd, unsigned long arg)
case SIOCGIFMTU:
case SIOCGIFCONF:
case SIOCADDMULTI:
- case SIOCDELMULTI:
+ case SIOCDELMULTI:
case SIOCGIFCOUNT:
-#if 0 /* Also coming in the IP merge */
case SIOCGIFINDEX:
-#endif
case SIOCGIFNAME:
return ((dev_ioctl(cmd,(void *) arg)));