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

Commit 42a2d923 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking updates from David Miller:

 1) The addition of nftables.  No longer will we need protocol aware
    firewall filtering modules, it can all live in userspace.

    At the core of nftables is a, for lack of a better term, virtual
    machine that executes byte codes to inspect packet or metadata
    (arriving interface index, etc.) and make verdict decisions.

    Besides support for loading packet contents and comparing them, the
    interpreter supports lookups in various datastructures as
    fundamental operations.  For example sets are supports, and
    therefore one could create a set of whitelist IP address entries
    which have ACCEPT verdicts attached to them, and use the appropriate
    byte codes to do such lookups.

    Since the interpreted code is composed in userspace, userspace can
    do things like optimize things before giving it to the kernel.

    Another major improvement is the capability of atomicall...
parents 5cbb3d21 75ecab1d

Documentation/ABI/testing/sysfs-class-net-batman-adv

+2 −2
Original line number Diff line number Diff line 


What:           /sys/class/net/<iface>/batman-adv/iface_status

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Indicates the status of <iface> as it is seen by batman.



What:           /sys/class/net/<iface>/batman-adv/mesh_iface

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                The /sys/class/net/<iface>/batman-adv/mesh_iface file

                displays the batman mesh interface this <iface>

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

+12 −22
Original line number Diff line number Diff line 


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

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Indicates whether the batman protocol messages of the

                mesh <mesh_iface> shall be aggregated or not.



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

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

Date:           May 2011

Contact:        Antonio Quartulli <ordex@autistici.org>

Contact:        Antonio Quartulli <antonio@meshcoding.com>

Description:

                Indicates whether the data traffic going from a

                wireless client to another wireless client will be

                silently dropped.

                silently dropped. <vlan_subdir> is empty when referring

		to the untagged lan.



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

Date:           June 2010

Contact:        Simon Wunderlich <siwu@hrz.tu-chemnitz.de>

Contact:        Simon Wunderlich <sw@simonwunderlich.de>

Description:

                Indicates whether the data traffic going through the

                mesh will be sent using multiple interfaces at the
@@ -24,7 +25,7 @@ Description: 


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

Date:           November 2011

Contact:        Simon Wunderlich <siwu@hrz.tu-chemnitz.de>

Contact:        Simon Wunderlich <sw@simonwunderlich.de>

Description:

                Indicates whether the bridge loop avoidance feature

                is enabled. This feature detects and avoids loops
@@ -41,21 +42,21 @@ Description: 


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

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the bandwidth which is propagated by this

                node if gw_mode was set to 'server'.



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

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the state of the gateway features. Can be

                either 'off', 'client' or 'server'.



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

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the selection criteria this node will use

                to choose a gateway if gw_mode was set to 'client'.
@@ -77,25 +78,14 @@ Description: 


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

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the interval in milliseconds in which batman

                sends its protocol messages.



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

Date:           Dec 2011

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the routing procotol this mesh instance

                uses to find the optimal paths through the mesh.
 


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

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Each batman node only maintains information about its

                own local neighborhood, therefore generating graphs

                showing the topology of the entire mesh is not easily

                feasible without having a central instance to collect

                the local topologies from all nodes. This file allows

                to activate the collecting (server) mode.

Documentation/DocBook/80211.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ 
!Finclude/net/cfg80211.h cfg80211_scan_request

!Finclude/net/cfg80211.h cfg80211_scan_done

!Finclude/net/cfg80211.h cfg80211_bss

!Finclude/net/cfg80211.h cfg80211_inform_bss_frame

!Finclude/net/cfg80211.h cfg80211_inform_bss

!Finclude/net/cfg80211.h cfg80211_inform_bss_width_frame

!Finclude/net/cfg80211.h cfg80211_inform_bss_width

!Finclude/net/cfg80211.h cfg80211_unlink_bss

!Finclude/net/cfg80211.h cfg80211_find_ie

!Finclude/net/cfg80211.h ieee80211_bss_get_ie

Documentation/devicetree/bindings/net/cpsw-phy-sel.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
TI CPSW Phy mode Selection Device Tree Bindings

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



Required properties:

- compatible		: Should be "ti,am3352-cpsw-phy-sel"

- reg			: physical base address and size of the cpsw

			  registers map

- reg-names		: names of the register map given in "reg" node



Optional properties:

-rmii-clock-ext		: If present, the driver will configure the RMII

			  interface to external clock usage



Examples:



	phy_sel: cpsw-phy-sel@44e10650 {

		compatible = "ti,am3352-cpsw-phy-sel";

		reg= <0x44e10650 0x4>;

		reg-names = "gmii-sel";

	};



(or)

	phy_sel: cpsw-phy-sel@44e10650 {

		compatible = "ti,am3352-cpsw-phy-sel";

		reg= <0x44e10650 0x4>;

		reg-names = "gmii-sel";

		rmii-clock-ext;

	};

Documentation/networking/batman-adv.txt

+4 −50
Original line number Diff line number Diff line
@@ -69,8 +69,7 @@ folder: 
# aggregated_ogms        gw_bandwidth           log_level

# ap_isolation           gw_mode                orig_interval

# bonding                gw_sel_class           routing_algo

# bridge_loop_avoidance  hop_penalty            vis_mode

# fragmentation

# bridge_loop_avoidance  hop_penalty            fragmentation





There is a special folder for debugging information:
@@ -78,7 +77,7 @@ There is a special folder for debugging information: 
# ls /sys/kernel/debug/batman_adv/bat0/

# bla_backbone_table  log                 transtable_global

# bla_claim_table     originators         transtable_local

# gateways            socket              vis_data

# gateways            socket



Some of the files contain all sort of status information  regard-

ing  the  mesh  network.  For  example, you can view the table of
@@ -127,51 +126,6 @@ ously assigned to interfaces now used by batman advanced, e.g. 
# ifconfig eth0 0.0.0.0





VISUALIZATION

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



If you want topology visualization, at least one mesh  node  must

be configured as VIS-server:



# echo "server" > /sys/class/net/bat0/mesh/vis_mode



Each  node  is  either configured as "server" or as "client" (de-

fault: "client").  Clients send their topology data to the server

next to them, and server synchronize with other servers. If there

is no server configured (default) within the  mesh,  no  topology

information   will  be  transmitted.  With  these  "synchronizing

servers", there can be 1 or more vis servers sharing the same (or

at least very similar) data.



When  configured  as  server,  you can get a topology snapshot of

your mesh:



# cat /sys/kernel/debug/batman_adv/bat0/vis_data



This raw output is intended to be easily parsable and convertable

with  other tools. Have a look at the batctl README if you want a

vis output in dot or json format for instance and how those  out-

puts could then be visualised in an image.



The raw format consists of comma separated values per entry where

each entry is giving information about a  certain  source  inter-

face.  Each  entry can/has to have the following values:

-> "mac" - mac address of an originator's source interface

           (each line begins with it)

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

                       of a neighbor originator's interface which

                       is being used for routing

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

-> "PRIMARY" - this  is a primary interface

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

               (requires preceding PRIMARY)



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

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

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

values are only applied on primary interfaces





LOGGING/DEBUGGING

-----------------
@@ -245,5 +199,5 @@ Mailing-list: b.a.t.m.a.n@open-mesh.org (optional subscription 


You can also contact the Authors:



Marek  Lindner  <lindner_marek@yahoo.de>

Simon  Wunderlich  <siwu@hrz.tu-chemnitz.de>
 
Marek  Lindner  <mareklindner@neomailbox.ch>

Simon  Wunderlich  <sw@simonwunderlich.de>