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

Commit 8a9ea323 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.
parents 1be025d3 8b3408f8

Documentation/ABI/testing/sysfs-class-net-mesh

+8 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,14 @@ Description: 
                mesh will be fragmented or silently discarded if the

                mesh will be fragmented or silently discarded if the

                packet size exceeds the outgoing interface MTU.

                packet size exceeds the outgoing interface MTU.





What:		/sys/class/net/<mesh_iface>/mesh/ap_isolation

Date:		May 2011

Contact:	Antonio Quartulli <ordex@autistici.org>

Description:

		Indicates whether the data traffic going from a

		wireless client to another wireless client will be

		silently dropped.



What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth

What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth

Date:           October 2010

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Documentation/DocBook/80211.tmpl

+10 −1
Original line number Original line Diff line number Diff line
@@ -433,8 +433,18 @@ 
          Insert notes about VLAN interfaces with hw crypto here or

          Insert notes about VLAN interfaces with hw crypto here or

          in the hw crypto chapter.

          in the hw crypto chapter.

        </para>

        </para>

      <section id="ps-client">

        <title>support for powersaving clients</title>

!Pinclude/net/mac80211.h AP support for powersaving clients

      </section>

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_beacon_get

!Finclude/net/mac80211.h ieee80211_beacon_get

!Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe

!Finclude/net/mac80211.h ieee80211_frame_release_type

!Finclude/net/mac80211.h ieee80211_sta_ps_transition

!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni

!Finclude/net/mac80211.h ieee80211_sta_set_buffered

!Finclude/net/mac80211.h ieee80211_sta_block_awake

      </chapter>

      </chapter>





      <chapter id="multi-iface">

      <chapter id="multi-iface">
@@ -460,7 +470,6 @@ 
!Finclude/net/mac80211.h sta_notify_cmd

!Finclude/net/mac80211.h sta_notify_cmd

!Finclude/net/mac80211.h ieee80211_find_sta

!Finclude/net/mac80211.h ieee80211_find_sta

!Finclude/net/mac80211.h ieee80211_find_sta_by_ifaddr

!Finclude/net/mac80211.h ieee80211_find_sta_by_ifaddr

!Finclude/net/mac80211.h ieee80211_sta_block_awake

      </chapter>

      </chapter>





      <chapter id="hardware-scan-offload">

      <chapter id="hardware-scan-offload">

Documentation/devicetree/bindings/net/can/fsl-flexcan.txt

+13 −50
Original line number Original line Diff line number Diff line 
CAN Device Tree Bindings

Flexcan CAN contoller on Freescale's ARM and PowerPC system-on-a-chip (SOC).

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

2011 Freescale Semiconductor, Inc.





fsl,flexcan-v1.0 nodes

Required properties:

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

In addition to the required compatible-, reg- and interrupt-properties, you can

also specify which clock source shall be used for the controller.





CPI Clock- Can Protocol Interface Clock

- compatible : Should be "fsl,<processor>-flexcan"

	This CLK_SRC bit of CTRL(control register) selects the clock source to

	the CAN Protocol Interface(CPI) to be either the peripheral clock

	(driven by the PLL) or the crystal oscillator clock. The selected clock

	is the one fed to the prescaler to generate the Serial Clock (Sclock).

	The PRESDIV field of CTRL(control register) controls a prescaler that

	generates the Serial Clock (Sclock), whose period defines the

	time quantum used to compose the CAN waveform.





Can Engine Clock Source

  An implementation should also claim any of the following compatibles

	There are two sources for CAN clock

  that it is fully backwards compatible with:

	- Platform Clock  It represents the bus clock

	- Oscillator Clock





	Peripheral Clock (PLL)

  - fsl,p1010-flexcan

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

		     |

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

		    |       |CPI Clock	      | Prescaler |       Sclock

		    |       |---------------->| (1.. 256) |------------>

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

                     |  |

	--------------  ---------------------CLK_SRC

	Oscillator Clock





- fsl,flexcan-clock-source : CAN Engine Clock Source.This property selects

- reg : Offset and length of the register set for this device

			     the peripheral clock. PLL clock is fed to the

- interrupts : Interrupt tuple for this device

			     prescaler to generate the Serial Clock (Sclock).

