From: Andy P. <at...@us...> - 2002-04-09 16:20:48
|
Update of /cvsroot/linux-vax/kernel-2.4/net/802 In directory usw-pr-cvs1:/tmp/cvs-serv30559/802 Modified Files: Makefile TODO cl2llc.c cl2llc.pre hippi.c llc_sendpdu.c Log Message: synch 2.4.15 commit 18 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/net/802/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 14 Jan 2001 17:07:07 -0000 1.1.1.1 +++ Makefile 9 Apr 2002 16:20:44 -0000 1.2 @@ -58,6 +58,3 @@ cl2llc.c: cl2llc.pre sed -f ./pseudo/opcd2num.sed cl2llc.pre >cl2llc.c - -tar: - tar -cvf /dev/f1 . Index: TODO =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/net/802/TODO,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- TODO 14 Jan 2001 17:07:14 -0000 1.1.1.1 +++ TODO 9 Apr 2002 16:20:44 -0000 1.2 @@ -9,7 +9,7 @@ 2. The code is currently able to handle one connection only, there is more work in register_cl2llc_client() to make a chain of llc structures and in mac_data_indicate() to find back -the llc structure addressed by an incomming frame. +the llc structure addressed by an incoming frame. According to IEEE, connections are identified by (remote mac + local mac + dsap + ssap). dsap and ssap do not seem important: existing applications always use the same dsap/ssap. Its probably sufficient to index on Index: cl2llc.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/net/802/cl2llc.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- cl2llc.c 25 Feb 2001 23:14:55 -0000 1.1.1.2 +++ cl2llc.c 9 Apr 2002 16:20:44 -0000 1.2 @@ -162,7 +162,7 @@ * Interpret_pseudo_code() executes the actions in the connection component * state transition table. Table 4 in document on p88. * - * If this function is called to handle an incomming pdu, skb will point + * If this function is called to handle an incoming pdu, skb will point * to the buffer with the pdu and type will contain the decoded pdu type. * * If called by data_request skb points to an skb that was skb_alloc-ed by Index: cl2llc.pre =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/net/802/cl2llc.pre,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- cl2llc.pre 14 Jan 2001 17:07:16 -0000 1.1.1.1 +++ cl2llc.pre 9 Apr 2002 16:20:44 -0000 1.2 @@ -28,7 +28,7 @@ #include <linux/types.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/netdevice.h> #include <linux/skbuff.h> #include <net/p8022.h> @@ -162,7 +162,7 @@ * Interpret_pseudo_code() executes the actions in the connection component * state transition table. Table 4 in document on p88. * - * If this function is called to handle an incomming pdu, skb will point + * If this function is called to handle an incoming pdu, skb will point * to the buffer with the pdu and type will contain the decoded pdu type. * * If called by data_request skb points to an skb that was skb_alloc-ed by Index: hippi.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/net/802/hippi.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- hippi.c 14 Jan 2001 17:07:12 -0000 1.1.1.1 +++ hippi.c 9 Apr 2002 16:20:44 -0000 1.2 @@ -98,7 +98,7 @@ memcpy(&skb->private.ifield, daddr + 2, 4); return HIPPI_HLEN; } - return -HIPPI_HLEN; + return -((int)HIPPI_HLEN); } Index: llc_sendpdu.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/net/802/llc_sendpdu.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- llc_sendpdu.c 25 Feb 2001 23:14:55 -0000 1.1.1.2 +++ llc_sendpdu.c 9 Apr 2002 16:20:44 -0000 1.2 @@ -98,7 +98,7 @@ /* * Sendpdu() constructs an output frame in a new skb and - * gives it to the MAC layer for transmision. + * gives it to the MAC layer for transmission. * This function is not used to send I pdus. * No queues are updated here, nothing is saved for retransmission. * @@ -186,7 +186,7 @@ /* * llc_sendipdu() Completes an I pdu in an existing skb and gives it - * to the MAC layer for transmision. + * to the MAC layer for transmission. * Parameter "type" must be either I_CMD or I_RSP. * The skb is not freed after xmit, it is kept in case a retransmission * is requested. If needed it can be picked up again from the rtq. |