aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 07:25:22 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 07:25:22 -0400
commit8a9ea3237e7eb5c25f09e429ad242ae5a3d5ea22 (patch)
treea0a63398a9983667d52cbbbf4e2405b4f22b1d83 /Documentation/networking
parent1be025d3cb40cd295123af2c394f7229ef9b30ca (diff)
parent8b3408f8ee994973869d8ba32c5bf482bc4ddca4 (diff)
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.
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/batman-adv.txt8
-rw-r--r--Documentation/networking/ip-sysctl.txt17
-rw-r--r--Documentation/networking/mac80211-injection.txt4
-rw-r--r--Documentation/networking/netdevices.txt4
-rw-r--r--Documentation/networking/stmmac.txt44
5 files changed, 60 insertions, 17 deletions
diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 88d4afbdef98..c86d03f18a5b 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -1,4 +1,4 @@
1[state: 17-04-2011] 1[state: 21-08-2011]
2 2
3BATMAN-ADV 3BATMAN-ADV
4---------- 4----------
@@ -68,9 +68,9 @@ All mesh wide settings can be found in batman's own interface
68folder: 68folder:
69 69
70# ls /sys/class/net/bat0/mesh/ 70# ls /sys/class/net/bat0/mesh/
71# aggregated_ogms gw_bandwidth hop_penalty 71# aggregated_ogms fragmentation gw_sel_class vis_mode
72# bonding gw_mode orig_interval 72# ap_isolation gw_bandwidth hop_penalty
73# fragmentation gw_sel_class vis_mode 73# bonding gw_mode orig_interval
74 74
75 75
76There is a special folder for debugging information: 76There is a special folder for debugging information:
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index ca5cdcd0f0e3..cb7f3148035d 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1045,6 +1045,11 @@ conf/interface/*:
1045accept_ra - INTEGER 1045accept_ra - INTEGER
1046 Accept Router Advertisements; autoconfigure using them. 1046 Accept Router Advertisements; autoconfigure using them.
1047 1047
1048 It also determines whether or not to transmit Router
1049 Solicitations. If and only if the functional setting is to
1050 accept Router Advertisements, Router Solicitations will be
1051 transmitted.
1052
1048 Possible values are: 1053 Possible values are:
1049 0 Do not accept Router Advertisements. 1054 0 Do not accept Router Advertisements.
1050 1 Accept Router Advertisements if forwarding is disabled. 1055 1 Accept Router Advertisements if forwarding is disabled.
@@ -1115,14 +1120,14 @@ forwarding - INTEGER
1115 Possible values are: 1120 Possible values are:
1116 0 Forwarding disabled 1121 0 Forwarding disabled
1117 1 Forwarding enabled 1122 1 Forwarding enabled
1118 2 Forwarding enabled (Hybrid Mode)
1119 1123
1120 FALSE (0): 1124 FALSE (0):
1121 1125
1122 By default, Host behaviour is assumed. This means: 1126 By default, Host behaviour is assumed. This means:
1123 1127
1124 1. IsRouter flag is not set in Neighbour Advertisements. 1128 1. IsRouter flag is not set in Neighbour Advertisements.
1125 2. Router Solicitations are being sent when necessary. 1129 2. If accept_ra is TRUE (default), transmit Router
1130 Solicitations.
1126 3. If accept_ra is TRUE (default), accept Router 1131 3. If accept_ra is TRUE (default), accept Router
1127 Advertisements (and do autoconfiguration). 1132 Advertisements (and do autoconfiguration).
1128 4. If accept_redirects is TRUE (default), accept Redirects. 1133 4. If accept_redirects is TRUE (default), accept Redirects.
@@ -1133,16 +1138,10 @@ forwarding - INTEGER
1133 This means exactly the reverse from the above: 1138 This means exactly the reverse from the above:
1134 1139
1135 1. IsRouter flag is set in Neighbour Advertisements. 1140 1. IsRouter flag is set in Neighbour Advertisements.
1136 2. Router Solicitations are not sent. 1141 2. Router Solicitations are not sent unless accept_ra is 2.
1137 3. Router Advertisements are ignored unless accept_ra is 2. 1142 3. Router Advertisements are ignored unless accept_ra is 2.
1138 4. Redirects are ignored. 1143 4. Redirects are ignored.
1139 1144
1140 TRUE (2):
1141
1142 Hybrid mode. Same behaviour as TRUE, except for:
1143
1144 2. Router Solicitations are being sent when necessary.
1145
1146 Default: 0 (disabled) if global forwarding is disabled (default), 1145 Default: 0 (disabled) if global forwarding is disabled (default),
1147 otherwise 1 (enabled). 1146 otherwise 1 (enabled).
1148 1147
diff --git a/Documentation/networking/mac80211-injection.txt b/Documentation/networking/mac80211-injection.txt
index b30e81ad5307..3a930072b161 100644
--- a/Documentation/networking/mac80211-injection.txt
+++ b/Documentation/networking/mac80211-injection.txt
@@ -23,6 +23,10 @@ radiotap headers and used to control injection:
23 IEEE80211_RADIOTAP_F_FRAG: frame will be fragmented if longer than the 23 IEEE80211_RADIOTAP_F_FRAG: frame will be fragmented if longer than the
24 current fragmentation threshold. 24 current fragmentation threshold.
25 25
26 * IEEE80211_RADIOTAP_TX_FLAGS
27
28 IEEE80211_RADIOTAP_F_TX_NOACK: frame should be sent without waiting for
29 an ACK even if it is a unicast frame
26 30
27The injection code can also skip all other currently defined radiotap fields 31The injection code can also skip all other currently defined radiotap fields
28facilitating replay of captured radiotap headers directly. 32facilitating replay of captured radiotap headers directly.
diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt
index 87b3d15f523a..89358341682a 100644
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
@@ -73,7 +73,7 @@ dev->hard_start_xmit:
73 has to lock by itself when needed. It is recommended to use a try lock 73 has to lock by itself when needed. It is recommended to use a try lock
74 for this and return NETDEV_TX_LOCKED when the spin lock fails. 74 for this and return NETDEV_TX_LOCKED when the spin lock fails.
75 The locking there should also properly protect against 75 The locking there should also properly protect against
76 set_multicast_list. Note that the use of NETIF_F_LLTX is deprecated. 76 set_rx_mode. Note that the use of NETIF_F_LLTX is deprecated.
77 Don't use it for new drivers. 77 Don't use it for new drivers.
78 78
79 Context: Process with BHs disabled or BH (timer), 79 Context: Process with BHs disabled or BH (timer),
@@ -92,7 +92,7 @@ dev->tx_timeout:
92 Context: BHs disabled 92 Context: BHs disabled
93 Notes: netif_queue_stopped() is guaranteed true 93 Notes: netif_queue_stopped() is guaranteed true
94 94
95dev->set_multicast_list: 95dev->set_rx_mode:
96 Synchronization: netif_tx_lock spinlock. 96 Synchronization: netif_tx_lock spinlock.
97 Context: BHs disabled 97 Context: BHs disabled
98 98
diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt
index 57a24108b845..8d67980fabe8 100644
--- a/Documentation/networking/stmmac.txt
+++ b/Documentation/networking/stmmac.txt
@@ -76,7 +76,16 @@ core.
76 76
774.5) DMA descriptors 774.5) DMA descriptors
78Driver handles both normal and enhanced descriptors. The latter has been only 78Driver handles both normal and enhanced descriptors. The latter has been only
79tested on DWC Ether MAC 10/100/1000 Universal version 3.41a. 79tested on DWC Ether MAC 10/100/1000 Universal version 3.41a and later.
80
81STMMAC supports DMA descriptor to operate both in dual buffer (RING)
82and linked-list(CHAINED) mode. In RING each descriptor points to two
83data buffer pointers whereas in CHAINED mode they point to only one data
84buffer pointer. RING mode is the default.
85
86In CHAINED mode each descriptor will have pointer to next descriptor in
87the list, hence creating the explicit chaining in the descriptor itself,
88whereas such explicit chaining is not possible in RING mode.
80 89
814.6) Ethtool support 904.6) Ethtool support
82Ethtool is supported. Driver statistics and internal errors can be taken using: 91Ethtool is supported. Driver statistics and internal errors can be taken using:
@@ -235,7 +244,38 @@ reset procedure etc).
235 o enh_desc.c: functions for handling enhanced descriptors 244 o enh_desc.c: functions for handling enhanced descriptors
236 o norm_desc.c: functions for handling normal descriptors 245 o norm_desc.c: functions for handling normal descriptors
237 246
2385) TODO: 2475) Debug Information
248
249The driver exports many information i.e. internal statistics,
250debug information, MAC and DMA registers etc.
251
252These can be read in several ways depending on the
253type of the information actually needed.
254
255For example a user can be use the ethtool support
256to get statistics: e.g. using: ethtool -S ethX
257(that shows the Management counters (MMC) if supported)
258or sees the MAC/DMA registers: e.g. using: ethtool -d ethX
259
260Compiling the Kernel with CONFIG_DEBUG_FS and enabling the
261STMMAC_DEBUG_FS option the driver will export the following
262debugfs entries:
263
264/sys/kernel/debug/stmmaceth/descriptors_status
265 To show the DMA TX/RX descriptor rings
266
267Developer can also use the "debug" module parameter to get
268further debug information.
269
270In the end, there are other macros (that cannot be enabled
271via menuconfig) to turn-on the RX/TX DMA debugging,
272specific MAC core debug printk etc. Others to enable the
273debug in the TX and RX processes.
274All these are only useful during the developing stage
275and should never enabled inside the code for general usage.
276In fact, these can generate an huge amount of debug messages.
277
2786) TODO:
239 o XGMAC is not supported. 279 o XGMAC is not supported.
240 o Review the timer optimisation code to use an embedded device that will be 280 o Review the timer optimisation code to use an embedded device that will be
241 available in new chip generations. 281 available in new chip generations.