From: Oliver Hartkopp Date: Tue, 15 Apr 2008 07:46:38 +0000 (-0700) Subject: [CAN]: Update documentation of struct sockaddr_can X-Git-Tag: v2.6.25~4^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=56690c2151d33534f0537fd03c533eda81d96f0f;p=linux-2.6-omap-h63xx.git [CAN]: Update documentation of struct sockaddr_can The struct sockaddr_can has been simplified in the code review process. This patch updates this simplification also in the associated documentation in can.txt . Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller --- diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt index f1b2de17092..641d2afacff 100644 --- a/Documentation/networking/can.txt +++ b/Documentation/networking/can.txt @@ -281,10 +281,10 @@ solution for a couple of reasons: sa_family_t can_family; int can_ifindex; union { - struct { canid_t rx_id, tx_id; } tp16; - struct { canid_t rx_id, tx_id; } tp20; - struct { canid_t rx_id, tx_id; } mcnet; - struct { canid_t rx_id, tx_id; } isotp; + /* transport protocol class address info (e.g. ISOTP) */ + struct { canid_t rx_id, tx_id; } tp; + + /* reserved for future CAN protocols address information */ } can_addr; };