patch-2.1.15 linux/drivers/net/slip.c

Next file: linux/drivers/net/smc-mca.c
Previous file: linux/drivers/net/shaper.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.14/linux/drivers/net/slip.c linux/drivers/net/slip.c
@@ -517,24 +517,6 @@
 
 /* Return the frame type ID.  This is normally IP but maybe be AX.25. */
 
-/* Fill in the MAC-level header. Not used by SLIP. */
-static int
-sl_header(struct sk_buff *skb, struct device *dev, unsigned short type,
-	  void *daddr, void *saddr, unsigned len)
-{
-	return 0;
-}
-
-
-/* Rebuild the MAC-level header.  Not used by SLIP. */
-static int
-sl_rebuild_header(void *buff, struct device *dev, unsigned long raddr,
-		  struct sk_buff *skb)
-{
-	return 0;
-}
-
-
 /* Open the low-level part of the SLIP channel. Easy! */
 static int
 sl_open(struct device *dev)
@@ -1180,20 +1162,18 @@
 	dev->hard_start_xmit	= sl_xmit;
 	dev->open		= sl_open_dev;
 	dev->stop		= sl_close;
-	dev->hard_header	= sl_header;
 	dev->get_stats	        = sl_get_stats;
 	dev->hard_header_len	= 0;
 	dev->addr_len		= 0;
 	dev->type		= ARPHRD_SLIP + SL_MODE_DEFAULT;
 	dev->tx_queue_len	= 10;
-	dev->rebuild_header	= sl_rebuild_header;
 
 	for (i = 0; i < DEV_NUMBUFFS; i++)  {
 		skb_queue_head_init(&dev->buffs[i]);
 	}
 
 	/* New-style flags. */
-	dev->flags		= 0;
+	dev->flags		= IFF_NOARP|IFF_MULTICAST;
 	dev->family		= AF_INET;
 	dev->pa_addr		= 0;
 	dev->pa_brdaddr	        = 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov