patch-2.4.0-test12 linux/net/802/fddi.c

• Lines: 24
• Date: Tue Nov 28 21:53:45 2000
• Orig file: v2.4.0-test11/linux/net/802/fddi.c
• Orig date: Wed Aug 18 11:38:48 1999

diff -u --recursive --new-file v2.4.0-test11/linux/net/802/fddi.c linux/net/802/fddi.c
@@ -22,7 +22,8 @@
  *		2 of the License, or (at your option) any later version.
  *
  *	Changes
- *		Alan Cox	:	New arp/rebuild header
+ *		Alan Cox		:	New arp/rebuild header
+ *		Maciej W. Rozycki	:	IPv6 support
  */
  
 #include <linux/config.h>
@@ -57,11 +58,11 @@
 	int hl = FDDI_K_SNAP_HLEN;
 	struct fddihdr *fddi;
 	
-	if(type != ETH_P_IP && type != ETH_P_ARP)
+	if(type != ETH_P_IP && type != ETH_P_IPV6 && type != ETH_P_ARP)
 		hl=FDDI_K_8022_HLEN-3;
 	fddi = (struct fddihdr *)skb_push(skb, hl);
 	fddi->fc			 = FDDI_FC_K_ASYNC_LLC_DEF;
-	if(type == ETH_P_IP || type == ETH_P_ARP)
+	if(type == ETH_P_IP || type == ETH_P_IPV6 || type == ETH_P_ARP)
 	{
 		fddi->hdr.llc_snap.dsap		 = FDDI_EXTENDED_SAP;
 		fddi->hdr.llc_snap.ssap		 = FDDI_EXTENDED_SAP;