Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp (3859069b) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/DocBook/z8530book.tmpl

+12 −26

Original line number	Diff line number	Diff line
		@@ -69,12 +69,6 @@
		device to be used as both a tty interface and as a synchronous
		controller is a project for Linux post the 2.4 release
		</para>
		<para>
		The support code handles most common card configurations and
		supports running both Cisco HDLC and Synchronous PPP. With extra
		glue the frame relay and X.25 protocols can also be used with this
		driver.
		</para>
		</chapter>

		<chapter id="Driver_Modes">
		@@ -179,35 +173,27 @@
		<para>
		If you wish to use the network interface facilities of the driver,
		then you need to attach a network device to each channel that is
		present and in use. In addition to use the SyncPPP and Cisco HDLC
		present and in use. In addition to use the generic HDLC
		you need to follow some additional plumbing rules. They may seem
		complex but a look at the example hostess_sv11 driver should
		reassure you.
		</para>
		<para>
		The network device used for each channel should be pointed to by
		the netdevice field of each channel. The dev-> priv field of the
		the netdevice field of each channel. The hdlc-> priv field of the
		network device points to your private data - you will need to be
		able to find your ppp device from this. In addition to use the
		sync ppp layer the private data must start with a void * pointer
		to the syncppp structures.
		able to find your private data from this.
		</para>
		<para>
		The way most drivers approach this particular problem is to
		create a structure holding the Z8530 device definition and
		put that and the syncppp pointer into the private field of
		the network device. The network device fields of the channels
		then point back to the network devices. The ppp_device can also
		be put in the private structure conveniently.
		put that into the private field of the network device. The
		network device fields of the channels then point back to the
		network devices.
		</para>
		<para>
		If you wish to use the synchronous ppp then you need to attach
		the syncppp layer to the network device. You should do this before
		you register the network device. The
		<function>sppp_attach</function> requires that the first void *
		pointer in your private data is pointing to an empty struct
		ppp_device. The function fills in the initial data for the
		ppp/hdlc layer.
		If you wish to use the generic HDLC then you need to register
		the HDLC device.
		</para>
		<para>
		Before you register your network device you will also need to
		@@ -314,7 +300,7 @@
		buffer in sk_buff format and queues it for transmission. The
		caller must provide the entire packet with the exception of the
		bitstuffing and CRC. This is normally done by the caller via
		the syncppp interface layer. It returns 0 if the buffer has been
		the generic HDLC interface layer. It returns 0 if the buffer has been
		queued and non zero values for queue full. If the function accepts
		the buffer it becomes property of the Z8530 layer and the caller
		should not free it.

