Commit 4dd9ec49 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: (1075 commits)
  myri10ge: update driver version number to 1.4.3-1.369
  r8169: add shutdown handler
  r8169: preliminary 8168d support
  r8169: support additional 8168cp chipset
  r8169: change default behavior for mildly identified 8168c chipsets
  r8169: add a new 8168cp flavor
  r8169: add a new 8168c flavor (bis)
  r8169: add a new 8168c flavor
  r8169: sync existing 8168 device hardware start sequences with vendor driver
  r8169: 8168b Tx performance tweak
  r8169: make room for more specific 8168 hardware start procedure
  r8169: shuffle some registers handling around (8168 operation only)
  r8169: new phy init parameters for the 8168b
  r8169: update phy init parameters
  r8169: wake up the PHY of the 8168
  af_key: fix SADB_X_SPDDELETE response
  ath9k: Fix return code when ath9k_hw_setpower() fails on reset
  ath9k: remove nasty FAIL macro from ath9k_hw_reset()
  gre: minor cleanups in netlink interface
  gre: fix copy and paste error
  ...
parents 86ed5a93 6861ff35

Documentation/DocBook/mac80211.tmpl

+4 −8
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ usage should require reading the full document. 
        this though and the recommendation to allow only a single

        interface in STA mode at first!

      </para>

!Finclude/net/mac80211.h ieee80211_if_types

!Finclude/net/mac80211.h ieee80211_if_init_conf

!Finclude/net/mac80211.h ieee80211_if_conf

    </chapter>
@@ -177,8 +176,7 @@ usage should require reading the full document. 
        <title>functions/definitions</title>

!Finclude/net/mac80211.h ieee80211_rx_status

!Finclude/net/mac80211.h mac80211_rx_flags

!Finclude/net/mac80211.h ieee80211_tx_control

!Finclude/net/mac80211.h ieee80211_tx_status_flags

!Finclude/net/mac80211.h ieee80211_tx_info

!Finclude/net/mac80211.h ieee80211_rx

!Finclude/net/mac80211.h ieee80211_rx_irqsafe

!Finclude/net/mac80211.h ieee80211_tx_status
@@ -189,12 +187,11 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_get_hdrlen

!Finclude/net/mac80211.h ieee80211_hdrlen

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_start_queues

!Finclude/net/mac80211.h ieee80211_stop_queues

!Finclude/net/mac80211.h ieee80211_wake_queues

!Finclude/net/mac80211.h ieee80211_stop_queues

      </sect1>

    </chapter>
@@ -230,8 +227,7 @@ usage should require reading the full document. 
      <title>Multiple queues and QoS support</title>

      <para>TBD</para>

!Finclude/net/mac80211.h ieee80211_tx_queue_params

!Finclude/net/mac80211.h ieee80211_tx_queue_stats_data

!Finclude/net/mac80211.h ieee80211_tx_queue

!Finclude/net/mac80211.h ieee80211_tx_queue_stats

    </chapter>



    <chapter id="AP">

Documentation/feature-removal-schedule.txt

+21 −0
Original line number Diff line number Diff line
@@ -6,6 +6,24 @@ be removed from this file. 


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



What:	old static regulatory information and ieee80211_regdom module parameter

When:	2.6.29

Why:	The old regulatory infrastructure has been replaced with a new one

	which does not require statically defined regulatory domains. We do

	not want to keep static regulatory domains in the kernel due to the

	the dynamic nature of regulatory law and localization. We kept around

	the old static definitions for the regulatory domains of:

		* US

		* JP

		* EU

	and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was

	set. We also kept around the ieee80211_regdom module parameter in case

	some applications were relying on it. Changing regulatory domains

	can now be done instead by using nl80211, as is done with iw.

Who:	Luis R. Rodriguez <lrodriguez@atheros.com>



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



What:	dev->power.power_state

When:	July 2007

Why:	Broken design for runtime control over driver power states, confusing
@@ -232,6 +250,9 @@ What (Why): 
	- xt_mark match revision 0

	  (superseded by xt_mark match revision 1)



	- xt_recent: the old ipt_recent proc dir

	  (superseded by /proc/net/xt_recent)



When:	January 2009 or Linux 2.7.0, whichever comes first

Why:	Superseded by newer revisions or modules

Who:	Jan Engelhardt <jengelh@computergmbh.de>

Documentation/networking/LICENSE.qlge

0 → 100644
+46 −0
Original line number Diff line number Diff line 
Copyright (c)  2003-2008 QLogic Corporation

QLogic Linux Networking HBA Driver



This program includes a device driver for Linux 2.6 that may be

distributed with QLogic hardware specific firmware binary file.

You may modify and redistribute the device driver code under the

GNU General Public License as published by the Free Software

Foundation (version 2 or a later version).



You may redistribute the hardware specific firmware binary file

under the following terms:



	1. Redistribution of source code (only if applicable),

	   must retain the above copyright notice, this list of

	   conditions and the following disclaimer.



	2. Redistribution in binary form must reproduce the above

	   copyright notice, this list of conditions and the

	   following disclaimer in the documentation and/or other

	   materials provided with the distribution.



	3. The name of QLogic Corporation may not be used to

	   endorse or promote products derived from this software

	   without specific prior written permission



REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,

THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY

EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,

OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

POSSIBILITY OF SUCH DAMAGE.



USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT

CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR

OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,

TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN

ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN

COMBINATION WITH THIS PROGRAM.

Documentation/networking/can.txt

+40 −4
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ This file contains 
    6.1 general settings

    6.2 local loopback of sent frames

    6.3 CAN controller hardware filters

    6.4 currently supported CAN hardware

    6.5 todo

    6.4 The virtual CAN driver (vcan)

    6.5 currently supported CAN hardware

    6.6 todo



  7 Credits
@@ -584,7 +585,42 @@ solution for a couple of reasons: 
  @133MHz with four SJA1000 CAN controllers from 2002 under heavy bus

  load without any problems ...



  6.4 currently supported CAN hardware (September 2007)

  6.4 The virtual CAN driver (vcan)



  Similar to the network loopback devices, vcan offers a virtual local

  CAN interface. A full qualified address on CAN consists of



  - a unique CAN Identifier (CAN ID)

  - the CAN bus this CAN ID is transmitted on (e.g. can0)



  so in common use cases more than one virtual CAN interface is needed.



  The virtual CAN interfaces allow the transmission and reception of CAN

  frames without real CAN controller hardware. Virtual CAN network

  devices are usually named 'vcanX', like vcan0 vcan1 vcan2 ...

  When compiled as a module the virtual CAN driver module is called vcan.ko



  Since Linux Kernel version 2.6.24 the vcan driver supports the Kernel

  netlink interface to create vcan network devices. The creation and

  removal of vcan network devices can be managed with the ip(8) tool:



  - Create a virtual CAN network interface:

       ip link add type vcan



  - Create a virtual CAN network interface with a specific name 'vcan42':

       ip link add dev vcan42 type vcan



  - Remove a (virtual CAN) network interface 'vcan42':

       ip link del vcan42



  The tool 'vcan' from the SocketCAN SVN repository on BerliOS is obsolete.



  Virtual CAN network device creation in older Kernels:

  In Linux Kernel versions < 2.6.24 the vcan driver creates 4 vcan

  netdevices at module load time by default. This value can be changed

  with the module parameter 'numdev'. E.g. 'modprobe vcan numdev=8'



  6.5 currently supported CAN hardware



  On the project website http://developer.berlios.de/projects/socketcan

  there are different drivers available:
@@ -603,7 +639,7 @@ solution for a couple of reasons: 


  Please check the Mailing Lists on the berlios OSS project website.



  6.5 todo (September 2007)

  6.6 todo



  The configuration interface for CAN network drivers is still an open

  issue that has not been finalized in the socketcan project. Also the

Documentation/networking/multiqueue.txt

+53 −1
Original line number Diff line number Diff line
@@ -24,4 +24,56 @@ netif_{start|stop|wake}_subqueue() functions to manage each queue while the 
device is still operational.  netdev->queue_lock is still used when the device

comes online or when it's completely shut down (unregister_netdev(), etc.).



Author: Peter P. Waskiewicz Jr. <peter.p.waskiewicz.jr@intel.com>
 


Section 2: Qdisc support for multiqueue devices



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



Currently two qdiscs are optimized for multiqueue devices.  The first is the

default pfifo_fast qdisc.  This qdisc supports one qdisc per hardware queue.

A new round-robin qdisc, sch_multiq also supports multiple hardware queues. The

qdisc is responsible for classifying the skb's and then directing the skb's to

bands and queues based on the value in skb->queue_mapping.  Use this field in

the base driver to determine which queue to send the skb to.



sch_multiq has been added for hardware that wishes to avoid head-of-line

blocking.  It will cycle though the bands and verify that the hardware queue

associated with the band is not stopped prior to dequeuing a packet.



On qdisc load, the number of bands is based on the number of queues on the

hardware.  Once the association is made, any skb with skb->queue_mapping set,

will be queued to the band associated with the hardware queue.





Section 3: Brief howto using MULTIQ for multiqueue devices

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



The userspace command 'tc,' part of the iproute2 package, is used to configure

qdiscs.  To add the MULTIQ qdisc to your network device, assuming the device

is called eth0, run the following command:



# tc qdisc add dev eth0 root handle 1: multiq



The qdisc will allocate the number of bands to equal the number of queues that

the device reports, and bring the qdisc online.  Assuming eth0 has 4 Tx

queues, the band mapping would look like:



band 0 => queue 0

band 1 => queue 1

band 2 => queue 2

band 3 => queue 3



Traffic will begin flowing through each queue based on either the simple_tx_hash

function or based on netdev->select_queue() if you have it defined.



The behavior of tc filters remains the same.  However a new tc action,

skbedit, has been added.  Assuming you wanted to route all traffic to a

specific host, for example 192.168.0.3, through a specific queue you could use

this action and establish a filter such as:



tc filter add dev eth0 parent 1: protocol ip prio 1 u32 \

	match ip dst 192.168.0.3 \

	action skbedit queue_mapping 3



Author: Alexander Duyck <alexander.h.duyck@intel.com>

Original Author: Peter P. Waskiewicz Jr. <peter.p.waskiewicz.jr@intel.com>

CRA Git | Maintained and supported by SUSTech CRA and CCSE