Commit f2d7499b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (99 commits)
  pkt_sched: Fix actions referencing
  bnx2x: fix logical op
  tcp: (whitespace only) fix confusing indentation
  pkt_sched: Fix qdisc config when link is down.
  [Bluetooth] Add full quirk implementation for btusb driver
  [Bluetooth] Removal of unnecessary ignore module parameter
  [Bluetooth] Add parameters to control BNEP header compression
  ath9k: Revamp wireless mode usage
  ath9k: More unused macros
  ath9k: Remove a few unused macros and fix indentation
  ath9k: Use mac80211's band macros and remove enum hal_freq_band
  ath9k: Remove redundant data structure ath9k_txq_info
  ath9k: Cleanup data structures related to HW capabilities
  ath9k: work around gcc ICEs
  ath9k: Add new Atheros IEEE 802.11n driver
  ath5k: remove Atheros 11n devices from supported list
  list.h: add list_cut_position()
  list.h: Add list_splice_tail() and list_splice_tail_init()
  p54: swap short slot time dcf values
  rt2x00: Block all unsupported modes
  ...
parents 8d659f5e 76aab2c1

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-&gt; priv field of the

	the netdevice field of each channel. The hdlc-&gt; 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.

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -720,6 +720,15 @@ L: linux-wireless@vger.kernel.org 
L:	ath5k-devel@lists.ath5k.org

S:	Maintained



ATHEROS ATH9K WIRELESS DRIVER

P:	Luis R. Rodriguez

M:	lrodriguez@atheros.com

P:	Jouni Malinen

M:	jmalinen@atheros.com

L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

S:	Supported



ATI_REMOTE2 DRIVER

P:	Ville Syrjala

M:	syrjala@sci.fi

arch/sh/include/asm/sh_eth.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#ifndef __ASM_SH_ETH_H__

#define __ASM_SH_ETH_H__



enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};



struct sh_eth_plat_data {

	int phy;

	int edmac_endian;

};



#endif

drivers/bluetooth/bcm203x.c

+2 −7
Original line number Diff line number Diff line
@@ -42,9 +42,7 @@ 
#define BT_DBG(D...)

#endif



#define VERSION "1.1"



static int ignore = 0;

#define VERSION "1.2"



static struct usb_device_id bcm203x_table[] = {

	/* Broadcom Blutonium (BCM2033) */
@@ -175,7 +173,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 


	BT_DBG("intf %p id %p", intf, id);



	if (ignore || (intf->cur_altsetting->desc.bInterfaceNumber != 0))

	if (intf->cur_altsetting->desc.bInterfaceNumber != 0)

		return -ENODEV;



	data = kzalloc(sizeof(*data), GFP_KERNEL);
@@ -300,9 +298,6 @@ static void __exit bcm203x_exit(void) 
module_init(bcm203x_init);

module_exit(bcm203x_exit);



module_param(ignore, bool, 0644);

MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");



MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");

MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);

MODULE_VERSION(VERSION);

drivers/bluetooth/bfusb.c

+1 −9
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ 
#define BT_DBG(D...)

#endif



#define VERSION "1.1"



static int ignore = 0;

#define VERSION "1.2"



static struct usb_driver bfusb_driver;
@@ -656,9 +654,6 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 


	BT_DBG("intf %p id %p", intf, id);



	if (ignore)

		return -ENODEV;



	/* Check number of endpoints */

	if (intf->cur_altsetting->desc.bNumEndpoints < 2)

		return -EIO;
@@ -795,9 +790,6 @@ static void __exit bfusb_exit(void) 
module_init(bfusb_init);

module_exit(bfusb_exit);



module_param(ignore, bool, 0644);

MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");



MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");

MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);

MODULE_VERSION(VERSION);

CRA Git | Maintained and supported by SUSTech CRA and CCSE