drivers/char/pcmcia/synclink_cs.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -232,7 +232,6 @@ typedef struct _mgslpc_info {

		/* SPPP/Cisco HDLC device parts */
		int netcount;
		int dosyncppp;
		spinlock_t netlock;

		#if SYNCLINK_GENERIC_HDLC
		@@ -459,13 +458,11 @@ static int ttymajor=0;

		static int debug_level = 0;
		static int maxframe[MAX_DEVICE_COUNT] = {0,};
		static int dosyncppp[MAX_DEVICE_COUNT] = {1,1,1,1};

		module_param(break_on_load, bool, 0);
		module_param(ttymajor, int, 0);
		module_param(debug_level, int, 0);
		module_param_array(maxframe, int, NULL, 0);
		module_param_array(dosyncppp, int, NULL, 0);

		MODULE_LICENSE("GPL");

		@@ -2915,7 +2912,6 @@ static void mgslpc_add_device(MGSLPC_INFO *info)
		if (info->line < MAX_DEVICE_COUNT) {
		if (maxframe[info->line])
		info->max_frame_size = maxframe[info->line];
		info->dosyncppp = dosyncppp[info->line];
		}

		mgslpc_device_count++;

drivers/char/synclink.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -304,7 +304,6 @@ struct mgsl_struct {

		/* generic HDLC device parts */
		int netcount;
		int dosyncppp;
		spinlock_t netlock;

		#if SYNCLINK_GENERIC_HDLC
		@@ -868,7 +867,6 @@ static int irq[MAX_ISA_DEVICES];
		static int dma[MAX_ISA_DEVICES];
		static int debug_level;
		static int maxframe[MAX_TOTAL_DEVICES];
		static int dosyncppp[MAX_TOTAL_DEVICES];
		static int txdmabufs[MAX_TOTAL_DEVICES];
		static int txholdbufs[MAX_TOTAL_DEVICES];

		@@ -879,7 +877,6 @@ module_param_array(irq, int, NULL, 0);
		module_param_array(dma, int, NULL, 0);
		module_param(debug_level, int, 0);
		module_param_array(maxframe, int, NULL, 0);
		module_param_array(dosyncppp, int, NULL, 0);
		module_param_array(txdmabufs, int, NULL, 0);
		module_param_array(txholdbufs, int, NULL, 0);

		@@ -4258,7 +4255,6 @@ static void mgsl_add_device( struct mgsl_struct *info )
		if (info->line < MAX_TOTAL_DEVICES) {
		if (maxframe[info->line])
		info->max_frame_size = maxframe[info->line];
		info->dosyncppp = dosyncppp[info->line];

		if (txdmabufs[info->line]) {
		info->num_tx_dma_buffers = txdmabufs[info->line];

drivers/char/synclink_gt.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -128,17 +128,14 @@ static int slgt_device_count;
		static int ttymajor;
		static int debug_level;
		static int maxframe[MAX_DEVICES];
		static int dosyncppp[MAX_DEVICES];

		module_param(ttymajor, int, 0);
		module_param(debug_level, int, 0);
		module_param_array(maxframe, int, NULL, 0);
		module_param_array(dosyncppp, int, NULL, 0);

		MODULE_PARM_DESC(ttymajor, "TTY major device number override: 0=auto assigned");
		MODULE_PARM_DESC(debug_level, "Debug syslog output: 0=disabled, 1 to 5=increasing detail");
		MODULE_PARM_DESC(maxframe, "Maximum frame size used by device (4096 to 65535)");
		MODULE_PARM_DESC(dosyncppp, "Enable synchronous net device, 0=disable 1=enable");

		/*
		* tty support and callbacks
		@@ -349,7 +346,6 @@ struct slgt_info {
		/* SPPP/Cisco HDLC device parts */

		int netcount;
		int dosyncppp;
		spinlock_t netlock;
		#if SYNCLINK_GENERIC_HDLC
		struct net_device *netdev;
		@@ -3405,7 +3401,6 @@ static void add_device(struct slgt_info *info)
		if (info->line < MAX_DEVICES) {
		if (maxframe[info->line])
		info->max_frame_size = maxframe[info->line];
		info->dosyncppp = dosyncppp[info->line];
		}

		slgt_device_count++;

drivers/char/synclinkmp.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -270,7 +270,6 @@ typedef struct _synclinkmp_info {

		/* SPPP/Cisco HDLC device parts */
		int netcount;
		int dosyncppp;
		spinlock_t netlock;

		#if SYNCLINK_GENERIC_HDLC
		@@ -469,13 +468,11 @@ static int ttymajor = 0;
		*/
		static int debug_level = 0;
		static int maxframe[MAX_DEVICES] = {0,};
		static int dosyncppp[MAX_DEVICES] = {0,};

		module_param(break_on_load, bool, 0);
		module_param(ttymajor, int, 0);
		module_param(debug_level, int, 0);
		module_param_array(maxframe, int, NULL, 0);
		module_param_array(dosyncppp, int, NULL, 0);

		static char *driver_name = "SyncLink MultiPort driver";
		static char *driver_version = "$Revision: 4.38 $";
		@@ -3752,7 +3749,6 @@ static void add_device(SLMP_INFO *info)
		if (info->line < MAX_DEVICES) {
		if (maxframe[info->line])
		info->max_frame_size = maxframe[info->line];
		info->dosyncppp = dosyncppp[info->line];
		}

		synclinkmp_device_count++;