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

Commit 7a636280 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.
parents 6445ced8 ceda86a1
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
@@ -35,6 +35,17 @@ 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
Check:	IRQF_SAMPLE_RANDOM
When:	July 2009
@@ -604,6 +615,13 @@ Who: Jean Delvare <khali@linux-fr.org>

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

What:	xt_connlimit rev 0
When:	2012
Who:	Jan Engelhardt <jengelh@medozas.de>
Files:	net/netfilter/xt_connlimit.c

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

What:	noswapaccount kernel command line parameter
When:	2.6.40
Why:	The original implementation of memsw feature enabled by
@@ -619,3 +637,11 @@ Why: The original implementation of memsw feature enabled by
Who:	Michal Hocko <mhocko@suse.cz>

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

What:	ipt_addrtype match include file
When:	2012
Why:	superseded by xt_addrtype
Who:	Florian Westphal <fw@strlen.de>
Files:	include/linux/netfilter_ipv4/ipt_addrtype.h

----------------------------
+8 −8
Original line number Diff line number Diff line
[state: 21-11-2010]
[state: 27-01-2011]

BATMAN-ADV
----------
@@ -67,15 +67,16 @@ All mesh wide settings can be found in batman's own interface
folder:

#  ls  /sys/class/net/bat0/mesh/
#  aggregated_ogms  bonding  fragmentation  orig_interval
#  vis_mode
#  aggregated_ogms  gw_bandwidth  hop_penalty
#  bonding          gw_mode       orig_interval
#  fragmentation    gw_sel_class  vis_mode


There is a special folder for debugging informations:

#  ls /sys/kernel/debug/batman_adv/bat0/
#  originators  socket  transtable_global  transtable_local
#  vis_data
#  gateways     socket        transtable_global  vis_data
#  originators  softif_neigh  transtable_local


Some of the files contain all sort of status information  regard-
@@ -230,9 +231,8 @@ CONTACT
Please send us comments, experiences, questions, anything :)

IRC:            #batman   on   irc.freenode.org
Mailing-list:   b.a.t.m.a.n@b.a.t.m.a.n@lists.open-mesh.org
                (optional   subscription   at
                 https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n)
Mailing-list:   b.a.t.m.a.n@open-mesh.org (optional  subscription
          at https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n)

You can also contact the Authors:

+17 −9
Original line number Diff line number Diff line
@@ -2561,15 +2561,12 @@ enslaved.
	The latest version of the bonding driver can be found in the latest
version of the linux kernel, found on http://kernel.org

The latest version of this document can be found in either the latest
kernel source (named Documentation/networking/bonding.txt), or on the
bonding sourceforge site:
	The latest version of this document can be found in the latest kernel
source (named Documentation/networking/bonding.txt).

http://www.sourceforge.net/projects/bonding

Discussions regarding the bonding driver take place primarily on the
bonding-devel mailing list, hosted at sourceforge.net.  If you have
questions or problems, post them to the list.  The list address is:
	Discussions regarding the usage of the bonding driver take place on the
bonding-devel mailing list, hosted at sourceforge.net. If you have questions or
problems, post them to the list.  The list address is:

bonding-devel@lists.sourceforge.net

@@ -2578,6 +2575,17 @@ be found at:

https://lists.sourceforge.net/lists/listinfo/bonding-devel

	Discussions regarding the developpement of the bonding driver take place
on the main Linux network mailing list, hosted at vger.kernel.org. The list
address is:

netdev@vger.kernel.org

	The administrative interface (to subscribe or unsubscribe) can
be found at:

http://vger.kernel.org/vger-lists.html#netdev

Donald Becker's Ethernet Drivers and diag programs may be found at :
 - http://web.archive.org/web/*/http://www.scyld.com/network/ 

+11 −0
Original line number Diff line number Diff line
@@ -280,6 +280,17 @@ tcp_max_orphans - INTEGER
	more aggressively. Let me to remind again: each orphan eats
	up to ~64K of unswappable memory.

