Merge master.kernel.org:/home/davem/BK/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

include/linux/atalk.h

+#ifndef __LINUX_ATALK_H__
+#define __LINUX_ATALK_H__
 /*
  * AppleTalk networking structures
  *
  * The following are directly referenced from the University Of Michigan
  * netatalk for compatibility reasons.
  */
-
-#ifndef __LINUX_ATALK_H__
-#define __LINUX_ATALK_H__
-
 #define ATPORT_FIRST	1
 #define ATPORT_RESERVED	128
 #define ATPORT_LAST	254		/* 254 is only legal on localtalk */ 
@@ -20,49 +18,51 @@
 
 #define SIOCATALKDIFADDR       (SIOCPROTOPRIVATE + 0)
 
-struct at_addr 
-{
+struct atalk_addr {
 	__u16	s_net;
 	__u8	s_node;
 };
 
-struct sockaddr_at 
-{
+struct sockaddr_at {
 	sa_family_t	  sat_family;
 	__u8		  sat_port;
-	struct at_addr	sat_addr;
-	char		sat_zero[ 8 ];
+	struct atalk_addr sat_addr;
+	char		  sat_zero[8];
 };
 
-struct netrange 
-{
+struct atalk_netrange {
 	__u8	nr_phase;
 	__u16	nr_firstnet;
 	__u16	nr_lastnet;
 };
 
-struct atalk_route
-{
+struct atalk_route {
 	struct net_device  *dev;
-	struct at_addr target;
-	struct at_addr gateway;
+	struct atalk_addr  target;
+	struct atalk_addr  gateway;
 	int		   flags;
 	struct atalk_route *next;
 };
 
-struct atalk_iface
-{
+/**
+ *	struct atalk_iface - AppleTalk Interface
+ *	@dev - Network device associated with this interface
+ *	@address - Our address
+ *	@status - What are we doing?
+ *	@nets - Associated direct netrange
+ *	@next - next element in the list of interfaces
+ */
+struct atalk_iface {
 	struct net_device	*dev;
-	struct at_addr address;		/* Our address */
-	int status;			/* What are we doing? */
+	struct atalk_addr	address;
+	int			status;
 #define ATIF_PROBE	1		/* Probing for an address */
 #define ATIF_PROBE_FAIL	2		/* Probe collided */
-	struct netrange nets;		/* Associated direct netrange */
+	struct atalk_netrange	nets;
 	struct atalk_iface	*next;
 };
 	
-struct atalk_sock
-{
+struct atalk_sock {
 	unsigned short	dest_net;
 	unsigned short	src_net;
 	unsigned char	dest_node;
@@ -75,12 +75,15 @@ struct atalk_sock
 
 #include <asm/byteorder.h>
 
-struct ddpehdr
-{
+struct ddpehdr {
 #ifdef __LITTLE_ENDIAN_BITFIELD
-	__u16	deh_len:10, deh_hops:4, deh_pad:2;
+	__u16	deh_len:10,
+		deh_hops:4,
+		deh_pad:2;
 #else
-	__u16	deh_pad:2, deh_hops:4, deh_len:10;
+	__u16	deh_pad:2,
+		deh_hops:4,
+		deh_len:10;
 #endif
 	__u16	deh_sum;
 	__u16	deh_dnet;
@@ -92,30 +95,35 @@ struct ddpehdr
 	/* And netatalk apps expect to stick the type in themselves */
 };
 
+static __inline__ struct ddpehdr *ddp_hdr(struct sk_buff *skb)
+{
+	return (struct ddpehdr *)skb->h.raw;
+}
+
 /*
  *	Don't drop the struct into the struct above.  You'll get some
  *	surprise padding.
  */
- 
-struct ddpebits
-{
+struct ddpebits {
 #ifdef __LITTLE_ENDIAN_BITFIELD
-	__u16	deh_len:10, deh_hops:4, deh_pad:2;
+	__u16	deh_len:10,
+		deh_hops:4,
+		deh_pad:2;
 #else
-	__u16	deh_pad:2, deh_hops:4, deh_len:10;
+	__u16	deh_pad:2,
+		deh_hops:4,
+		deh_len:10;
 #endif
 };
 
-/*
- *	Short form header
- */
- 
-struct ddpshdr
-{
+/* Short form header */
+struct ddpshdr {
 #ifdef __LITTLE_ENDIAN_BITFIELD
-	__u16	dsh_len:10, dsh_pad:6;
+	__u16	dsh_len:10,
+		dsh_pad:6;
 #else
-	__u16	dsh_pad:6, dsh_len:10;
+	__u16	dsh_pad:6,
+		dsh_len:10;
 #endif
 	__u8	dsh_dport;
 	__u8	dsh_sport;
@@ -123,9 +131,7 @@ struct ddpshdr
 };
 
 /* AppleTalk AARP headers */
-
-struct elapaarp
-{
+struct elapaarp {
 	__u16	hw_type;
 #define AARP_HW_TYPE_ETHERNET		1
 #define AARP_HW_TYPE_TOKENRING		2
@@ -147,29 +153,43 @@ struct elapaarp
 	__u8	pa_dst_node		__attribute__ ((packed));	
 };
 
-#define AARP_EXPIRY_TIME	(5*60*HZ)	/* Not specified - how long till we drop a resolved entry */
-#define AARP_HASH_SIZE		16		/* Size of hash table */
-#define AARP_TICK_TIME		(HZ/5)		/* Fast retransmission timer when resolving */
-#define AARP_RETRANSMIT_LIMIT	10		/* Send 10 requests then give up (2 seconds) */
-#define AARP_RESOLVE_TIME	(10*HZ)		/* Some value bigger than total retransmit time + a bit for last reply to appear and to stop continual requests */
+static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb)
+{
+	return (struct elapaarp *)skb->h.raw;
+}
+
+/* Not specified - how long till we drop a resolved entry */
+#define AARP_EXPIRY_TIME	(5 * 60 * HZ)
+/* Size of hash table */
+#define AARP_HASH_SIZE		16
+/* Fast retransmission timer when resolving */
+#define AARP_TICK_TIME		(HZ / 5)
+/* Send 10 requests then give up (2 seconds) */
+#define AARP_RETRANSMIT_LIMIT	10
+/*
+ * Some value bigger than total retransmit time + a bit for last reply to
+ * appear and to stop continual requests
+ */
+#define AARP_RESOLVE_TIME	(10 * HZ)
 
 extern struct datalink_proto *ddp_dl, *aarp_dl;
 extern void aarp_proto_init(void);
-/* Inter module exports */
 
-/*
- *	Give a device find its atif control structure
- */
+/* Inter module exports */
 
+/* Give a device find its atif control structure */
 static inline struct atalk_iface *atalk_find_dev(struct net_device *dev)
 {
 	return dev->atalk_ptr;
 }
 
-extern struct at_addr *atalk_find_dev_addr(struct net_device *dev);
-extern struct net_device *atrtr_get_dev(struct at_addr *sa);
-extern int aarp_send_ddp(struct net_device *dev,struct sk_buff *skb, struct at_addr *sa, void *hwaddr);
-extern void aarp_send_probe(struct net_device *dev, struct at_addr *addr);
+extern struct atalk_addr *atalk_find_dev_addr(struct net_device *dev);
+extern struct net_device *atrtr_get_dev(struct atalk_addr *sa);
+extern int		 aarp_send_ddp(struct net_device *dev,
+				       struct sk_buff *skb,
+				       struct atalk_addr *sa, void *hwaddr);
+extern void		 aarp_send_probe(struct net_device *dev,
+					 struct atalk_addr *addr);
 extern void		 aarp_device_down(struct net_device *dev);
 
 #ifdef MODULE

include/linux/if_ether.h

@@ -96,6 +96,6 @@ struct ethhdr
 	unsigned char	h_dest[ETH_ALEN];	/* destination eth addr	*/
 	unsigned char	h_source[ETH_ALEN];	/* source ether addr	*/
 	unsigned short	h_proto;		/* packet type ID field	*/
-};
+} __attribute__((packed));
 
 #endif	/* _LINUX_IF_ETHER_H */

include/linux/ipx.h

@@ -24,15 +24,13 @@ struct sockaddr_ipx
 #define IPX_DLTITF	0
 #define IPX_CRTITF	1
 
-typedef struct ipx_route_definition
-{
+struct ipx_route_definition {
 	__u32         ipx_network;
 	__u32         ipx_router_network;
 	unsigned char ipx_router_node[IPX_NODE_LEN];
-}	ipx_route_definition;
+};
 
-typedef struct ipx_interface_definition
-{
+struct ipx_interface_definition {
 	__u32         ipx_network;
 	unsigned char ipx_device[16];
 	unsigned char ipx_dlink_type;
@@ -47,13 +45,12 @@ typedef struct ipx_interface_definition
 #define IPX_PRIMARY		1
 #define IPX_INTERNAL		2
 	unsigned char ipx_node[IPX_NODE_LEN];
-}	ipx_interface_definition;
+};
 	
-typedef struct ipx_config_data
-{
+struct ipx_config_data {
 	unsigned char	ipxcfg_auto_select_primary;
 	unsigned char	ipxcfg_auto_create_interfaces;
-}	ipx_config_data;
+};
 
 /*
  * OLD Route Definition for backward compatibility.
@@ -77,13 +74,4 @@ struct ipx_route_def
 #define SIOCAIPXPRISLT		(SIOCPROTOPRIVATE+1)
 #define SIOCIPXCFGDATA		(SIOCPROTOPRIVATE+2)
 #define SIOCIPXNCPCONN		(SIOCPROTOPRIVATE+3)
-
-#ifdef __KERNEL__
-#include <linux/skbuff.h>
-
-extern int ipxrtr_route_skb(struct sk_buff *);
-extern int ipx_if_offset(unsigned long ipx_net_number);
-extern void ipx_remove_socket(struct sock *sk);
-#endif /* def __KERNEL__ */
-
 #endif /* def _IPX_H_ */

include/linux/skbuff.h

@@ -182,7 +182,6 @@ struct sk_buff {
 		struct icmphdr	*icmph;
 		struct igmphdr	*igmph;
 		struct iphdr	*ipiph;
-		struct spxhdr	*spxh;
 		unsigned char	*raw;
 	} h;
 
@@ -190,7 +189,6 @@ struct sk_buff {
 		struct iphdr	*iph;
 		struct ipv6hdr	*ipv6h;
 		struct arphdr	*arph;
-		struct ipxhdr	*ipxh;
 		unsigned char	*raw;
 	} nh;
 

include/net/ipx.h

@@ -14,12 +14,11 @@
 #include <net/datalink.h>
 #include <linux/ipx.h>
 
-typedef struct
-{
+struct ipx_address {
 	__u32   net;
 	__u8    node[IPX_NODE_LEN]; 
 	__u16   sock;
-} ipx_address;
+};
 
 #define ipx_broadcast_node	"\377\377\377\377\377\377"
 #define ipx_this_node           "\0\0\0\0\0\0"
@@ -39,11 +38,16 @@ struct ipxhdr
 #define IPX_TYPE_SPX		0x05	/* SPX protocol */
 #define IPX_TYPE_NCP		0x11	/* $lots for docs on this (SPIT) */
 #define IPX_TYPE_PPROP		0x14	/* complicated flood fill brdcast */
-	ipx_address	ipx_dest __attribute__ ((packed));
-	ipx_address	ipx_source __attribute__ ((packed));
+	struct ipx_address	ipx_dest __attribute__ ((packed));
+	struct ipx_address	ipx_source __attribute__ ((packed));
 };
 
-typedef struct ipx_interface {
+static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb)
+{
+	return (struct ipxhdr *)skb->h.raw;
+}
+
+struct ipx_interface {
 	/* IPX address */
 	__u32           if_netnum;
 	unsigned char	if_node[IPX_NODE_LEN];
@@ -65,16 +69,16 @@ typedef struct ipx_interface {
 	unsigned char	if_primary;
 	
 	struct ipx_interface	*if_next;
-}	ipx_interface;
+};
 
-typedef struct ipx_route {
+struct ipx_route {
 	__u32         ir_net;
-	ipx_interface *ir_intrfc;
+	struct ipx_interface	*ir_intrfc;
 	unsigned char ir_routed;
 	unsigned char ir_router_node[IPX_NODE_LEN];
 	struct ipx_route	*ir_next;
 	atomic_t      refcnt;
-}	ipx_route;
+};
 
 #ifdef __KERNEL__
 struct ipx_cb {
@@ -88,8 +92,8 @@ struct ipx_cb {
 };
 
 struct ipx_opt {
-	ipx_address	dest_addr;
-	ipx_interface	*intrfc;
+	struct ipx_address	dest_addr;
+	struct ipx_interface	*intrfc;
 	unsigned short	port;
 #ifdef CONFIG_IPX_INTERN
 	unsigned char	node[IPX_NODE_LEN];
@@ -106,7 +110,4 @@ struct ipx_opt {
 #define IPX_MIN_EPHEMERAL_SOCKET	0x4000
 #define IPX_MAX_EPHEMERAL_SOCKET	0x7fff
 
-extern int ipx_register_spx(struct proto_ops **, struct net_proto_family *);
-extern int ipx_unregister_spx(void);
-
 #endif /* def _NET_INET_IPX_H_ */

include/net/llc.h

-#include <linux/skbuff.h>
-
-#define LLC_MODULE
-
-typedef struct llc_struct llc;
-typedef struct llc_struct *llcptr;
-
-/*
- *	LLC private data area structure.
- */
-
-struct llc_struct
-{ 
-	char eye[4];			/* To recognize llc area in dump */
-	int retry_count;		/* LLC link state variables */
-	unsigned char name[9];		/* name of this llc instance */
-	unsigned char s_flag;
-	unsigned char p_flag;
-	unsigned char f_flag;
-	unsigned char data_flag;
-	unsigned char cause_flag;
-	unsigned char vs;		/* Send state variable */
-	unsigned char vr;		/* Receive state variable */
-	unsigned char remote_busy;
-	unsigned char state;		/* Current state of type2 llc procedure */
-	int n1;				/* Maximum number of bytes in I pdu 7.8.2 */
-	int n2;				/* Naximum number of retransmissions 7.8.2 */
-	unsigned char k;		/* Transmit window size 7.8.4, tw in IBM doc*/ 
-	unsigned char rw;		/* Receive window size */
-	struct 
-	{     				
-		/*
-		 *	FRMR_RSP info field structure: 5.4.2.3.5 p55
-		 */
-
-		unsigned char cntl1;
-		unsigned char cntl2;
-		unsigned char vs;
-		unsigned char vr_cr;
-		unsigned char xxyz;
-	} frmr_info_fld;
-
-	/*
-	 *	Timers in 7.8.1 page 78 
-	 */
-
-#define P_TIMER         0
-#define REJ_TIMER       1
-#define ACK_TIMER       2 
-#define BUSY_TIMER      3
-	unsigned long timer_expire_time[4];	
-	unsigned char timer_state[4];	/* The state of each timer */
-#define TIMER_IDLE      0
-#define TIMER_RUNNING   1
-#define TIMER_EXPIRED   2
-	unsigned long timer_interval[4]; 
-	struct timer_list tl[4];
-
-	/* 
-	 *	Client entry point, called by the LLC.
-	 */
-	 
-	void	(*llc_event)(struct llc_struct *);
-	
-	/*
-	 *	Mux and Demux variables
-	 */
-	 
-	char * client_data;		/* Pointer to clients context */
-	unsigned char local_sap;
-	unsigned char remote_sap ;
-	char remote_mac[MAX_ADDR_LEN];  /* MAC address of remote session partner */ 
-	struct net_device *dev;		/* Device we are attached to */
-		     
-	unsigned char llc_mode;		/* See doc 7.1 on p70 */
-#define MODE_ADM 1
-#define MODE_ABM 2
-
-	int llc_callbacks;		/* Pending callbacks */
-#define LLC_CONN_INDICATION	1	/* We have to ensure the names don't */
-#define LLC_CONN_CONFIRM	2	/* mix up with the 802 state table */
-#define LLC_DATA_INDIC		4
-#define LLC_DISC_INDICATION	8
-#define LLC_RESET_INDIC_LOC	16
-#define LLC_RESET_INDIC_REM	32
-#define LLC_RST_CONFIRM		64
-#define LLC_FRMR_RECV		128
-#define LLC_FRMR_SENT		256
-#define LLC_REMOTE_BUSY		512
-#define LLC_REMOTE_NOTBUSY	1024
-#define LLC_TEST_INDICATION	2048
-#define LLC_XID_INDICATION	4096
-#define LLC_UI_DATA		8192
-
-	struct sk_buff *inc_skb;	/* Saved data buffer for indications */
-	
-	struct sk_buff_head rtq;	/* Retransmit queue */
-	struct sk_buff_head atq;	/* Await transit queue */
-      
-	unsigned char xid_count;
-
-	struct llc_struct *nextllc;	/* ptr to next llc struct in proto chain */
-};
-
-#define ADD_TO_RTQ(skb) skb_queue_tail(&lp->rtq,skb)
-#define ADD_TO_ATQ(skb) skb_queue_tail(&lp->atq,skb)
-
-void 		llc_cancel_timers(llcptr lp);
-int		llc_decode_frametype(frameptr fr);
-llcptr 		llc_find(void);
-int		llc_free_acknowledged_skbs(llcptr lp, unsigned char ack);
-void		llc_handle_xid_indication( char *chsp, short int ll, char *xid_data);
-void		llc_interpret_pseudo_code(llcptr lp, int pc_label, struct sk_buff *skb, char type);
-void		llc_add_to_queue(struct sk_buff *skb, struct sk_buff **f, struct sk_buff **b);
-void		llc_process_otype2_frame(llcptr lp, struct sk_buff *skb, char type);
-struct sk_buff *llc_pull_from_atq(llcptr lp); 
-int 		llc_resend_ipdu(llcptr lp, unsigned char ack_nr, unsigned char type, char p);
-void 		llc_sendpdu(llcptr lp, char type, char pf, int data_len, char *pdu_data);
-void 		llc_sendipdu(llcptr lp, char type, char pf, struct sk_buff *skb);
-void		llc_start_timer(llcptr lp, int t);
-void		llc_stop_timer(llcptr lp, int t);
-void		llc_timer_expired(llcptr lp, int t);
-int		llc_validate_seq_nos(llcptr lp, frameptr fr);
-
-int		llc_data_request(llcptr lp, struct sk_buff *skb);
-void		llc_unit_data_request(llcptr lp, int ll, char * data);
-void		llc_disconnect_request(llcptr lp);
-void		llc_connect_request(llcptr lp);
-void		llc_xid_request(llcptr lp, char opt, int data_len, char *pdu_data);
-void		llc_test_request(llcptr lp, int data_len, char *pdu_data);
-
-int		register_cl2llc_client(llcptr llc, const char *device, void (*ops)(llcptr), u8 *rmac, u8 ssap, u8 dsap);
-void		unregister_cl2llc_client(llcptr lp);
-int 		llc_mac_data_indicate(llcptr lp, struct sk_buff *skb );
-

include/net/llc_pdu.h

@@ -191,34 +191,34 @@
        (info->ind_bits = ( (info->ind_bits & 0xEF) | (((u8) ind) & 0x10)))
 
 /* Sequence-numbered PDU format (4 bytes in length) */
-typedef struct llc_pdu_sn {
+struct llc_pdu_sn {
 	u8 dsap;
 	u8 ssap;
 	u8 ctrl_1;
 	u8 ctrl_2;
-} llc_pdu_sn_t;
+};
 
 /* Un-numbered PDU format (3 bytes in length) */
-typedef struct llc_pdu_un {
+struct llc_pdu_un {
 	u8 dsap;
 	u8 ssap;
 	u8 ctrl_1;
-} llc_pdu_un_t;
+};
 
 /* LLC Type 1 XID command/response information fields format */
-typedef struct llc_xid_info {
+struct llc_xid_info {
 	u8 fmt_id;	/* always 0x18 for LLC */
 	u8 type;	/* different if NULL/non-NULL LSAP */
 	u8 rw;		/* sender receive window */
-} llc_xid_info_t;
+};
 
 /* LLC Type 2 FRMR response information field format */
-typedef struct llc_frmr_info {
+struct llc_frmr_info {
 	u16 rej_pdu_ctrl;	/* bits 1-8 if U-PDU */
 	u8  curr_ssv;		/* current send state variable val */
 	u8  curr_rsv;		/* current receive state variable */
 	u8  ind_bits;		/* indicator bits set with macro */
-} llc_frmr_info_t;
+};
 
 extern void llc_pdu_set_cmd_rsp(struct sk_buff *skb, u8 type);
 extern void llc_pdu_set_pf_bit(struct sk_buff *skb, u8 bit_value);
@@ -246,7 +246,8 @@ extern int llc_pdu_init_as_xid_rsp(struct sk_buff *skb, u8 svcs_supported,
 				   u8 rx_window);
 extern int llc_pdu_init_as_test_rsp(struct sk_buff *skb,
 				    struct sk_buff *ev_skb);
-extern int llc_pdu_init_as_frmr_rsp(struct sk_buff *skb, llc_pdu_sn_t *prev_pdu,
+extern int llc_pdu_init_as_frmr_rsp(struct sk_buff *skb,
+				    struct llc_pdu_sn *prev_pdu,
 				    u8 f_bit, u8 vs, u8 vr, u8 vzyxw);
 extern int llc_pdu_init_as_rr_rsp(struct sk_buff *skb, u8 f_bit, u8 nr);
 extern int llc_pdu_init_as_rej_rsp(struct sk_buff *skb, u8 f_bit, u8 nr);

include/net/spx.h

-#ifndef __NET_SPX_H
-#define __NET_SPX_H
-
-#include <net/ipx.h>
-
-struct spxhdr
-{	__u8	cctl;	
-	__u8	dtype;
-#define SPX_DTYPE_ECONN	0xFE	/* Finished */
-#define SPX_DTYPE_ECACK	0xFF	/* Ok */
-	__u16	sconn;	/* Connection ID */
-	__u16	dconn;	/* Connection ID */
-	__u16	sequence;
-	__u16	ackseq;
-	__u16	allocseq;
-};
-
-struct ipxspxhdr
-{	struct ipxhdr	ipx;
-	struct spxhdr	spx;
-};
-
-#define	SPX_SYS_PKT_LEN	(sizeof(struct ipxspxhdr))
-
-#ifdef __KERNEL__
-struct spx_opt
-{	int	state;
-	int	sndbuf;
-	int	retries;	/* Number of WD retries */
-	int	retransmits;	/* Number of retransmits */
-	int	max_retries;
-	int	wd_interval;
-	void	*owner;
-	__u16	dest_connid;	/* Net order */
-	__u16	source_connid;	/* Net order */
-	__u16	sequence;	/* Host order - our current pkt # */
-	__u16	alloc;		/* Host order - max seq we can rcv now */
-	__u16	rmt_ack;	/* Host order - last pkt ACKd by remote */
-	__u16	rmt_seq;
-	__u16	acknowledge;
-	__u16	rmt_alloc;	/* Host order - max seq remote can handle now */
-	ipx_address	dest_addr;
-	ipx_address	source_addr;
-	struct timer_list	watchdog;	/* Idle watch */
-	struct timer_list	retransmit;	/* Retransmit timer */
-	struct sk_buff_head     rcv_queue;
-	struct sk_buff_head	transmit_queue;
-	struct sk_buff_head     retransmit_queue;
-};
-
-#define spx_sk(__sk) ((struct spx_opt *)(((struct sock *)(__sk)) + 1))
-
-/* Packet connectino control defines */
-#define CCTL_SPXII_XHD  0x01    /* SPX2 extended header */
-#define CCTL_SPX_UNKNOWN 0x02   /* Unknown (unused ??) */
-#define CCTL_SPXII_NEG  0x04    /* Negotiate size */
-#define CCTL_SPXII      0x08    /* Set for SPX2 */
-#define CCTL_EOM        0x10    /* End of message marker */
-#define CCTL_URG        0x20    /* Urgent marker in SPP (not used in SPX?) */
-#define CCTL_ACK        0x40    /* Send me an ACK */
-#define CCTL_CTL        0x80    /* Control message */
-#define CCTL_SYS        CCTL_CTL        /* Spec uses CCTL_SYS */
-
-/* Connection state defines */
-#define SPX_CLOSED	7
-#define	SPX_CONNECTING	8
-#define SPX_CONNECTED	9
-
-/* Packet transmit types - Internal */
-#define DATA	0	/* Data */
-#define ACK	1	/* Data ACK */
-#define WDACK	2	/* WD ACK */
-#define CONACK	3	/* Connection Request ACK */
-#define	CONREQ	4	/* Connection Request */
-#define WDREQ	5	/* WD Request */
-#define	DISCON	6	/* Informed Disconnect */
-#define	DISACK	7	/* Informed Disconnect ACK */
-#define RETRAN	8	/* Int. Retransmit of packet */
-#define TQUEUE	9	/* Int. Transmit of a queued packet */
-
-/*
- * These are good canidates for IOcontrol calls
- */
-
-/* Watchdog defines */
-#define VERIFY_TIMEOUT  3 * HZ
-#define ABORT_TIMEOUT   30 * HZ
-
-/* Packet retransmit defines */
-#define RETRY_COUNT     10
-#define RETRY_TIME      1 * HZ
-#define MAX_RETRY_DELAY 5 * HZ
-
-#endif /* __KERNEL__ */
-#endif /* def __NET_SPX_H */

net/802/Makefile

@@ -2,15 +2,14 @@
 # Makefile for the Linux 802.x protocol layers.
 #
 
-export-objs		:= llc_macinit.o p8022.o psnap.o
+export-objs		:= p8022.o psnap.o tr.o
 
 obj-y			:= p8023.o
 
 # Check the p8022 selections against net/core/Makefile.
 obj-$(CONFIG_SYSCTL)	+= sysctl_net_802.o
-obj-$(CONFIG_LLC)	+= p8022.o psnap.o llc_sendpdu.o llc_utility.o \
-			   		   cl2llc.o llc_macinit.o	
-obj-$(CONFIG_TR)	+= p8022.o psnap.o tr.o
+obj-$(CONFIG_LLC)	+= p8022.o psnap.o
+obj-$(CONFIG_TR)	+= p8022.o psnap.o tr.o sysctl_net_802.o
 obj-$(CONFIG_NET_FC)	+=                 fc.o
 obj-$(CONFIG_FDDI)	+=                 fddi.o
 obj-$(CONFIG_HIPPI)	+=                 hippi.o
@@ -18,25 +17,3 @@ obj-$(CONFIG_IPX)	+= p8022.o psnap.o
 obj-$(CONFIG_ATALK)	+= p8022.o psnap.o
 
 include $(TOPDIR)/Rules.make
-
-# Dependencies on generated files need to be listed explicitly
-
-$(obj)/cl2llc.o: $(obj)/transit/pdutr.h $(obj)/transit/timertr.h \
-		 $(obj)/pseudo/pseudocode.h
-
-# Generated files
-
-$(obj)/transit/pdutr.h: $(src)/transit/pdutr.pre $(src)/transit/compile.awk
-	awk -f $(src)/transit/compile.awk $< >$@
-
-$(obj)/transit/timertr.h: $(src)/transit/timertr.pre $(src)/transit/compile.awk
-	awk -f $(src)/transit/compile.awk $< >$@
-
-$(obj)/pseudo/pseudocode.h: $(src)/pseudo/pseudocode \
-			    $(src)/pseudo/opcd2num.sed \
-			    $(src)/pseudo/compile.awk
-	sed -f $(src)/pseudo/opcd2num.sed $< | \
-	awk -f $(src)/pseudo/compile.awk >$@
-
-$(obj)/cl2llc.c: $(src)/cl2llc.pre $(src)/pseudo/opcd2num.sed
-	sed -f $(src)/pseudo/opcd2num.sed $< >$@

net/802/TODO

-Remaining Problems:
-
-1. Serialization of access to variables in the llc structure
-by mac_data_indicate(), timer expired functions, and data_request() .
-There is not serialization of any kind right now.
-While testing, I have not seen any problems that stem from this lack of
-serialization, but it wories me...
-
-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 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 
-the remote mac only. 
- 
-3. There is no test to see if the transmit window is full in data_request()
-as described in the doc p73, "7.5.1 Sending I PDUs" 3th alinea.
-The pdus presented to data_request() could probably go on the 
-awaiting-transmit-queue (atq). The real difficulty is coding a test
-to see if the transmit window is used up and to send the queue
-when space in the window becomes available.
-As I have no network layer that can generate a continous flow of pdus it is
-difficult to simulate a remote busy condition and hence to test the code
-to handle it.
- 
-4. A simple flow control algorithm, steering the size of the transmit
-window would be nice to have.

net/802/llc_macinit.c

-/*
- * NET		An implementation of the IEEE 802.2 LLC protocol for the
- *		LINUX operating system.  LLC is implemented as a set of
- *		state machines and callbacks for higher networking layers.
- *
- *		Code for initialization, termination, registration and
- *		MAC layer glue.
- *
- *		Written by Tim Alpaerts, Tim_Alpaerts@toyota-motor-europe.com
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- *	Changes
- *		Alan Cox	:	Chainsawed to Linux format
- *					Added llc_ to names
- *					Started restructuring handlers
- *
- *              Horst von Brand :      Add #include <linux/string.h>
- */
-
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/unistd.h>
-#include <linux/string.h>
-#include <linux/netdevice.h>
-#include <linux/init.h>
-#include <net/p8022.h>
-
-#include <asm/byteorder.h>
-
-#include <net/llc_frame.h>
-#include <net/llc.h>
-
-/*
- *	All incoming frames pass thru mac_data_indicate().
- *	On entry the llc structure related to the frame is passed as parameter. 
- *	The received sk_buffs with pdus other than I_CMD and I_RSP
- *	are freed by mac_data_indicate() after processing,
- *	the I pdu buffers are freed by the cl2llc client when it no longer needs
- *	the skb.
-*/
-
-int llc_mac_data_indicate(llcptr lp, struct sk_buff *skb)
-{
-	int ll;      		/* logical length == 802.3 length field */
-	unsigned char p_flag;
-	unsigned char type;
-	frameptr fr;
-	int free=1;
-
-	lp->inc_skb=NULL;
-	
-	/*
-	 *	Truncate buffer to true 802.3 length
-	 *	[FIXME: move to 802.2 demux]
-	 */
-
-	ll = *(skb->data -2) * 256 + *(skb->data -1);
-	skb_trim( skb, ll );
-
-	fr = (frameptr) skb->data;
-	type = llc_decode_frametype( fr );
-
-
-	if (type <= FRMR_RSP)
-	{
-		/*
-		 *	PDU is of the type 2 set
-		 */
-		if ((lp->llc_mode == MODE_ABM)||(type == SABME_CMD))
-			llc_process_otype2_frame(lp, skb, type);
-
-	}
-	else
-	{
-		/*
-		 *	PDU belongs to type 1 set
-		 */
-	        p_flag = fr->u_hdr.u_pflag;
-        	switch(type)
-        	{
-		        case TEST_CMD:
-				llc_sendpdu(lp, TEST_RSP, 0,ll -3,
-					fr->u_hdr.u_info);
-				break;
-			case TEST_RSP:
-				lp->llc_callbacks|=LLC_TEST_INDICATION;
-				lp->inc_skb=skb;
-				free=0;
-				break;
-			case XID_CMD:
-				/*
-				 *	Basic format XID is handled by LLC itself
-				 *	Doc 5.4.1.1.2 p 48/49
-				 */
-
-				if ((ll == 6)&&(fr->u_hdr.u_info[0] == 0x81))
-				{
-					lp->k = fr->u_hdr.u_info[2];
-					llc_sendpdu(lp, XID_RSP,
-						fr->u_hdr.u_pflag, ll -3,
-						fr->u_hdr.u_info);
-				}
-				break;
-
-			case XID_RSP:
-				if( ll == 6 && fr->u_hdr.u_info[0] == 0x81 )
-				{
-					lp->k = fr->u_hdr.u_info[2];
-				}
-				lp->llc_callbacks|=LLC_XID_INDICATION;
-				lp->inc_skb=skb;
-				free=0;
-				break;
-
-			case UI_CMD:
-				lp->llc_callbacks|=LLC_UI_DATA;
-				skb_pull(skb,3);
-				lp->inc_skb=skb;
-				free=0;
-				break;
-
-			default:;
-				/*
-				 *	All other type 1 pdus ignored for now
-				 */
-		}
-	}
-
-	if (free&&(!(IS_IFRAME(fr))))
-	{
-		/*
-		 *	No auto free for I pdus
-		 */
-		skb->sk = NULL;
-		kfree_skb(skb);
-	}
-
-	if(lp->llc_callbacks)
-	{
-		if ( lp->llc_event != NULL ) lp->llc_event(lp);
-		lp->llc_callbacks=0;
-	}
-	return 0;
-}
-
-
-/*
- *	Create an LLC client. As it is the job of the caller to clean up
- *	LLC's on device down, the device list must be locked before this call.
- */
-
-int register_cl2llc_client(llcptr lp, const char *device, void (*event)(llcptr), u8 *rmac, u8 ssap, u8 dsap)
-{
-	char eye_init[] = "LLC\0";
-
-	memset(lp, 0, sizeof(*lp));
-	lp->dev = __dev_get_by_name(device);
-	if(lp->dev == NULL)
-		return -ENODEV;
-	memcpy(lp->eye, eye_init, sizeof(lp->eye));
-	lp->rw = 1;
-	lp->k = 127;
-	lp->n1 = 1490;
-	lp->n2 = 10;
-	lp->timer_interval[P_TIMER] = HZ;    /* 1 sec */
-	lp->timer_interval[REJ_TIMER] = HZ/8;
-	lp->timer_interval[ACK_TIMER] = HZ/8;
-	lp->timer_interval[BUSY_TIMER] = HZ*2;
-	lp->local_sap = ssap;
-	lp->llc_event = event;
-	memcpy(lp->remote_mac, rmac, sizeof(lp->remote_mac));
-	lp->state = 0;
-	lp->llc_mode = MODE_ADM;
-	lp->remote_sap = dsap;
-	skb_queue_head_init(&lp->atq);
-	skb_queue_head_init(&lp->rtq);
-	MOD_INC_USE_COUNT;
-	return 0;
-}
-
-
-void unregister_cl2llc_client(llcptr lp)
-{
-	llc_cancel_timers(lp);
-	MOD_DEC_USE_COUNT;
-	kfree(lp);
-}
-
-
-EXPORT_SYMBOL(register_cl2llc_client);
-EXPORT_SYMBOL(unregister_cl2llc_client);
-EXPORT_SYMBOL(llc_data_request);
-EXPORT_SYMBOL(llc_unit_data_request);
-EXPORT_SYMBOL(llc_test_request);
-EXPORT_SYMBOL(llc_xid_request);
-EXPORT_SYMBOL(llc_mac_data_indicate);
-EXPORT_SYMBOL(llc_cancel_timers);
-
-#define ALL_TYPES_8022 0
-
-static int __init llc_init(void)
-{
-	printk(KERN_NOTICE "IEEE 802.2 LLC for Linux 2.1 (c) 1996 Tim Alpaerts\n");
-	return 0;
-}
-
-
-module_init(llc_init);

net/802/llc_sendpdu.c

-/*
- * NET		An implementation of the IEEE 802.2 LLC protocol for the
- *		LINUX operating system.  LLC is implemented as a set of 
- *		state machines and callbacks for higher networking layers.
- *
- *		llc_sendpdu(), llc_sendipdu(), resend() + queue handling code
- *
- *		Written by Tim Alpaerts, Tim_Alpaerts@toyota-motor-europe.com
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- *	Changes
- *		Alan Cox	:	Chainsawed into Linux format, style
- *					Added llc_ to function names
- */
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/netdevice.h>
-#include <linux/skbuff.h>
-#include <net/p8022.h>
-#include <linux/stat.h>
-#include <asm/byteorder.h>
-#include <net/llc_frame.h>
-#include <net/llc.h>
-
-static unsigned char cntl_byte_encode[] = 
-{
-	0x00,   /* I_CMD */
-	0x01,   /* RR_CMD */
-	0x05,   /* RNR_CMD */
-	0x09,   /* REJ_CMD */
-	0x43,   /* DISC_CMD */
-	0x7F,   /* SABME_CMD */
-	0x00,   /* I_RSP */
-	0x01,   /* RR_RSP */
-	0x05,   /* RNR_RSP */
-	0x09,   /* REJ_RSP */
-	0x63,   /* UA_RSP */
-	0x0F,   /* DM_RSP */
-	0x87,   /* FRMR_RSP */
-	0xFF,   /* BAD_FRAME */
-	0x03,   /* UI_CMD */
-	0xBF,   /* XID_CMD */
-	0xE3,   /* TEST_CMD */
-	0xBF,   /* XID_RSP */
-	0xE3    /* TEST_RSP */
-};
-
-static unsigned char fr_length_encode[] = 
-{
-	0x04,   /* I_CMD */
-	0x04,   /* RR_CMD */
-	0x04,   /* RNR_CMD */
-	0x04,   /* REJ_CMD */
-	0x03,   /* DISC_CMD */
-	0x03,   /* SABME_CMD */
-	0x04,   /* I_RSP */
-	0x04,   /* RR_RSP */
-	0x04,   /* RNR_RSP */
-	0x04,   /* REJ_RSP */
-	0x03,   /* UA_RSP */
-	0x03,   /* DM_RSP */
-	0x03,   /* FRMR_RSP */
-	0x00,   /* BAD_FRAME */
-	0x03,   /* UI_CMD */
-	0x03,   /* XID_CMD */
-	0x03,   /* TEST_CMD */
-	0x03,   /* XID_RSP */
-	0x03    /* TEST_RSP */
-};
-
-static unsigned char cr_bit_encode[] = {
-	0x00,   /* I_CMD */
-	0x00,   /* RR_CMD */
-	0x00,   /* RNR_CMD */
-	0x00,   /* REJ_CMD */
-	0x00,   /* DISC_CMD */
-	0x00,   /* SABME_CMD */
-	0x01,   /* I_RSP */
-	0x01,   /* RR_RSP */
-	0x01,   /* RNR_RSP */
-	0x01,   /* REJ_RSP */
-	0x01,   /* UA_RSP */
-	0x01,   /* DM_RSP */
-	0x01,   /* FRMR_RSP */
-	0x00,   /* BAD_FRAME */
-	0x00,   /* UI_CMD */
-	0x00,   /* XID_CMD */
-	0x00,   /* TEST_CMD */
-	0x01,   /* XID_RSP */
-	0x01    /* TEST_RSP */
-};
-
-/*
- *	Sendpdu() constructs an output frame in a new skb and
- *	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.
- *
- *	Parameter pf controls both the poll/final bit and dsap
- *	fields in the output pdu. 
- *	The dsap trick was needed to implement XID_CMD send with
- *	zero dsap field as described in doc 6.6 item 1 of enum.  
- */
-
-void llc_sendpdu(llcptr lp, char type, char pf, int data_len, char *pdu_data)
-{
-	frameptr fr;                /* ptr to output pdu buffer */
-	unsigned short int fl;      /* frame length == 802.3 "length" value */
-	struct sk_buff *skb;
-
-	fl = data_len + fr_length_encode[(int)type];
-	skb = alloc_skb(16 + fl, GFP_ATOMIC); 
-	if (skb != NULL)
-	{
-		skb->dev = lp->dev;	
-	        skb_reserve(skb, 16);
-		fr = (frameptr) skb_put(skb, fl);
-		memset(fr, 0, fl);
-                /*
-                 *	Construct 802.2 header 
-                 */
-		if (pf & 0x02) 
-			fr->pdu_hdr.dsap = 0;
-		else
-			fr->pdu_hdr.dsap = lp->remote_sap;
-		fr->pdu_hdr.ssap = lp->local_sap + cr_bit_encode[(int)type];
-		fr->pdu_cntl.byte1 = cntl_byte_encode[(int)type];
-		/* 
-		 *	Fill in pflag and seq nbrs: 
-		 */
-		if (IS_SFRAME(fr)) 
-		{
-		  	/* case S-frames */
-			if (pf & 0x01) 
-				fr->i_hdr.i_pflag = 1;
-			fr->i_hdr.nr = lp->vr;
-		}
-		else
-		{
-			/* case U frames */ 
-			if (pf & 0x01) 
-				fr->u_hdr.u_pflag = 1;
-		}
-                       
-		if (data_len > 0) 
-		{ 			/* append data if any  */ 
-			if (IS_UFRAME(fr)) 
-			{
-				memcpy(fr->u_hdr.u_info, pdu_data, data_len);
-			}
-			else 
-			{
-				memcpy(fr->i_hdr.is_info, pdu_data, data_len);
-			}
-		}
-		lp->dev->hard_header(skb, lp->dev, ETH_P_802_3,
-			 lp->remote_mac, NULL, fl);
-		skb->dev=lp->dev;
-		dev_queue_xmit(skb);
-	}
-	else
-		printk(KERN_DEBUG "cl2llc: skb_alloc() in llc_sendpdu() failed\n");     
-}
-
-void llc_xid_request(llcptr lp, char opt, int ll, char * data)
-{
-	llc_sendpdu(lp, XID_CMD, opt, ll, data); 
-}
-
-void llc_test_request(llcptr lp, int ll, char * data)
-{
-	llc_sendpdu(lp, TEST_CMD, 0, ll, data); 
-}
-
-void llc_unit_data_request(llcptr lp, int ll, char * data)
-{
-	llc_sendpdu(lp, UI_CMD, 0, ll, data); 
-}
-
-
-/*
- *	llc_sendipdu() Completes an I pdu in an existing skb and gives it
- *	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.
- */
-
-void llc_sendipdu(llcptr lp, char type, char pf, struct sk_buff *skb)
-{
-	frameptr fr;                /* ptr to output pdu buffer */
-	struct sk_buff *tmp;
-	
-	fr = (frameptr) skb->data;
-
-	fr->pdu_hdr.dsap = lp->remote_sap;
-	fr->pdu_hdr.ssap = lp->local_sap + cr_bit_encode[(int)type];
-	fr->pdu_cntl.byte1 = cntl_byte_encode[(int)type];
-			
-	if (pf)
-		fr->i_hdr.i_pflag = 1; /* p/f and seq numbers */  
-	fr->i_hdr.nr = lp->vr;
-	fr->i_hdr.ns = lp->vs;
-	lp->vs++;
-	if (lp->vs > 127) 
-		lp->vs = 0;
-	lp->dev->hard_header(skb, lp->dev, ETH_P_802_3,
-		lp->remote_mac, NULL, skb->len);
-	ADD_TO_RTQ(skb);		/* add skb to the retransmit queue */
-	tmp=skb_clone(skb, GFP_ATOMIC);
-	if(tmp!=NULL)
-	{
-		tmp->dev=lp->dev;
-		dev_queue_xmit(tmp);
-	}
-}
-
-
-/*
- *	Resend_ipdu() will resend the pdus in the retransmit queue (rtq)
- *	the return value is the number of pdus resend.
- *	ack_nr is N(R) of 1st pdu to resent.
- *	Type is I_CMD or I_RSP for 1st pdu resent.
- *	p is p/f flag 0 or 1 for 1st pdu resent.
- *	All subsequent pdus will be sent as I_CMDs with p/f set to 0
- */ 
-
-int llc_resend_ipdu(llcptr lp, unsigned char ack_nr, unsigned char type, char p)
-{
-	struct sk_buff *skb,*tmp;
-	int resend_count;
-	frameptr fr;
-	unsigned long flags;
-	
-
-	resend_count = 0;
-	
-	save_flags(flags);
-	cli();
-	
-	skb = skb_peek(&lp->rtq);
-
-	while(skb && skb != (struct sk_buff *)&lp->rtq)
-	{
-		fr = (frameptr) (skb->data + lp->dev->hard_header_len);
-		if (resend_count == 0) 
-		{
-			/* 
-			 *	Resending 1st pdu: 
-			 */
-
-			if (p) 
-				fr->i_hdr.i_pflag = 1;
-			else
-				fr->i_hdr.i_pflag = 0;
-            
-			if (type == I_CMD)           
-				fr->pdu_hdr.ssap = fr->pdu_hdr.ssap & 0xfe;
-			else
-				fr->pdu_hdr.ssap = fr->pdu_hdr.ssap | 0x01;
-		}
-	        else
-	        {
-	        	/*
-	        	 *	Resending pdu 2...n 
-	        	 */
-
-			fr->pdu_hdr.ssap = fr->pdu_hdr.ssap & 0xfe;
-			fr->i_hdr.i_pflag = 0;
-		}
-		fr->i_hdr.nr = lp->vr;
-		fr->i_hdr.ns = lp->vs;
-		lp->vs++;
-		if (lp->vs > 127) 
-			lp->vs = 0;
-		tmp=skb_clone(skb, GFP_ATOMIC);
-		if(tmp!=NULL)
-		{
-			tmp->dev = lp->dev;
-			dev_queue_xmit(skb);
-		}
-		resend_count++;
-		skb = skb->next;
-	}
-	restore_flags(flags);
-	return resend_count;
-}
-
-/* ************** internal queue management code ****************** */
-
-
-/*
- *	Remove one skb from the front of the awaiting transmit queue
- *	(this is the skb longest on the queue) and return a pointer to 
- *	that skb. 
- */ 
-
-struct sk_buff *llc_pull_from_atq(llcptr lp) 
-{
-	return skb_dequeue(&lp->atq);
-}
- 
-/*
- *	Free_acknowledged_skbs(), remove from retransmit queue (rtq)
- *	and free all skbs with an N(S) chronologicaly before 'pdu_ack'.
- *	The return value is the number of pdus acknowledged.
- */
- 
-int llc_free_acknowledged_skbs(llcptr lp, unsigned char pdu_ack)
-{
-	struct sk_buff *pp;
-	frameptr fr; 
-	int ack_count;
-	unsigned char ack; 	/* N(S) of most recently ack'ed pdu */
-	unsigned char ns_save; 
-	unsigned long flags;
-
-	if (pdu_ack > 0) 
-		ack = pdu_ack -1;
-	else 
-		ack = 127;
-
-	ack_count = 0;
-
-	save_flags(flags);
-	cli();
-
-	pp = skb_dequeue(&lp->rtq); 
-	while (pp != NULL)
-	{
-		/* 
-		 *	Locate skb with N(S) == ack 
-		 */
-
-		/*
-		 *	BUG: FIXME - use skb->h.*
-		 */
-		fr = (frameptr) (pp->data + lp->dev->hard_header_len);
-		ns_save = fr->i_hdr.ns;
-
-		kfree_skb(pp);
-		ack_count++;
-
-		if (ns_save == ack) 
-			break;  
-		pp = skb_dequeue(&lp->rtq);
-	}
-	restore_flags(flags);
-	return ack_count; 
-}
-

net/802/llc_utility.c

-/*
- * NET		An implementation of the IEEE 802.2 LLC protocol for the
- *		LINUX operating system.  LLC is implemented as a set of 
- *		state machines and callbacks for higher networking layers.
- *
- *		Small utilities, Linux timer handling.
- *
- *		Written by Tim Alpaerts, Tim_Alpaerts@toyota-motor-europe.com
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- *	Changes
- *		Alan Cox	:	Chainsawed into Linux form.
- *					Added llc_ function name prefixes.
- *					Fixed bug in stop/start timer.
- *					Added llc_cancel_timers for closing
- *						down an llc
- */
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/skbuff.h>
-#include <linux/proc_fs.h>
-#include <linux/stat.h>
-#include <net/llc_frame.h>
-#include <net/llc.h>
-
-int llc_decode_frametype(frameptr fr)
-{
-	if (IS_UFRAME(fr)) 
-	{      /* unnumbered cmd/rsp */
-		switch(fr->u_mm.mm & 0x3B)
-		{
-			case 0x1B:
-			    return(SABME_CMD);
-			    break;
-			case 0x10:
-			    return(DISC_CMD);
-			    break;
-			case 0x18:
-			    return(UA_RSP);
-			    break;
-			case 0x03:
-			    return(DM_RSP);
-			    break;
-			case 0x21:
-			    return(FRMR_RSP);
-			    break;
-			case 0x00:
-			    return(UI_CMD);
-			    break;
-			case 0x2B:
-		 	    if (IS_RSP(fr)) 
-		 	    	return(XID_RSP);
-			    else
-			    	return(XID_CMD);
-			    break;
-			case 0x38:
-		    	    if (IS_RSP(fr))
-		    	    	return(TEST_RSP);
-			    else
-				return(TEST_CMD);
-			    break;
-			default:
-			    return(BAD_FRAME);
-		}
-	}
-	else if (IS_SFRAME(fr))
-	{  /* supervisory cmd/rsp */
-		switch(fr->s_hdr.ss)
-		{
-			case 0x00:
-			    if (IS_RSP(fr)) 
-			    	return(RR_RSP);
-			    else
-			    	return(RR_CMD);
-			    break;
-			case 0x02:
-			    if (IS_RSP(fr))
-			    	return(REJ_RSP);
-			    else
-			    	return(REJ_CMD);
-			    break;
-			case 0x01:
-			    if (IS_RSP(fr))
-			    	return(RNR_RSP);
-			    else
-			    	return(RNR_CMD);
-			    break;
-			default:
-			    return(BAD_FRAME);
-		}
-	}
-	else
-	{			  /* information xfer */
-		if (IS_RSP(fr)) 
-			return(I_RSP);
-		else	
-			return(I_CMD);
-	}
-}
-
-
-/*
- *	Validate_seq_nos will check N(S) and N(R) to see if they are
- *	invalid or unexpected.
- *	"unexpected" is explained on p44 Send State Variable.
- *	The return value is:
- *		4 * invalid N(R) +
- *		2 * invalid N(S) +
- *		1 * unexpected N(S)
- */
-
-int llc_validate_seq_nos(llcptr lp, frameptr fr)
-{
-	int res;
-     
-	/*
-	 *	A U-frame is always good 
-	 */
-
-	if (IS_UFRAME(fr)) 
-		return(0);	
-
-	/*
-	 *	For S- and I-frames check N(R): 
-	 */
-
-	if (fr->i_hdr.nr == lp->vs) 
-	{    	/* if N(R) = V(S)  */
-        	res = 0;                        /* N(R) is good */
-	}
-	else
-	{				/* lp->k = transmit window size */
-    		if (lp->vs >= lp->k) 
-    		{	/* if window not wrapped around 127 */
-			if ((fr->i_hdr.nr < lp->vs) &&
-				(fr->i_hdr.nr > (lp->vs - lp->k)))
-				res = 0;
-			else 
-				res = 4;		/* N(R) invalid */
-		}
-		else
-		{	/* window wraps around 127 */
-			if ((fr->i_hdr.nr < lp->vs) ||
-				(fr->i_hdr.nr > (128 + lp->vs - lp->k))) 
-				res = 0;
-			else
-				res = 4;		/* N(R) invalid */
-		}
-	}
-
-	/*
-	 *	For an I-frame, must check N(S) also:  
-	 */
-
-	if (IS_IFRAME(fr)) 
-	{
-    		if (fr->i_hdr.ns == lp->vr) 
-    			return res;   /* N(S) good */
-		if (lp->vr >= lp->rw) 
-		{
-			/* if receive window not wrapped */
-
-			if ((fr->i_hdr.ns < lp->vr) &&
-				(fr->i_hdr.ns > (lp->vr - lp->k)))
-				res = res +1;   	/* N(S) unexpected */
-			else  
-				res = res +2;         /* N(S) invalid */            
-		}
-		else
-		{
-			/* Window wraps around 127 */
-
-			if ((fr->i_hdr.ns < lp->vr) ||
-				(fr->i_hdr.ns > (128 + lp->vr - lp->k)))
-				res = res +1;   	/* N(S) unexpected */
-			else
-				res = res +2;         /* N(S) invalid */            
-		}
-	}					
-	return(res);
-}
-
-/* **************** timer management routines ********************* */
-
-static void llc_p_timer_expired(unsigned long ulp)
-{
-	llc_timer_expired((llcptr) ulp, P_TIMER);
-}
-
-static void llc_rej_timer_expired(unsigned long ulp)
-{
-	llc_timer_expired((llcptr) ulp, REJ_TIMER);
-}
-
-static void llc_ack_timer_expired(unsigned long ulp)
-{
-	llc_timer_expired((llcptr) ulp, ACK_TIMER);
-} 
-
-static void llc_busy_timer_expired(unsigned long ulp)
-{
-	llc_timer_expired((llcptr) ulp, BUSY_TIMER);
-}
-
-/* exp_fcn is an array holding the 4 entry points of the
-   timer expiry routines above.
-   It is required to keep start_timer() generic.
-   Thank you cdecl.
- */
-
-static void (* exp_fcn[])(unsigned long) = 
-{
-	llc_p_timer_expired,
-	llc_rej_timer_expired,
-	llc_ack_timer_expired,
-	llc_busy_timer_expired
-};   
-
-void llc_start_timer(llcptr lp, int t)
-{
-	if (lp->timer_state[t] == TIMER_IDLE)
-	{
-    		lp->tl[t].expires = jiffies + lp->timer_interval[t];
-    		lp->tl[t].data = (unsigned long) lp;
-    		lp->tl[t].function = exp_fcn[t];
-    		add_timer(&lp->tl[t]);
-    		lp->timer_state[t] = TIMER_RUNNING;
-	}
-}
-
-void llc_stop_timer(llcptr lp, int t)
-{
-	if (lp->timer_state[t] == TIMER_RUNNING)
-	{
-        	del_timer(&lp->tl[t]);
-        	lp->timer_state[t] = TIMER_IDLE;
-	}
-}
-
-void llc_cancel_timers(llcptr lp)
-{
-	llc_stop_timer(lp, P_TIMER);
-	llc_stop_timer(lp, REJ_TIMER);
-	llc_stop_timer(lp, ACK_TIMER);
-	llc_stop_timer(lp, BUSY_TIMER);
-}
-

net/802/pseudo/actionnm.awk

-# usage: awk -f actionnm.awk pseudocode.h
-#
-BEGIN { "date" | getline
-	today = $0
-	printf("\n/* this file generated on %s  */\n", today )
-	printf("\nstatic char *action_names[] = { \n    " )
-	opl = 0
-}
-
-/^#define/ {			
-	if ( opl > 3 ) {
-	    printf("\n    ")
-	    opl = 0
-	}
-	opl = opl +1
-	t = sprintf("\"%s\"", $2 )
-	printf("%-15s ,", t )
-#	printf("%-10s", $2 )
-}
-
-END {		
-	if ( opl > 3 ) {
-	    printf("\n    ")
-	}
-	printf("\t  0\n};\n\n")
-}
-

net/802/pseudo/compile.awk

-# usage: cat pseudocode | sed -f act2num | awk -f compile.awk
-#
-#
-BEGIN { "date" | getline
-	today = $0
-	printf("\n/* this file generated on %s  */\n", today )
-	printf("\nstatic char pseudo_code [ ] = { \n" )
-	opl = 0			# op codes on the current line
-
-	opc = 0			# opcode counter
-	fpi = 0			# fill pointer for idx array
-}
-
-/^;/ { } 			# line starting with semicolon is comment 
-
-/^[A-Z]/ {			# start of a new action 
-	emit( 0 )
-	idx[ ++fpi ] = opc
-	name[ fpi ] = $1 
-	emit( $2 )
-}
-
-/^[\t ]/ { 
-        emit( $1 )
-}
-
-END {		
-	if ( opl > 8 ) {
-	    printf("\n")
-	}
-	printf("\t  0\n};\n\n")
-	printf("static short int pseudo_code_idx [ ] ={\n")
-	opl = 0
-	emit( 0 )
-	for( ii = 1; ii <= fpi; ii++ )
-	   emit( idx[ ii ] )
-	if ( opl > 8 ) {
-	    printf("\n")
-	}
-	printf("\t  0\n};\n\n")
-
-	printf("#define %-10s \t %3d \n", "NOP", 0 )
-	for( ii = 1; ii <= fpi; ii++ )
-	    printf("#define %-10s \t %3d \n", name[ ii ], ii )
-	printf("\n")
-}
-
-function emit( opcode ){	# Niclaus Wirth
-	if ( opl > 8 ) {
-	    printf("\n")
-	    opl = 0
-	}
-	opl = opl +1
-	printf("\t%4d,", opcode )
-	opc++
-}
-

net/802/pseudo/opcd2num.sed

-s/NOP/0/
-s/DUMMY_6/6/
-s/DUMMY_8/8/
-s/IF_F=1_CLEAR_REMOTE_BUSY/9/
-s/CLEAR_REMOTE_BUSY/1/
-s/CONNECT_CONFIRM/3/
-s/DISCONNECT_INDICATION/5/
-s/CONNECT_INDICATION/2/
-s/IF_DATA_FLAG_=0_THEN_DATA_FLAG:=1/55/
-s/DATA_FLAG:=0/53/
-s/DATA_FLAG:=1/54/
-s/DATA_FLAG:=2/52/
-s/DATA_INDICATION/4/
-s/F_FLAG:=P/65/
-s/IF_DATA_FLAG=2_STOP_REJ_TIMER/10/
-s/OPTIONAL_SEND_RNR_XXX(X=0)/30/
-s/P_FLAG:=0/56/
-s/P_FLAG:=P/57/
-s/RE-SEND_FRMR_RSP(F=0)/14/
-s/RE-SEND_FRMR_RSP(F=P)/15/
-s/RE-SEND_I_CMD(P=1)_OR_SEND_RR/18/
-s/RE-SEND_I_CMD(P=1)/17/
-s/RE-SEND_I_RSP(F=1)/22/
-s/RE-SEND_I_XXX(X=0)_OR_SEND_RR/21/
-s/RE-SEND_I_XXX(X=0)/20/
-s/REMOTE_BUSY:=0/58/
-s/REPORT_STATUS(FRMR_RECEIVED)/66/
-s/REPORT_STATUS(FRMR_SENT)/67/
-s/REPORT_STATUS(REMOTE_BUSY)/68/
-s/REPORT_STATUS(REMOTE_NOT_BUSY)/69/
-s/RESET_CONFIRM/7/
-s/RESET_INDICATION(LOCAL)/70/
-s/RESET_INDICATION(REMOTE)/71/
-s/RETRY_COUNT:=RETRY_COUNT+1/60/
-s/RETRY_COUNT:=0/59/
-s/SEND_ACKNOWLEDGE_CMD(P=1)/32/
-s/SEND_ACKNOWLEDGE_RSP(F=1)/34/
-s/SEND_ACKNOWLEDGE_XXX(X=0)/36/
-s/SEND_DISC_CMD(P=X)/11/
-s/SEND_DM_RSP(F=X)/12/
-s/SEND_FRMR_RSP(F=X)/13/
-s/SEND_I_CMD(P=1)/16/
-s/SEND_I_XXX(X=0)/19/
-s/SEND_REJ_CMD(P=1)/23/
-s/SEND_REJ_RSP(F=1)/24/
-s/SEND_REJ_XXX(X=0)/25/
-s/SEND_RNR_CMD(F=1)/26/
-s/SEND_RNR_RSP(F=1)/27/
-s/SEND_RNR_XXX(X=0)/28/
-s/SEND_RR_CMD(P=1)/31/
-s/SEND_RR_RSP(F=1)/33/
-s/SEND_RR_XXX(X=0)/35/
-s/SEND_SABME_CMD(P=X)/37/
-s/SEND_UA_RSP(F=X)/38/
-s/SET_REMOTE_BUSY/29/
-s/START_ACK_TIMER_IF_NOT_RUNNING/44/
-s/START_ACK_TIMER/42/
-s/START_P_TIMER/41/
-s/START_REJ_TIMER/43/
-s/STOP_ACK_TIMER/45/
-s/STOP_ALL_TIMERS/48/
-s/STOP_OTHER_TIMERS/49/
-s/STOP_P_TIMER/46/
-s/STOP_REJ_TIMER/47/
-s/S_FLAG:=0/39/
-s/S_FLAG:=1/40/
-s/UPDATE_N(R)_RECEIVED/50/
-s/UPDATE_P_FLAG/51/
-s/V(R):=0/61/
-s/V(R):=V(R)+1/62/
-s/V(S):=0/63/
-s/V(S):=N(R)/64/

net/802/pseudo/opcodes

-   0	NOP
-   1	CLEAR_REMOTE_BUSY
-   2	CONNECT_INDICATION
-   3	CONNECT_CONFIRM
-   4	DATA_INDICATION
-   5	DISCONNECT_INDICATION
-   6	DUMMY_6
-   7	RESET_CONFIRM
-   8	DUMMY_8
-   9	IF_F=1_CLEAR_REMOTE_BUSY
-  10	IF_DATA_FLAG=2_STOP_REJ_TIMER
-  11	SEND_DISC_CMD(P=X)
-  12	SEND_DM_RSP(F=X)
-  13	SEND_FRMR_RSP(F=X)
-  14	RE-SEND_FRMR_RSP(F=0)
-  15	RE-SEND_FRMR_RSP(F=P)
-  16	SEND_I_CMD(P=1)
-  17	RE-SEND_I_CMD(P=1)
-  18	RE-SEND_I_CMD(P=1)_OR_SEND_RR
-  19	SEND_I_XXX(X=0)
-  20	RE-SEND_I_XXX(X=0)
-  21	RE-SEND_I_XXX(X=0)_OR_SEND_RR
-  22	RE-SEND_I_RSP(F=1)
-  23	SEND_REJ_CMD(P=1)
-  24	SEND_REJ_RSP(F=1)
-  25	SEND_REJ_XXX(X=0)
-  26	SEND_RNR_CMD(F=1)
-  27	SEND_RNR_RSP(F=1)
-  28	SEND_RNR_XXX(X=0)
-  29	SET_REMOTE_BUSY
-  30	OPTIONAL_SEND_RNR_XXX(X=0)
-  31	SEND_RR_CMD(P=1)
-  32	SEND_ACKNOWLEDGE_CMD(P=1)
-  33	SEND_RR_RSP(F=1)
-  34	SEND_ACKNOWLEDGE_RSP(F=1)
-  35	SEND_RR_XXX(X=0)
-  36	SEND_ACKNOWLEDGE_XXX(X=0)
-  37	SEND_SABME_CMD(P=X)
-  38	SEND_UA_RSP(F=X)
-  39	S_FLAG:=0
-  40	S_FLAG:=1
-  41	START_P_TIMER
-  42	START_ACK_TIMER
-  43	START_REJ_TIMER
-  44	START_ACK_TIMER_IF_NOT_RUNNING
-  45	STOP_ACK_TIMER
-  46	STOP_P_TIMER
-  47	STOP_REJ_TIMER
-  48	STOP_ALL_TIMERS
-  49	STOP_OTHER_TIMERS
-  50	UPDATE_N(R)_RECEIVED
-  51	UPDATE_P_FLAG
-  52	DATA_FLAG:=2
-  53	DATA_FLAG:=0
-  54	DATA_FLAG:=1
-  55	IF_DATA_FLAG_=0_THEN_DATA_FLAG:=1
-  56	P_FLAG:=0
-  57	P_FLAG:=P
-  58	REMOTE_BUSY:=0
-  59	RETRY_COUNT:=0
-  60	RETRY_COUNT:=RETRY_COUNT+1
-  61	V(R):=0
-  62	V(R):=V(R)+1
-  63	V(S):=0
-  64	V(S):=N(R)
-  65	F_FLAG:=P
-  66	REPORT_STATUS(FRMR_RECEIVED)
-  67	REPORT_STATUS(FRMR_SENT)
-  68	REPORT_STATUS(REMOTE_BUSY)
-  69	REPORT_STATUS(REMOTE_NOT_BUSY)
-  70	RESET_INDICATION(LOCAL)
-  71	RESET_INDICATION(REMOTE)

net/802/pseudo/opcodesnm.h

-static char *opcode_names[] = {
-"NOP", "CLEAR_REMOTE_BUSY", "CONNECT_INDICATION", "CONNECT_CONFIRM", "DATA_INDICATION",
-"DISCONNECT_INDICATION", "DUMMY_6", "RESET_CONFIRM", "DUMMY_8",
-"IF_F=1_CLEAR_REMOTE_BUSY", "IF_DATA_FLAG=2_STOP_REJ_TIMER", "SEND_DISC_CMD(P=X)",
-"SEND_DM_RSP(F=X)", "SEND_FRMR_RSP(F=X)", "RE-SEND_FRMR_RSP(F=0)",
-"RE-SEND_FRMR_RSP(F=P)", "SEND_I_CMD(P=1)", "RE-SEND_I_CMD(P=1)",
-"RE-SEND_I_CMD(P=1)_OR_SEND_RR", "SEND_I_XXX(X=0)", "RE-SEND_I_XXX(X=0)",
-"RE-SEND_I_XXX(X=0)_OR_SEND_RR", "RE-SEND_I_RSP(F=1)", "SEND_REJ_CMD(P=1)",
-"SEND_REJ_RSP(F=1)", "SEND_REJ_XXX(X=0)", "SEND_RNR_CMD(F=1)", "SEND_RNR_RSP(F=1)",
-"SEND_RNR_XXX(X=0)", "SET_REMOTE_BUSY", "OPTIONAL_SEND_RNR_XXX(X=0)",
-"SEND_RR_CMD(P=1)", "SEND_ACKNOWLEDGE_CMD(P=1)", "SEND_RR_RSP(F=1)",
-"SEND_ACKNOWLEDGE_RSP(F=1)", "SEND_RR_XXX(X=0)", "SEND_ACKNOWLEDGE_XXX(X=0)",
-"SEND_SABME_CMD(P=X)", "SEND_UA_RSP(F=X)", "S_FLAG:=0", "S_FLAG:=1", "START_P_TIMER",
-"START_ACK_TIMER", "START_REJ_TIMER", "START_ACK_TIMER_IF_NOT_RUNNING",
-"STOP_ACK_TIMER", "STOP_P_TIMER", "STOP_REJ_TIMER", "STOP_ALL_TIMERS",
-"STOP_OTHER_TIMERS", "UPDATE_N(R)_RECEIVED", "UPDATE_P_FLAG", "DATA_FLAG:=2",
-"DATA_FLAG:=0", "DATA_FLAG:=1", "IF_DATA_FLAG_=0_THEN_DATA_FLAG:=1", "P_FLAG:=0",
-"P_FLAG:=P", "REMOTE_BUSY:=0", "RETRY_COUNT:=0", "RETRY_COUNT:=RETRY_COUNT+1",
-"V(R):=0", "V(R):=V(R)+1", "V(S):=0", "V(S):=N(R)", "F_FLAG:=P",
-"REPORT_STATUS(FRMR_RECEIVED)", "REPORT_STATUS(FRMR_SENT)",
-"REPORT_STATUS(REMOTE_BUSY)", "REPORT_STATUS(REMOTE_NOT_BUSY)",
-"RESET_INDICATION(LOCAL)", "RESET_INDICATION(REMOTE)"
-};

net/802/sysctl_net_802.c

@@ -14,15 +14,16 @@
 #include <linux/sysctl.h>
 #include <linux/config.h>
 
-ctl_table e802_table[] = {
-	{0}
-};
-
-#ifdef CONFIG_TR
 extern int sysctl_tr_rif_timeout;
-ctl_table tr_table[] = {
-	{NET_TR_RIF_TIMEOUT, "rif_timeout", &sysctl_tr_rif_timeout, sizeof(int),
-	 0644, NULL, &proc_dointvec},
-	{0}
+
+struct ctl_table tr_table[] = {
+	{
+		.ctl_name	= NET_TR_RIF_TIMEOUT,
+		.procname	= "rif_timeout",
+		.data		= &sysctl_tr_rif_timeout,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec
+	},
+	{ 0 },
 };
-#endif

net/802/transit/compile.awk

-# to run: awk -f transit.awk transit.p0
-#
-BEGIN { "date" | getline
-	enable_index = 1
-	today = $0
-	printf("\n/* this file was generated on %s  */\n", today )
-	not_firstone = 0	# flag to avoid empty entry in 1st table
-	fpe = 0			# entry tbl array fill pointer
-	fpeo = 0		# entry tbl offset list fill pointer
-	fpdef = 0 		# define list fill pointer
-}
-
-### /^;/ { }			# line starting with a semicolon is comment 
-
-/^[A-Z]/ {			# table name
-	if ( $1 == "TABLE" ) {
-	   tbl = $2		# get table name
-	   newtbl( tbl )
-	}
-	else if ( $1 == "COMPILE" ) {
-	   array_name = $2
-	   if ( $3 == "NOINDEX" ) { enable_index = 0 }
-	}
-	else {			# table entry
-	   ec = ec +1
-	   n = split( $0, fld, " " )
-	   action = fld[ n-1 ]
-	   newstate = fld[ n ]
-	   store( action, newstate )
-	   ecct = ecct +1
-	}
-}
-
-END {	store( action, newstate )
-
-	if ( enable_index ) {
-	    printf( "\n/* index name #defines: */\n\n",
-		 ec, ecct )
-
-	    for( ii = 1; ii <= fpeo; ii++ ){
-	       printf( "#define %-12s %3d\n", define[ ii ], ii -1 )
-	    }
-	}
-
-	printf( "\n\n/* size of transition table is %d bytes */\n",
-		 fpe )
-
-	if ( enable_index ) {
-	    printf( "\nstatic short int %s_offset [ ] ={", array_name )
-	    for( ii = 1; ii <= fpeo; ii++ ){
-	        if ( (ii % 10) == 1 ) printf("\n  ")
-	        printf( " %4d", entry_offset[ ii ] )
-	        if ( ii < fpeo ) printf( "," )
-	    }
-	    printf(" };\n")
-	}
-
-	printf( "\nstatic char %s_entry [ ] = {", array_name )
-	for( ii = 1; ii <= fpe; ii++ ){
-	    if ( (ii % 6) == 1 ) printf("\n  ")
-	    printf( " %-14s", entry[ ii ] )
-	    if ( ii < fpe ) printf( "," )
-	}
-	printf(" };\n")
-
-}
-
-function store(  act, ns ){
-#	printf( "%s %s\n",  act, ns )
-	entry[ ++fpe ] = act
-	entry[ ++fpe ] = ns 
-}
-
-function newtbl( tbl ){
-	   if ( not_firstone ) {
-		store( action, newstate )
-	   }
-	   not_firstone = 1
-	   entry_offset[ ++fpeo ] = fpe		# entry tbl offset list
-	   define[ ++fpdef ] = tbl	# state name to define
-}

net/8021q/vlanproc.c

@@ -187,14 +187,14 @@ int vlan_proc_add_dev (struct net_device *vlandev)
 int vlan_proc_rem_dev(struct net_device *vlandev)
 {
 	if (!vlandev) {
-		printk(VLAN_ERR __FUNCTION__ ": invalid argument: %p\n",
-		       vlandev);
+		printk(VLAN_ERR "%s: invalid argument: %p\n",
+			__FUNCTION__, vlandev);
 		return -EINVAL;
 	}
 
 	if (!(vlandev->priv_flags & IFF_802_1Q_VLAN)) {
-		printk(VLAN_DBG __FUNCTION__ ": invalid argument, device: %s is not a VLAN device, priv_flags: 0x%4hX.\n",
-		       vlandev->name, vlandev->priv_flags);
+		printk(VLAN_DBG "%s: invalid argument, device: %s is not a VLAN device, priv_flags: 0x%4hX.\n",
+			__FUNCTION__, vlandev->name, vlandev->priv_flags);
 		return -EINVAL;
 	}
 

net/Config.help

@@ -266,8 +266,13 @@ CONFIG_LAPB
   module will be called lapb.o.  If unsure, say N.
 
 CONFIG_LLC
-  This is a Logical Link Layer protocol used for X.25 connections over
-  Ethernet, using ordinary Ethernet cards.
+  This is a Logical Link Layer protocol used for Appletalk, IPX and in
+  the future by NetBEUI and by the linux-sna project. It originally
+  came from Procom Inc. that released the code for 2.0.36 and was
+  ported to 2.{4,5}. Select this if you want to have support for
+  those protocols or if you want to have the sockets interface for
+  LLC.
+  
 
 CONFIG_NET_DIVERT
   The Frame Diverter allows you to divert packets from the

net/ipv4/ip_output.c

@@ -523,8 +523,18 @@ static int ip_build_xmit_slow(struct sock *sk,
 		/*
 		 *	Get the memory we require with some space left for alignment.
 		 */
-
-		skb = sock_alloc_send_skb(sk, fraglen+hh_len+15, flags&MSG_DONTWAIT, &err);
+		if (!(flags & MSG_DONTWAIT) || nfrags == 0) {
+			skb = sock_alloc_send_skb(sk, fraglen + hh_len + 15,
+						  (flags & MSG_DONTWAIT), &err);
+		} else {
+			/* On a non-blocking write, we check for send buffer
+			 * usage on the first fragment only.
+			 */
+			skb = sock_wmalloc(sk, fraglen + hh_len + 15, 1,
+					   sk->allocation);
+			if (!skb)
+				err = -ENOBUFS;
+		}
 		if (skb == NULL)
 			goto error;
 

net/ipv6/netfilter/ip6_tables.c

@@ -742,7 +742,7 @@ check_entry(struct ip6t_entry *e, const char *name, unsigned int size,
 	t = ip6t_get_target(e);
 	target = find_target_lock(t->u.user.name, &ret, &ip6t_mutex);
 	if (!target) {
-	  //		duprintf("check_entry: `%s' not found\n", t->u.name);
+		duprintf("check_entry: `%s' not found\n", t->u.user.name);
 		goto cleanup_matches;
 	}
 	if (target->me)