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

Commit 13220a94 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: (1750 commits)
  ixgbe: Allow Priority Flow Control settings to survive a device reset
  net: core: remove unneeded include in net/core/utils.c.
  e1000e: update version number
  e1000e: fix close interrupt race
  e1000e: fix loss of multicast packets
  e1000e: commonize tx cleanup routine to match e1000 & igb
  netfilter: fix nf_logger name in ebt_ulog.
  netfilter: fix warning in ebt_ulog init function.
  netfilter: fix warning about invalid const usage
  e1000: fix close race with interrupt
  e1000: cleanup clean_tx_irq routine so that it completely cleans ring
  e1000: fix tx hang detect logic and address dma mapping issues
  bridge: bad error handling when adding invalid ether address
  bonding: select current active slave when enslaving device for mode tlb and alb
  gianfar: reallocate skb when headroom is not enough for fcb
  Bump release date to 25Mar2009 and version to 0.22
  r6040: Fix second PHY address
  qeth: fix wait_event_timeout handling
  qeth: check for completion of a running recovery
  qeth: unregister MAC addresses during recovery.
  ...

Manually fixed up conflicts in:
	drivers/infiniband/hw/cxgb3/cxio_hal.h
	drivers/infiniband/hw/nes/nes_nic.c
parents 8690d8a9 08abe18a

Documentation/DocBook/mac80211.tmpl

+8 −4
Original line number Original line Diff line number Diff line
@@ -17,8 +17,7 @@ 
    </authorgroup>

    </authorgroup>





    <copyright>

    <copyright>

      <year>2007</year>

      <year>2007-2009</year>

      <year>2008</year>

      <holder>Johannes Berg</holder>

      <holder>Johannes Berg</holder>

    </copyright>

    </copyright>
@@ -165,8 +164,8 @@ usage should require reading the full document. 
!Pinclude/net/mac80211.h Frame format

!Pinclude/net/mac80211.h Frame format

      </sect1>

      </sect1>

      <sect1>

      <sect1>

        <title>Alignment issues</title>

        <title>Packet alignment</title>

        <para>TBD</para>

!Pnet/mac80211/rx.c Packet alignment

      </sect1>

      </sect1>

      <sect1>

      <sect1>

        <title>Calling into mac80211 from interrupts</title>

        <title>Calling into mac80211 from interrupts</title>
@@ -223,6 +222,11 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_key_flags

!Finclude/net/mac80211.h ieee80211_key_flags

    </chapter>

    </chapter>





    <chapter id="powersave">

      <title>Powersave support</title>

!Pinclude/net/mac80211.h Powersave support

    </chapter>



    <chapter id="qos">

    <chapter id="qos">

      <title>Multiple queues and QoS support</title>

      <title>Multiple queues and QoS support</title>

      <para>TBD</para>

      <para>TBD</para>

Documentation/feature-removal-schedule.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -229,7 +229,9 @@ Who: Jan Engelhardt <jengelh@computergmbh.de> 
---------------------------

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





What:	b43 support for firmware revision < 410

What:	b43 support for firmware revision < 410

When:	July 2008

When:	The schedule was July 2008, but it was decided that we are going to keep the

        code as long as there are no major maintanance headaches.

	So it _could_ be removed _any_ time now, if it conflicts with something new.

Why:	The support code for the old firmware hurts code readability/maintainability

Why:	The support code for the old firmware hurts code readability/maintainability

	and slightly hurts runtime performance. Bugfixes for the old firmware

	and slightly hurts runtime performance. Bugfixes for the old firmware

	are not provided by Broadcom anymore.

	are not provided by Broadcom anymore.

Documentation/networking/dccp.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -141,7 +141,8 @@ rx_ccid = 2 
	Default CCID for the receiver-sender half-connection; see tx_ccid.

	Default CCID for the receiver-sender half-connection; see tx_ccid.





seq_window = 100

seq_window = 100

	The initial sequence window (sec. 7.5.2).

	The initial sequence window (sec. 7.5.2) of the sender. This influences

	the local ackno validity and the remote seqno validity windows (7.5.1).





tx_qlen = 5

tx_qlen = 5

	The size of the transmit buffer in packets. A value of 0 corresponds

	The size of the transmit buffer in packets. A value of 0 corresponds

Documentation/networking/ip-sysctl.txt

+81 −67
Original line number Original line Diff line number Diff line
@@ -625,11 +625,11 @@ log_martians - BOOLEAN 
accept_redirects - BOOLEAN

