forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: (1436 commits) cassini: Use local-mac-address prom property for Cassini MAC address net: remove the duplicate #ifdef __KERNEL__ net: bridge: check the length of skb after nf_bridge_maybe_copy_header() netconsole: clarify stopping message netconsole: don't announce stopping if nothing happened cnic: Fix the type field in SPQ messages netfilter: fix export secctx error handling netfilter: fix the race when initializing nf_ct_expect_hash_rnd ipv4: IP defragmentation must be ECN aware net: r6040: Return proper error for r6040_init_one dcb: use after free in dcb_flushapp() dcb: unlock on error in dcbnl_ieee_get() net: ixp4xx_eth: Return proper error for eth_init_one include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel net: add POLLPRI to sock_def_readable() af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks. net_sched: pfifo_head_drop problem mac80211: remove stray extern mac80211: implement off-channel TX using hw r-o-c offload mac80211: implement hardware offload for remain-on-channel ...
- Loading branch information
Showing
1,108 changed files
with
147,627 additions
and
78,392 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
|
|
||
| What: /sys/class/net/<iface>/batman-adv/mesh_iface | ||
| Date: May 2010 | ||
| Contact: Marek Lindner <[email protected]> | ||
| Description: | ||
| The /sys/class/net/<iface>/batman-adv/mesh_iface file | ||
| displays the batman mesh interface this <iface> | ||
| currently is associated with. | ||
|
|
||
| What: /sys/class/net/<iface>/batman-adv/iface_status | ||
| Date: May 2010 | ||
| Contact: Marek Lindner <[email protected]> | ||
| Description: | ||
| Indicates the status of <iface> as it is seen by batman. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
|
|
||
| What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms | ||
| Date: May 2010 | ||
| Contact: Marek Lindner <[email protected]> | ||
| Description: | ||
| Indicates whether the batman protocol messages of the | ||
| mesh <mesh_iface> shall be aggregated or not. | ||
|
|
||
| What: /sys/class/net/<mesh_iface>/mesh/bonding | ||
| Date: June 2010 | ||
| Contact: Simon Wunderlich <[email protected]> | ||
| Description: | ||
| Indicates whether the data traffic going through the | ||
| mesh will be sent using multiple interfaces at the | ||
| same time (if available). | ||
|
|
||
| What: /sys/class/net/<mesh_iface>/mesh/fragmentation | ||
| Date: October 2010 | ||
| Contact: Andreas Langer <[email protected]> | ||
| Description: | ||
| Indicates whether the data traffic going through the | ||
| mesh will be fragmented or silently discarded if the | ||
| packet size exceeds the outgoing interface MTU. | ||
|
|
||
| What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth | ||
| Date: October 2010 | ||
| Contact: Marek Lindner <[email protected]> | ||
| 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 <[email protected]> | ||
| 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 <[email protected]> | ||
| Description: | ||
| Defines the selection criteria this node will use | ||
| to choose a gateway if gw_mode was set to 'client'. | ||
|
|
||
| What: /sys/class/net/<mesh_iface>/mesh/orig_interval | ||
| Date: May 2010 | ||
| Contact: Marek Lindner <[email protected]> | ||
| Description: | ||
| Defines the interval in milliseconds in which batman | ||
| sends its protocol messages. | ||
|
|
||
| What: /sys/class/net/<mesh_iface>/mesh/hop_penalty | ||
| Date: Oct 2010 | ||
| Contact: Linus Lüssing <[email protected]> | ||
| Description: | ||
| Defines the penalty which will be applied to an | ||
| originator message's tq-field on every hop. | ||
|
|
||
| What: /sys/class/net/<mesh_iface>/mesh/vis_mode | ||
| Date: May 2010 | ||
| Contact: Marek Lindner <[email protected]> | ||
| 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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.