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

Commit 06f4e926 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: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
parents 8e7bfcba d9351561

Documentation/ABI/testing/sysfs-bus-bcma

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
What:		/sys/bus/bcma/devices/.../manuf

Date:		May 2011

KernelVersion:	2.6.40

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		Each BCMA core has it's manufacturer id. See

		include/linux/bcma/bcma.h for possible values.



What:		/sys/bus/bcma/devices/.../id

Date:		May 2011

KernelVersion:	2.6.40

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		There are a few types of BCMA cores, they can be identified by

		id field.



What:		/sys/bus/bcma/devices/.../rev

Date:		May 2011

KernelVersion:	2.6.40

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		BCMA cores of the same type can still slightly differ depending

		on their revision. Use it for detailed programming.



What:		/sys/bus/bcma/devices/.../class

Date:		May 2011

KernelVersion:	2.6.40

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		Each BCMA core is identified by few fields, including class it

		belongs to. See include/linux/bcma/bcma.h for possible values.

Documentation/feature-removal-schedule.txt

+0 −21
Original line number Original line Diff line number Diff line
@@ -35,17 +35,6 @@ Who: Luis R. Rodriguez <lrodriguez@atheros.com> 




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

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





What:	AR9170USB

When:	2.6.40



Why:	This driver is deprecated and the firmware is no longer

	maintained. The replacement driver "carl9170" has been

	around for a while, so the devices are still supported.



Who:	Christian Lamparter <chunkeey@googlemail.com>



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



What:	IRQF_SAMPLE_RANDOM

What:	IRQF_SAMPLE_RANDOM

Check:	IRQF_SAMPLE_RANDOM

Check:	IRQF_SAMPLE_RANDOM

When:	July 2009

When:	July 2009
@@ -405,16 +394,6 @@ Who: anybody or Florian Mickler <florian@mickler.org> 




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

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





What:	capifs

When:	February 2011

Files:	drivers/isdn/capi/capifs.*

Why:	udev fully replaces this special file system that only contains CAPI

	NCCI TTY device nodes. User space (pppdcapiplugin) works without

	noticing the difference.

Who:	Jan Kiszka <jan.kiszka@web.de>



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



What:	KVM paravirt mmu host support

What:	KVM paravirt mmu host support

When:	January 2011

When:	January 2011

Why:	The paravirt mmu host support is slower than non-paravirt mmu, both

Why:	The paravirt mmu host support is slower than non-paravirt mmu, both

Documentation/networking/batman-adv.txt

+6 −5
Original line number Original line Diff line number Diff line 
[state: 27-01-2011]

[state: 17-04-2011]





BATMAN-ADV

BATMAN-ADV

----------

----------
@@ -19,6 +19,7 @@ duce the overhead to a minimum. It does not depend on any (other) 
network driver, and can be used on wifi as well as ethernet  lan,

network driver, and can be used on wifi as well as ethernet  lan,

vpn,  etc ... (anything with ethernet-style layer 2).

vpn,  etc ... (anything with ethernet-style layer 2).







CONFIGURATION

CONFIGURATION

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

-------------
@@ -160,13 +161,13 @@ face. Each entry can/has to have the following values: 
-> "TQ mac  value"  -  src mac's link quality towards mac address

-> "TQ mac  value"  -  src mac's link quality towards mac address

                       of a neighbor originator's interface which

                       of a neighbor originator's interface which

                       is being used for routing

                       is being used for routing

-> "HNA mac" - HNA announced by source mac

-> "TT mac" - TT announced by source mac

-> "PRIMARY" - this  is a primary interface

-> "PRIMARY" - this  is a primary interface

-> "SEC mac" - secondary mac address of source

-> "SEC mac" - secondary mac address of source

               (requires preceding PRIMARY)

               (requires preceding PRIMARY)





The TQ value has a range from 4 to 255 with 255 being  the  best.

The TQ value has a range from 4 to 255 with 255 being  the  best.

The HNA entries are showing which hosts are connected to the mesh

The TT entries are showing which hosts are connected to the mesh