accept_redirects - BOOLEAN

	Accept ICMP redirect messages.

	Accept ICMP redirect messages.

	accept_redirects for the interface will be enabled if:

	accept_redirects for the interface will be enabled if:

	- both conf/{all,interface}/accept_redirects are TRUE in the case forwarding

	- both conf/{all,interface}/accept_redirects are TRUE in the case

	  for the interface is enabled

	  forwarding for the interface is enabled

	or

	or

	- at least one of conf/{all,interface}/accept_redirects is TRUE in the case

	- at least one of conf/{all,interface}/accept_redirects is TRUE in the

	  forwarding for the interface is disabled

	  case forwarding for the interface is disabled

	accept_redirects for the interface will be disabled otherwise

	accept_redirects for the interface will be disabled otherwise

	default TRUE (host)

	default TRUE (host)

		FALSE (router)

		FALSE (router)
@@ -640,8 +640,8 @@ forwarding - BOOLEAN 
mc_forwarding - BOOLEAN

mc_forwarding - BOOLEAN

	Do multicast routing. The kernel needs to be compiled with CONFIG_MROUTE

	Do multicast routing. The kernel needs to be compiled with CONFIG_MROUTE

	and a multicast routing daemon is required.

	and a multicast routing daemon is required.

	conf/all/mc_forwarding must also be set to TRUE to enable multicast routing

	conf/all/mc_forwarding must also be set to TRUE to enable multicast

	for the interface

	routing	for the interface





medium_id - INTEGER

medium_id - INTEGER

	Integer value used to differentiate the devices by the medium they

	Integer value used to differentiate the devices by the medium they
@@ -699,16 +699,22 @@ accept_source_route - BOOLEAN 
	default TRUE (router)

	default TRUE (router)

		FALSE (host)

		FALSE (host)





rp_filter - BOOLEAN

rp_filter - INTEGER

	1 - do source validation by reversed path, as specified in RFC1812

	    Recommended option for single homed hosts and stub network

	    routers. Could cause troubles for complicated (not loop free)

	    networks running a slow unreliable protocol (sort of RIP),

	    or using static routes.



	0 - No source validation.

	0 - No source validation.



	1 - Strict mode as defined in RFC3704 Strict Reverse Path

	conf/all/rp_filter must also be set to TRUE to do source validation

	    Each incoming packet is tested against the FIB and if the interface

	    is not the best reverse path the packet check will fail.

	    By default failed packets are discarded.

	2 - Loose mode as defined in RFC3704 Loose Reverse Path

	    Each incoming packet's source address is also tested against the FIB

	    and if the source address is not reachable via any interface

	    the packet check will fail.



	Current recommended practice in RFC3704 is to enable strict mode

	to prevent IP spoofing from DDos attacks. If using asymmetric routing

	or other complicated routing, then loose mode is recommended.



	conf/all/rp_filter must also be set to non-zero to do source validation

	on the interface

	on the interface





	Default value is 0. Note that some distributions enable it

	Default value is 0. Note that some distributions enable it
@@ -782,6 +788,12 @@ arp_ignore - INTEGER 
	The max value from conf/{all,interface}/arp_ignore is used

	The max value from conf/{all,interface}/arp_ignore is used

	when ARP request is received on the {interface}

	when ARP request is received on the {interface}





arp_notify - BOOLEAN

	Define mode for notification of address and device changes.

	0 - (default): do nothing

	1 - Generate gratuitous arp replies when device is brought up

	    or hardware address changes.



arp_accept - BOOLEAN

arp_accept - BOOLEAN

	Define behavior when gratuitous arp replies are received:

	Define behavior when gratuitous arp replies are received:

	0 - drop gratuitous arp frames

	0 - drop gratuitous arp frames
@@ -1031,7 +1043,9 @@ max_addresses - INTEGER 
	Default: 16

	Default: 16





disable_ipv6 - BOOLEAN

disable_ipv6 - BOOLEAN

	Disable IPv6 operation.

	Disable IPv6 operation.  If accept_dad is set to 2, this value

	will be dynamically set to TRUE if DAD fails for the link-local

	address.

	Default: FALSE (enable IPv6 operation)

	Default: FALSE (enable IPv6 operation)





accept_dad - INTEGER

accept_dad - INTEGER

Documentation/networking/ixgbe.txt

0 → 100644
+199 −0
Original line number Original line Diff line number Diff line 
Linux Base Driver for 10 Gigabit PCI Express Intel(R) Network Connection

========================================================================



March 10, 2009





Contents

========



- In This Release

- Identifying Your Adapter

- Building and Installation

- Additional Configurations

- Support







In This Release

===============



This file describes the ixgbe Linux Base Driver for the 10 Gigabit PCI

Express Intel(R) Network Connection.  This driver includes support for

Itanium(R)2-based systems.



For questions related to hardware requirements, refer to the documentation

supplied with your 10 Gigabit adapter.  All hardware requirements listed apply

to use with Linux.



The following features are available in this kernel:

 - Native VLANs

 - Channel Bonding (teaming)

 - SNMP

 - Generic Receive Offload

 - Data Center Bridging



