Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ba74014 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
  phy/marvell: add 88ec048 support
  igb: Program MDICNFG register prior to PHY init
  e1000e: correct MAC-PHY interconnect register offset for 82579
  hso: Add new product ID
  can: Add driver for esd CAN-USB/2 device
  l2tp: fix export of header file for userspace
  can-raw: Fix skb_orphan_try handling
  Revert "net: remove zap_completion_queue"
  net: cleanup inclusion
  phy/marvell: add 88e1121 interface mode support
  u32: negative offset fix
  net: Fix a typo from "dev" to "ndev"
  igb: Use irq_synchronize per vector when using MSI-X
  ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
  e1000e: Fix irq_synchronize in MSI-X case
  e1000e: register pm_qos request on hardware activation
  ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
  net: Add getsockopt support for TCP thin-streams
  cxgb4: update driver version
  cxgb4: add new PCI IDs
  ...

Manually fix up conflicts in:
 - drivers/net/e1000e/netdev.c: due to pm_qos registration
   infrastructure changes
 - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
   and cleaning up the IDs
 - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
   conflict (registration change vs marking it static)
parents 5abd9ccc 3ff1c259

Documentation/feature-removal-schedule.txt

+0 −9
Original line number Diff line number Diff line
@@ -303,15 +303,6 @@ Who: Johannes Berg <johannes@sipsolutions.net> 


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



What: CONFIG_NF_CT_ACCT

When: 2.6.29

Why:  Accounting can now be enabled/disabled without kernel recompilation.

      Currently used only to set a default value for a feature that is also

      controlled by a kernel/module/sysfs/sysctl parameter.

Who:  Krzysztof Piotr Oledzki <ole@ans.pl>



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



What:	sysfs ui for changing p4-clockmod parameters

When:	September 2009

Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and

Documentation/filesystems/nfs/nfsroot.txt

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> 


  <hostname>	Name of the client. May be supplied by autoconfiguration,

  		but its absence will not trigger autoconfiguration.

		If specified and DHCP is used, the user provided hostname will

		be carried in the DHCP request to hopefully update DNS record.



  		Default: Client IP address is used in ASCII notation.

Documentation/isdn/INTERFACE.CAPI

+6 −2
Original line number Diff line number Diff line
@@ -113,12 +113,16 @@ char *driver_name 
int (*load_firmware)(struct capi_ctr *ctrlr, capiloaddata *ldata)

	(optional) pointer to a callback function for sending firmware and

	configuration data to the device

	The function may return before the operation has completed.

	Completion must be signalled by a call to capi_ctr_ready().

	Return value: 0 on success, error code on error

	Called in process context.



void (*reset_ctr)(struct capi_ctr *ctrlr)

	(optional) pointer to a callback function for performing a reset on

	the device, releasing all registered applications

	(optional) pointer to a callback function for stopping the device,

	releasing all registered applications

	The function may return before the operation has completed.

	Completion must be signalled by a call to capi_ctr_down().

	Called in process context.



