Commit 053fe57a 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: (75 commits)
  net: Handle NETREG_UNINITIALIZED devices correctly
  can: add the driver for Analog Devices Blackfin on-chip CAN controllers
  xfrm: Fix truncation length of authentication algorithms installed via PF_KEY
  net: use compat helper functions in compat_sys_recvmmsg
  net: fix compat_sys_recvmmsg parameter type
  cxgb3: Fixing EEH handlers
  cnic: Zero out status block and Event Queue indices.
  cnic: Send delete command when shutting down iSCSI ring.
  net: smc91x: Fix up type mismatch in smc_drv_resume().
  smc91x: fix unused flags warnings on UP systems
  MAINTAINERS: Transfering maintainership of cdc-ether
  net: Add missing TST_CFG_WRITE bits around sky2_pci_write
  net: Fix Yukon-2 Optima TCP offload setup
  net: niu uses crc32, so select CRC32
  wireless: update old static regulatory domain rules
  mac80211: Revert 'Use correct sign for mesh active path refresh'
  mac80211: Fixed bug in mesh portal paths
  net/mac80211: Correct size given to memset
  b43: Remove reset after fatal DMA error
  rtl8187: add radio led and fix warnings on suspend
  ...
parents 92340ee3 50170656

Documentation/isdn/README.gigaset

+91 −25
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ GigaSet 307x Device Driver 
     for troubleshooting or to pass module parameters.



     The module ser_gigaset provides a serial line discipline N_GIGASET_M101

     which drives the device through the regular serial line driver. It must

     be attached to the serial line to which the M101 is connected with the

     ldattach(8) command (requires util-linux-ng release 2.14 or later), for

     example:

     which uses the regular serial port driver to access the device, and must

     therefore be attached to the serial device to which the M101 is connected.

     The ldattach(8) command (included in util-linux-ng release 2.14 or later)

     can be used for that purpose, for example:

	ldattach GIGASET_M101 /dev/ttyS1

     This will open the device file, attach the line discipline to it, and

     then sleep in the background, keeping the device open so that the line
@@ -84,6 +84,22 @@ GigaSet 307x Device Driver 
     'gigaset' is officially assigned to this project by LANANA.)

     Alternatively, just add the 'ldattach' command line to /etc/rc.local.



     The modules accept the following parameters:



	Module	 	Parameter  Meaning



	gigaset	 	debug	   debug level (see section 3.2.)



			startmode  initial operation mode (see section 2.5.):

	bas_gigaset )		   1=ISDN4linux/CAPI (default), 0=Unimodem

	ser_gigaset )

	usb_gigaset )	cidmode    initial Call-ID mode setting (see section

				   2.5.): 1=on (default), 0=off



     Depending on your distribution you may want to create a separate module

     configuration file /etc/modprobe.d/gigaset for these, or add them to a

     custom file like /etc/modprobe.conf.local.