- clock-frequency : The oscillator frequency driving the flexcan device

			     Valid values are "oscillator" and "platform"

			     "oscillator": CAN engine clock source is oscillator clock.

			     "platform" The CAN engine clock source is the bus clock

		             (platform clock).





- fsl,flexcan-clock-divider : for the reference and system clock, an additional

Example:

			      clock divider can be specified.

- clock-frequency: frequency required to calculate the bitrate for FlexCAN.





Note:

	can@1c000 {

	- v1.0 of flexcan-v1.0 represent the IP block version for P1010 SOC.

		compatible = "fsl,p1010-flexcan";

	- P1010 does not have oscillator as the Clock Source.So the default

	  Clock Source is platform clock.

Examples:



	can0@1c000 {

		compatible = "fsl,flexcan-v1.0";

		reg = <0x1c000 0x1000>;

		reg = <0x1c000 0x1000>;

		interrupts = <48 0x2>;

		interrupts = <48 0x2>;

		interrupt-parent = <&mpic>;

		interrupt-parent = <&mpic>;

		fsl,flexcan-clock-source = "platform";

		clock-frequency = <200000000>; // filled in by bootloader

		fsl,flexcan-clock-divider = <2>;

		clock-frequency = <fixed by u-boot>;

	};
 
	};

Documentation/devicetree/bindings/net/smsc911x.txt

0 → 100644
+38 −0
Original line number Original line Diff line number Diff line 
* Smart Mixed-Signal Connectivity (SMSC) LAN911x/912x Controller



Required properties:

- compatible : Should be "smsc,lan<model>", "smsc,lan9115"

- reg : Address and length of the io space for SMSC LAN

- interrupts : Should contain SMSC LAN interrupt line

- interrupt-parent : Should be the phandle for the interrupt controller

  that services interrupts for this device

- phy-mode : String, operation mode of the PHY interface.

  Supported values are: "mii", "gmii", "sgmii", "tbi", "rmii",

  "rgmii", "rgmii-id", "rgmii-rxid", "rgmii-txid", "rtbi", "smii".



Optional properties:

- reg-shift : Specify the quantity to shift the register offsets by

- reg-io-width : Specify the size (in bytes) of the IO accesses that

  should be performed on the device.  Valid value for SMSC LAN is

  2 or 4.  If it's omitted or invalid, the size would be 2.

- smsc,irq-active-high : Indicates the IRQ polarity is active-high

- smsc,irq-push-pull : Indicates the IRQ type is push-pull

- smsc,force-internal-phy : Forces SMSC LAN controller to use

  internal PHY

- smsc,force-external-phy : Forces SMSC LAN controller to use

  external PHY

- smsc,save-mac-address : Indicates that mac address needs to be saved

  before resetting the controller

- local-mac-address : 6 bytes, mac address



Examples:



lan9220@f4000000 {

	compatible = "smsc,lan9220", "smsc,lan9115";

	reg = <0xf4000000 0x2000000>;

	phy-mode = "mii";

	interrupt-parent = <&gpio1>;

	interrupts = <31>;

	reg-io-width = <4>;

	smsc,irq-push-pull;

};

Documentation/feature-removal-schedule.txt

+9 −0
Original line number Original line Diff line number Diff line
@@ -594,9 +594,18 @@ Why: In 3.0, we can now autodetect internal 3G device and already have 
Who:    Lee, Chun-Yi <jlee@novell.com>

Who:    Lee, Chun-Yi <jlee@novell.com>





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

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



What:	The XFS nodelaylog mount option

What:	The XFS nodelaylog mount option

When:	3.3

When:	3.3

Why:	The delaylog mode that has been the default since 2.6.39 has proven

Why:	The delaylog mode that has been the default since 2.6.39 has proven

	stable, and the old code is in the way of additional improvements in

	stable, and the old code is in the way of additional improvements in

	the log code.

	the log code.

Who:	Christoph Hellwig <hch@lst.de>

Who:	Christoph Hellwig <hch@lst.de>



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



What:	iwlagn alias support

When:	3.5

Why:	The iwlagn module has been renamed iwlwifi.  The alias will be around

	for backward compatibility for several cycles and then dropped.

Who:	Don Fry <donald.h.fry@intel.com>