void (*register_appl)(struct capi_ctr *ctrlr, u16 applid,

Documentation/isdn/README.gigaset

+69 −48
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ GigaSet 307x Device Driver 


1.2. Software

     --------

     The driver works with ISDN4linux and so can be used with any software

     which is able to use ISDN4linux for ISDN connections (voice or data).

     Experimental Kernel CAPI support is available as a compilation option.

     The driver works with the Kernel CAPI subsystem as well as the old

     ISDN4Linux subsystem, so it can be used with any software which is able

     to use CAPI 2.0 or ISDN4Linux for ISDN connections (voice or data).



     There are some user space tools available at

     http://sourceforge.net/projects/gigaset307x/
@@ -152,61 +152,42 @@ GigaSet 307x Device Driver 
     - 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

     set up the ISDN system just as you'd do with any ISDN card supported by

     the ISDN4Linux subsystem. Most distributions provide some configuration

     utility. If not, you can use some HOWTOs like

         http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html

     If this doesn't work, because you have some device like SX100 where

     debug output (see section 3.2.) shows something like this when dialing

         CMD Received: ERROR

         Available Params: 0

         Connection State: 0, Response: -1

         gigaset_process_response: resp_code -1 in ConState 0 !

         Timeout occurred

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



2.4. CAPI

2.3. 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. 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 with the command

     GIGASET_CAPI) the devices will show up as CAPI controllers as soon as the

     corresponding driver module is loaded, and can then be used with CAPI 2.0

     kernel and user space applications. For user space access, the module

     capi.ko must be loaded.



     Legacy ISDN4Linux applications are supported via the capidrv

     compatibility driver. The kernel module capidrv.ko must 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

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

     This is needed for some devices [e.g. SX100] as they have problems with

     the "normal" commands.

     Most distributions handle loading and unloading of the various CAPI

     modules automatically via the command capiinit(1) from the capi4k-utils

     package or a similar mechanism. Note that capiinit(1) cannot unload the

     Gigaset drivers because it doesn't support more than one module per

     driver.



     If you have installed the command line tool gigacontr, you can enter

     unimodem mode using

         gigacontr --mode unimodem

     You can switch back using

         gigacontr --mode isdn

2.4. ISDN4Linux

     ----------

     If the driver is compiled without CAPI support (native ISDN4Linux

     variant), it registers the device with the legacy ISDN4Linux subsystem

     after loading the module. It can then be used with ISDN4Linux

     applications only. Most distributions provide some configuration utility

     for setting up that subsystem. Otherwise you can use some HOWTOs like

         http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html



     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

     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.



2.5. Unimodem mode

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

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

     (the /dev/ttyGU0, ... mentioned above) which understands the commands



         ATZ                 init, reset

             => OK or ERROR

         ATD
@@ -234,6 +215,31 @@ GigaSet 307x Device Driver 
     to an appropriate module configuration file, like /etc/modprobe.d/gigaset

     or /etc/modprobe.conf.local.



     Unimodem mode is needed for making some devices [e.g. SX100] work which

     do not support the regular Gigaset command set. If debug output (see

     section 3.2.) shows something like this when dialing:

         CMD Received: ERROR

         Available Params: 0

         Connection State: 0, Response: -1

         gigaset_process_response: resp_code -1 in ConState 0 !

         Timeout occurred

     then switching to unimodem mode may help.



     If you have installed the command line tool gigacontr, you can enter

     unimodem mode using

         gigacontr --mode unimodem

     You can switch back using

         gigacontr --mode isdn



     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

     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.



2.6. Call-ID (CID) mode

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

     Call-IDs are numbers used to tag commands to, and responses from, the
@@ -263,7 +269,22 @@ GigaSet 307x Device Driver 
     change its CID mode while the driver is loaded, eg.

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



2.7. Unregistered Wireless Devices (M101/M105)

2.7. Dialing Numbers

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

     The called party number provided by an application for dialing out must

     be a public network number according to the local dialing plan, without

     any dial prefix for getting an outside line.



     Internal calls can be made by providing an internal extension number

     prefixed with "**" (two asterisks) as the called party number. So to dial

     eg. the first registered DECT handset, give "**11" as the called party

     number. Dialing "***" (three asterisks) calls all extensions

     simultaneously (global call).



     This holds for both CAPI 2.0 and ISDN4Linux applications. Unimodem mode

     does not support internal calls.



2.8. Unregistered Wireless Devices (M101/M105)

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

     The main purpose of the ser_gigaset and usb_gigaset drivers is to allow

     the M101 and M105 wireless devices to be used as ISDN devices for ISDN

Documentation/kernel-parameters.txt

+1 −2
Original line number Diff line number Diff line
@@ -1598,8 +1598,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			[NETFILTER] Enable connection tracking flow accounting

			0 to disable accounting

			1 to enable accounting

			Default value depends on CONFIG_NF_CT_ACCT that is

			going to be removed in 2.6.29.

			Default value is 0.



	nfsaddrs=	[NFS]

			See Documentation/filesystems/nfs/nfsroot.txt.