2.2. Device nodes for user space programs

     ------------------------------------

     The device can be accessed from user space (eg. by the user space tools
@@ -93,12 +109,49 @@ GigaSet 307x Device Driver 
     - /dev/ttyGU0 for M105 (USB data boxes)

     - /dev/ttyGB0 for the base driver (direct USB connection)



     You can also select a "default device" which is used by the frontends when

     If you connect more than one device of a type, they will get consecutive

     device nodes, eg. /dev/ttyGU1 for a second M105.



     You can also set a "default device" for the user space tools to use when

     no device node is given as parameter, by creating a symlink /dev/ttyG to

     one of them, eg.:



	ln -s /dev/ttyGB0 /dev/ttyG



     The devices accept the following device specific ioctl calls

     (defined in gigaset_dev.h):



     ioctl(int fd, GIGASET_REDIR, int *cmd);

     If cmd==1, the device is set to be controlled exclusively through the

     character device node; access from the ISDN subsystem is blocked.

     If cmd==0, the device is set to be used from the ISDN subsystem and does

     not communicate through the character device node.



     ioctl(int fd, GIGASET_CONFIG, int *cmd);

     (ser_gigaset and usb_gigaset only)

     If cmd==1, the device is set to adapter configuration mode where commands

     are interpreted by the M10x DECT adapter itself instead of being

     forwarded to the base station. In this mode, the device accepts the

     commands described in Siemens document "AT-Kommando Alignment M10x Data"

     for setting the operation mode, associating with a base station and

     querying parameters like field strengh and signal quality.

     Note that there is no ioctl command for leaving adapter configuration

     mode and returning to regular operation. In order to leave adapter

     configuration mode, write the command ATO to the device.



     ioctl(int fd, GIGASET_BRKCHARS, unsigned char brkchars[6]);

     (usb_gigaset only)

     Set the break characters on an M105's internal serial adapter to the six

     bytes stored in brkchars[]. Unused bytes should be set to zero.



     ioctl(int fd, GIGASET_VERSION, unsigned version[4]);

     Retrieve version information from the driver. version[0] must be set to

     one of:

     - GIGVER_DRIVER: retrieve driver version

     - GIGVER_COMPAT: retrieve interface compatibility version

     - GIGVER_FWBASE: retrieve the firmware version of the base

     Upon return, version[] is filled with the requested version information.



2.3. ISDN4linux

     ----------

     This is the "normal" mode of operation. After loading the module you can
@@ -113,15 +166,24 @@ GigaSet 307x Device Driver 
         Connection State: 0, Response: -1

         gigaset_process_response: resp_code -1 in ConState 0 !

         Timeout occurred

     you might need to use unimodem mode. (see section 2.5.)

     you probably need to use unimodem mode. (see section 2.5.)



2.4. CAPI

     ----

     If the driver is compiled with CAPI support (kernel configuration option

     GIGASET_CAPI, experimental) it can also be used with CAPI 2.0 kernel and

     user space applications.  ISDN4Linux is supported in this configuration

     user space applications. For user space access, the module capi.ko must

     be loaded. The capiinit command (included in the capi4k-utils package)

     does this for you.



     The CAPI variant of the driver supports legacy ISDN4Linux applications

     via the capidrv compatibility driver. The kernel module capidrv.ko must

     be loaded explicitly ("modprobe capidrv") if needed.

     be loaded explicitly with the command

        modprobe capidrv

     if needed, and cannot be unloaded again without unloading the driver

     first. (These are limitations of capidrv.)



     The note about unimodem mode in the preceding section applies here, too.



2.5. Unimodem mode

     -------------
@@ -134,9 +196,14 @@ GigaSet 307x Device Driver 
     You can switch back using

         gigacontr --mode isdn



     You can also load the driver using e.g.

     You can also put the driver directly into Unimodem mode when it's loaded,

     by passing the module parameter startmode=0 to the hardware specific

     module, e.g.

	modprobe usb_gigaset startmode=0

     to prevent the driver from starting in "isdn4linux mode".

     or by adding a line like

	options usb_gigaset startmode=0

     to an appropriate module configuration file, like /etc/modprobe.d/gigaset

     or /etc/modprobe.conf.local.



     In this mode the device works like a modem connected to a serial port

     (the /dev/ttyGU0, ... mentioned above) which understands the commands
@@ -164,9 +231,8 @@ GigaSet 307x Device Driver 


        options ppp_async flag_time=0



     to /etc/modprobe.conf. If your distribution has some local module

     configuration file like /etc/modprobe.conf.local,

     using that should be preferred.

     to an appropriate module configuration file, like /etc/modprobe.d/gigaset

     or /etc/modprobe.conf.local.



2.6. Call-ID (CID) mode

     ------------------
@@ -189,12 +255,13 @@ GigaSet 307x Device Driver 
       settings (CID mode).

     - If you have several DECT data devices (M10x) which you want to use

       in turn, select Unimodem mode by passing the parameter "cidmode=0" to

       the driver ("modprobe usb_gigaset cidmode=0" or modprobe.conf).

       the appropriate driver module (ser_gigaset or usb_gigaset).



     If you want both of these at once, you are out of luck.



     You can also use /sys/class/tty/ttyGxy/cidmode for changing the CID mode

     setting (ttyGxy is ttyGU0 or ttyGB0).

     You can also use the tty class parameter "cidmode" of the device to

     change its CID mode while the driver is loaded, eg.

        echo 0 > /sys/class/tty/ttyGU0/cidmode



2.7. Unregistered Wireless Devices (M101/M105)

     -----------------------------------------
@@ -208,7 +275,7 @@ GigaSet 307x Device Driver 
     driver. In that situation, a restricted set of functions is available

     which includes, in particular, those necessary for registering the device

     to a base or for switching it between Fixed Part and Portable Part

     modes.

     modes. See the gigacontr(8) manpage for details.



3.   Troubleshooting

     ---------------
@@ -222,9 +289,7 @@ GigaSet 307x Device Driver 


           options isdn dialtimeout=15



        to /etc/modprobe.conf. If your distribution has some local module

        configuration file like /etc/modprobe.conf.local,

        using that should be preferred.

        to /etc/modprobe.d/gigaset, /etc/modprobe.conf.local or a similar file.



     Problem:

        Your isdn script aborts with a message about isdnlog.
@@ -264,7 +329,8 @@ GigaSet 307x Device Driver 
     The initial value can be set using the debug parameter when loading the

     module "gigaset", e.g. by adding a line

        options gigaset debug=0

     to /etc/modprobe.conf, ...

     to your module configuration file, eg. /etc/modprobe.d/gigaset or

     /etc/modprobe.conf.local.



     Generated debugging information can be found

     - as output of the command

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -5439,10 +5439,9 @@ S: Supported 
F:	drivers/block/ub.c



USB CDC ETHERNET DRIVER

M:	Greg Kroah-Hartman <greg@kroah.com>

M:	Oliver Neukum <oliver@neukum.name>

L:	linux-usb@vger.kernel.org

S:	Maintained

W:	http://www.kroah.com/linux-usb/

F:	drivers/net/usb/cdc_*.c

F:	include/linux/usb/cdc.h

drivers/atm/he.c

+2 −2
Original line number Diff line number Diff line
@@ -2505,7 +2505,7 @@ he_close(struct atm_vcc *vcc) 
		 * TBRQ, the host issues the close command to the adapter.

		 */



		while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 0) &&

		while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 1) &&

		       (retry < MAX_RETRY)) {

			msleep(sleep);

			if (sleep < 250)
@@ -2514,7 +2514,7 @@ he_close(struct atm_vcc *vcc) 
			++retry;

		}



		if (tx_inuse)

		if (tx_inuse > 1)

			hprintk("close tx cid 0x%x tx_inuse = %d\n", cid, tx_inuse);



		/* 2.3.1.1 generic close operations with flush */

drivers/isdn/gigaset/common.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#endif



/* Module parameters */

int gigaset_debuglevel = DEBUG_DEFAULT;

int gigaset_debuglevel;

EXPORT_SYMBOL_GPL(gigaset_debuglevel);

module_param_named(debug, gigaset_debuglevel, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(debug, "debug level");

drivers/net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2696,6 +2696,7 @@ config NETXEN_NIC 
config NIU

	tristate "Sun Neptune 10Gbit Ethernet support"

	depends on PCI

	select CRC32

	help

	  This enables support for cards based upon Sun's

	  Neptune chipset.

CRA Git | Maintained and supported by SUSTech CRA and CCSE