diff mbox

doc: Update datatypes

Message ID 20160604223328.GA30197@sonyv
State Accepted
Delegated to: Pablo Neira
Headers show

Commit Message

nevola June 4, 2016, 10:33 p.m. UTC 
Check and update nft parameter datatypes.

Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
---
 doc/nft.xml | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

Comments

Pablo Neira Ayuso June 6, 2016, 11:39 a.m. UTC | #1 
On Sun, Jun 05, 2016 at 12:33:31AM +0200, Laura Garcia Liebana wrote:
> Check and update nft parameter datatypes.

Applied, thanks.

I have rewritten a bit the patch description BTW.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/doc/nft.xml b/doc/nft.xml
index b9f3c69..ea47e2b 100644
--- a/doc/nft.xml
+++ b/doc/nft.xml
@@ -1029,12 +1029,12 @@  filter output ip6 daddr ::1
 							<row>
 								<entry>priority</entry>
 								<entry>TC packet priority</entry>
-								<entry>integer (32 bit)</entry>
+								<entry>tc_handle</entry>
 							</row>
 							<row>
 								<entry>mark</entry>
 								<entry>Packet mark</entry>
-								<entry>packetmark</entry>
+								<entry>mark</entry>
 							</row>
 							<row>
 								<entry>iif</entry>
@@ -1104,12 +1104,12 @@  filter output ip6 daddr ::1
 							<row>
 								<entry>iifgroup</entry>
 								<entry>incoming device group</entry>
-								<entry>devgroup_type</entry>
+								<entry>devgroup</entry>
 							</row>
 							<row>
 								<entry>oifgroup</entry>
 								<entry>outgoing device group</entry>
-								<entry>devgroup_type</entry>
+								<entry>devgroup</entry>
 							</row>
 							<row>
 								<entry>cgroup</entry>
@@ -1287,7 +1287,7 @@  filter output oif eth0
 							<row>
 								<entry>cfi</entry>
 								<entry>Canonical Format Indicator</entry>
-								<entry>flag</entry>
+								<entry>integer (1 bit)</entry>
 							</row>
 							<row>
 								<entry>pcp</entry>
@@ -1297,7 +1297,7 @@  filter output oif eth0
 							<row>
 								<entry>type</entry>
 								<entry>EtherType</entry>
-								<entry>ethertype</entry>
+								<entry>ether_type</entry>
 							</row>
 						</tbody>
 					</tgroup>
@@ -1336,7 +1336,7 @@  filter output oif eth0
 							<row>
 								<entry>ptype</entry>
 								<entry>EtherType</entry>
-								<entry>ethertype</entry>
+								<entry>ether_type</entry>
 							</row>
 							<row>
 								<entry>hlen</entry>
@@ -1395,12 +1395,12 @@  filter output oif eth0
 							<row>
 								<entry>dscp</entry>
 								<entry>Differentiated Services Code Point</entry>
-								<entry>integer (6 bit)</entry>
+								<entry>dscp</entry>
 							</row>
 							<row>
 								<entry>ecn</entry>
 								<entry>Explicit Congestion Notification</entry>
-								<entry>integer (2 bit)</entry>
+								<entry>ecn</entry>
 							</row>
 							<row>
 								<entry>length</entry>
@@ -1477,19 +1477,14 @@  filter output oif eth0
 								<entry>integer (4 bit)</entry>
 							</row>
 							<row>
-								<entry>priority</entry>
-								<entry></entry>
-								<entry></entry>
-							</row>
-							<row>
 								<entry>dscp</entry>
 								<entry>Differentiated Services Code Point</entry>
-								<entry>integer (6 bit)</entry>
+								<entry>dscp</entry>
 							</row>
 							<row>
 								<entry>ecn</entry>
 								<entry>Explicit Congestion Notification</entry>
-								<entry>integer (2 bit)</entry>
+								<entry>ecn</entry>
 							</row>
 							<row>
 								<entry>flowlabel</entry>
@@ -1583,7 +1578,7 @@  filter output oif eth0
 							<row>
 								<entry>flags</entry>
 								<entry>TCP flags</entry>
-								<entry>tcp_flags</entry>
+								<entry>tcp_flag</entry>
 							</row>
 							<row>
 								<entry>window</entry>
@@ -1689,11 +1684,6 @@  filter output oif eth0
 								<entry>inet_service</entry>
 							</row>
 							<row>
-								<entry>cscov</entry>
-								<entry>Checksum coverage</entry>
-								<entry>integer (16 bit)</entry>
-							</row>
-							<row>
 								<entry>checksum</entry>
 								<entry>Checksum</entry>
 								<entry>integer (16 bit)</entry>
@@ -1819,7 +1809,7 @@  filter output oif eth0
 							<row>
 								<entry>nexthdr</entry>
 								<entry>Next header protocol</entry>
-								<entry>inet_service</entry>
+								<entry>inet_proto</entry>
 							</row>
 							<row>
 								<entry>hdrlength</entry>
@@ -1829,7 +1819,7 @@  filter output oif eth0
 							<row>
 								<entry>reserved</entry>
 								<entry>Reserved area</entry>
-								<entry>integer (4 bit)</entry>
+								<entry>integer (16 bit)</entry>
 							</row>
 							<row>
 								<entry>spi</entry>
@@ -1912,7 +1902,7 @@  filter output oif eth0
 							<row>
 								<entry>nexthdr</entry>
 								<entry>Next header protocol</entry>
-								<entry>inet_service</entry>
+								<entry>inet_proto</entry>
 							</row>
 							<row>
 								<entry>flags</entry>
@@ -2015,7 +2005,7 @@  filter output oif eth0
 							<row>
 								<entry>mark</entry>
 								<entry>Connection mark</entry>
-								<entry>packetmark</entry>
+								<entry>mark</entry>
 							</row>
 							<row>
 								<entry>expiration</entry>