tcp_max_ssthresh - INTEGER
	Limited Slow-Start for TCP with large congestion windows (cwnd) defined in
	RFC3742. Limited slow-start is a mechanism to limit growth of the cwnd
	on the region where cwnd is larger than tcp_max_ssthresh. TCP increases cwnd
	by at most tcp_max_ssthresh segments, and by at least tcp_max_ssthresh/2
	segments per RTT when the cwnd is above tcp_max_ssthresh.
	If TCP connection increased cwnd to thousands (or tens of thousands) segments,
	and thousands of packets were being dropped during slow-start, you can set
	tcp_max_ssthresh to improve performance for new TCP connection.
	Default: 0 (off)

tcp_max_syn_backlog - INTEGER
	Maximal number of remembered connection requests, which are
	still did not receive an acknowledgment from connecting client.
+25 −42
Original line number Diff line number Diff line
@@ -154,9 +154,28 @@ connections, one per accept()'d socket.
    write(cfd, msg, msglen);
  }

Connections are established between two endpoints by a "third party"
application. This means that both endpoints are passive; so connect()
is not possible.
Connections are traditionally established between two endpoints by a
"third party" application. This means that both endpoints are passive.


As of Linux kernel version 2.6.39, it is also possible to connect
two endpoints directly, using connect() on the active side. This is
intended to support the newer Nokia Wireless Modem API, as found in
e.g. the Nokia Slim Modem in the ST-Ericsson U8500 platform:

  struct sockaddr_spn spn;
  int fd;

  fd = socket(PF_PHONET, SOCK_SEQPACKET, PN_PROTO_PIPE);
  memset(&spn, 0, sizeof(spn));
  spn.spn_family = AF_PHONET;
  spn.spn_obj = ...;
  spn.spn_dev = ...;
  spn.spn_resource = 0xD9;
  connect(fd, (struct sockaddr *)&spn, sizeof(spn));
  /* normal I/O here ... */
  close(fd);


WARNING:
When polling a connected pipe socket for writability, there is an
@@ -181,45 +200,9 @@ The pipe protocol provides two socket options at the SOL_PNPIPE level:
    interface index of the network interface created by PNPIPE_ENCAP,
    or zero if encapsulation is off.


Phonet Pipe-controller Implementation
-------------------------------------

Phonet Pipe-controller is enabled by selecting the CONFIG_PHONET_PIPECTRLR Kconfig
option. It is useful when communicating with those Nokia Modems which do not
implement Pipe controller in them e.g. Nokia Slim Modem used in ST-Ericsson
U8500 platform.

The implementation is based on the Data Connection Establishment Sequence
depicted in 'Nokia Wireless Modem API - Wireless_modem_user_guide.pdf'
document.

It allows a phonet sequenced socket (host-pep) to initiate a Pipe connection
between itself and a remote pipe-end point (e.g. modem).

The implementation adds socket options at SOL_PNPIPE level:

 PNPIPE_PIPE_HANDLE
	It accepts an integer argument for setting value of pipe handle.

  PNPIPE_ENABLE accepts one integer value (int). If set to zero, the pipe
    is disabled. If the value is non-zero, the pipe is enabled. If the pipe
    is not (yet) connected, ENOTCONN is error is returned.

The implementation also adds socket 'connect'. On calling the 'connect', pipe
will be created between the source socket and the destination, and the pipe
state will be set to PIPE_DISABLED.

After a pipe has been created and enabled successfully, the Pipe data can be
exchanged between the host-pep and remote-pep (modem).

User-space would typically follow below sequence with Pipe controller:-
-socket
-bind
-setsockopt for PNPIPE_PIPE_HANDLE
-connect
-setsockopt for PNPIPE_ENCAP_IP
-setsockopt for PNPIPE_ENABLE
  PNPIPE_HANDLE is a read-only integer value. It contains the underlying
    identifier ("pipe handle") of the pipe. This is only defined for
    socket descriptors that are already connected or being connected.


Authors
Loading