Channel Bonding documentation can be found in the Linux kernel source:

/Documentation/networking/bonding.txt



Ethtool, lspci, and ifconfig can be used to display device and driver

specific information.





Identifying Your Adapter

========================



This driver supports devices based on the 82598 controller and the 82599

controller.



For specific information on identifying which adapter you have, please visit:



    http://support.intel.com/support/network/sb/CS-008441.htm





Building and Installation

=========================



select m for "Intel(R) 10GbE PCI Express adapters support" located at:

      Location:

        -> Device Drivers

          -> Network device support (NETDEVICES [=y])

            -> Ethernet (10000 Mbit) (NETDEV_10000 [=y])



1. make modules & make modules_install



2. Load the module:



# modprobe ixgbe



   The insmod command can be used if the full

   path to the driver module is specified.  For example:



     insmod /lib/modules/<KERNEL VERSION>/kernel/drivers/net/ixgbe/ixgbe.ko



   With 2.6 based kernels also make sure that older ixgbe drivers are

   removed from the kernel, before loading the new module:



     rmmod ixgbe; modprobe ixgbe



3. Assign an IP address to the interface by entering the following, where

   x is the interface number:



     ifconfig ethx <IP_address>



4. Verify that the interface works. Enter the following, where <IP_address>

   is the IP address for another machine on the same subnet as the interface

   that is being tested:



     ping  <IP_address>





Additional Configurations

=========================



  Viewing Link Messages

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

  Link messages will not be displayed to the console if the distribution is

  restricting system messages. In order to see network driver link messages on

  your console, set dmesg to eight by entering the following:



       dmesg -n 8



  NOTE: This setting is not saved across reboots.





  Jumbo Frames

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

  The driver supports Jumbo Frames for all adapters. Jumbo Frames support is

  enabled by changing the MTU to a value larger than the default of 1500.

  The maximum value for the MTU is 16110.  Use the ifconfig command to

  increase the MTU size.  For example:



        ifconfig ethx mtu 9000 up



  The maximum MTU setting for Jumbo Frames is 16110.  This value coincides

  with the maximum Jumbo Frames size of 16128.



  Generic Receive Offload, aka GRO

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

  The driver supports the in-kernel software implementation of GRO.  GRO has

  shown that by coalescing Rx traffic into larger chunks of data, CPU

  utilization can be significantly reduced when under large Rx load.  GRO is an

  evolution of the previously-used LRO interface.  GRO is able to coalesce

  other protocols besides TCP.  It's also safe to use with configurations that

  are problematic for LRO, namely bridging and iSCSI.



  GRO is enabled by default in the driver.  Future versions of ethtool will

  support disabling and re-enabling GRO on the fly.





  Data Center Bridging, aka DCB

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



  DCB is a configuration Quality of Service implementation in hardware.

  It uses the VLAN priority tag (802.1p) to filter traffic.  That means

  that there are 8 different priorities that traffic can be filtered into.

  It also enables priority flow control which can limit or eliminate the

  number of dropped packets during network stress.  Bandwidth can be

  allocated to each of these priorities, which is enforced at the hardware

  level.



  To enable DCB support in ixgbe, you must enable the DCB netlink layer to

  allow the userspace tools (see below) to communicate with the driver.

  This can be found in the kernel configuration here:



        -> Networking support

          -> Networking options

            -> Data Center Bridging support



  Once this is selected, DCB support must be selected for ixgbe.  This can

  be found here:



        -> Device Drivers

          -> Network device support (NETDEVICES [=y])

            -> Ethernet (10000 Mbit) (NETDEV_10000 [=y])

              -> Intel(R) 10GbE PCI Express adapters support

                -> Data Center Bridging (DCB) Support



  After these options are selected, you must rebuild your kernel and your

  modules.



  In order to use DCB, userspace tools must be downloaded and installed.

  The dcbd tools can be found at:



        http://e1000.sf.net





  Ethtool

  -------

  The driver utilizes the ethtool interface for driver configuration and

  diagnostics, as well as displaying statistical information.  Ethtool

  version 3.0 or later is required for this functionality.



  The latest release of ethtool can be found from

  http://sourceforge.net/projects/gkernel.





  NAPI

  ----



  NAPI (Rx polling mode) is supported in the ixgbe driver.  NAPI is enabled

  by default in the driver.



  See www.cyberus.ca/~hadi/usenix-paper.tgz for more information on NAPI.





Support

=======



For general information, go to the Intel support website at:



    http://support.intel.com



or the Intel Wired Networking project hosted by Sourceforge at:



    http://e1000.sourceforge.net



If an issue is identified with the released source code on the supported

kernel with a supported adapter, email the specific information related

to the issue to e1000-devel@lists.sf.net