via bat0 or being bridged into the mesh network.  The PRIMARY/SEC

via bat0 or being bridged into the mesh network.  The PRIMARY/SEC

values are only applied on primary interfaces

values are only applied on primary interfaces
@@ -199,7 +200,7 @@ abled during run time. Following log_levels are defined: 




0 - All  debug  output  disabled

0 - All  debug  output  disabled

1 - Enable messages related to routing / flooding / broadcasting

1 - Enable messages related to routing / flooding / broadcasting

2 - Enable route or hna added / changed / deleted

2 - Enable route or tt entry added / changed / deleted

3 - Enable all messages

3 - Enable all messages





The debug output can be changed at runtime  using  the  file

The debug output can be changed at runtime  using  the  file
@@ -207,7 +208,7 @@ The debug output can be changed at runtime using the file 




# echo 2 > /sys/class/net/bat0/mesh/log_level

# echo 2 > /sys/class/net/bat0/mesh/log_level





will enable debug messages for when routes or HNAs change.

will enable debug messages for when routes or TTs change.









BATCTL

BATCTL

Documentation/networking/bonding.txt

+16 −18
Original line number Original line Diff line number Diff line 




		Linux Ethernet Bonding Driver HOWTO

		Linux Ethernet Bonding Driver HOWTO





		Latest update: 23 September 2009

		Latest update: 27 April 2011





Initial release : Thomas Davis <tadavis at lbl.gov>

Initial release : Thomas Davis <tadavis at lbl.gov>

Corrections, HA extensions : 2000/10/03-15 :

Corrections, HA extensions : 2000/10/03-15 :
@@ -585,25 +585,23 @@ mode 
		chosen.

		chosen.





num_grat_arp

num_grat_arp



	Specifies the number of gratuitous ARPs to be issued after a

	failover event.  One gratuitous ARP is issued immediately after

	the failover, subsequent ARPs are sent at a rate of one per link

	monitor interval (arp_interval or miimon, whichever is active).



	The valid range is 0 - 255; the default value is 1.  This option

	affects only the active-backup mode.  This option was added for

	bonding version 3.3.0.



num_unsol_na

num_unsol_na





	Specifies the number of unsolicited IPv6 Neighbor Advertisements

	Specify the number of peer notifications (gratuitous ARPs and

	to be issued after a failover event.  One unsolicited NA is issued

	unsolicited IPv6 Neighbor Advertisements) to be issued after a

	immediately after the failover.

	failover event.  As soon as the link is up on the new slave



	(possibly immediately) a peer notification is sent on the

	The valid range is 0 - 255; the default value is 1.  This option

	bonding device and each VLAN sub-device.  This is repeated at

	affects only the active-backup mode.  This option was added for

	each link monitor interval (arp_interval or miimon, whichever

	bonding version 3.4.0.

	is active) if the number is greater than 1.



	The valid range is 0 - 255; the default value is 1.  These options

	affect only the active-backup mode.  These options were added for

	bonding versions 3.3.0 and 3.4.0 respectively.



	From Linux 2.6.40 and bonding version 3.7.1, these notifications

	are generated by the ipv4 and ipv6 code and the numbers of

	repetitions cannot be set independently.





primary

primary

Documentation/networking/igb.txt

+13 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,19 @@ Additional Configurations 
  REQUIREMENTS: MSI-X support is required for Multiqueue. If MSI-X is not

  REQUIREMENTS: MSI-X support is required for Multiqueue. If MSI-X is not

  found, the system will fallback to MSI or to Legacy interrupts.

  found, the system will fallback to MSI or to Legacy interrupts.





  MAC and VLAN anti-spoofing feature

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

  When a malicious driver attempts to send a spoofed packet, it is dropped by

  the hardware and not transmitted.  An interrupt is sent to the PF driver

  notifying it of the spoof attempt.



  When a spoofed packet is detected the PF driver will send the following

  message to the system log (displayed by  the "dmesg" command):



  Spoof event(s) detected on VF(n)



  Where n=the VF that attempted to do the spoofing.



Support

Support

=======

=======