Consistently rename LOOPBACK to ECHO to meet IFF_ECHO for CAN.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@1134 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/include/socketcan/can/gw.h b/kernel/2.6/include/socketcan/can/gw.h
index 0187a075c6141a6e0dd8f1b3d14784c7deb702a1..df02ee7ccf808b87ea7f731368085a5bccdb0d09 100644 (file)
--- a/kernel/2.6/include/socketcan/can/gw.h
+++ b/kernel/2.6/include/socketcan/can/gw.h
@@ -26,7 +26,7 @@ struct rtcanmsg {
        __u32 dst_ifindex;
 };
 
-#define CAN_GW_TXFLAGS_LOOPBACK 0x01
+#define CAN_GW_TXFLAGS_ECHO 0x01
 #define CAN_GW_TXFLAGS_SRC_TSTAMP 0x02
 
 /* CAN rtnetlink attribute definitions */

diff --git a/kernel/2.6/net/can/gw.c b/kernel/2.6/net/can/gw.c
index baef6f11329553b97870539a034024b20b8c0330..af9e6a9cef91614f490c3882603fc87d93239bd7 100644 (file)
--- a/kernel/2.6/net/can/gw.c
+++ b/kernel/2.6/net/can/gw.c
@@ -111,7 +111,7 @@ struct gw_job {
 };
 
 /* content of u32 gwjob.flags */
-#define CAN_TX_LOOPBACK 0x00000001
+#define CAN_TX_ECHO 0x00000001
 #define CAN_TX_SRC_TSTAMP 0x00000002
 
 /* modification functions that are invoked in the hot path in gw_rcv */
@@ -202,7 +202,7 @@ static void gw_rcv(struct sk_buff *skb, void *data)
                nskb->tstamp.tv64 = 0;
 
        /* send to netdevice */
-       if (can_send(nskb, gwj->flags & CAN_TX_LOOPBACK))
+       if (can_send(nskb, gwj->flags & CAN_TX_ECHO))
                gwj->dropped_frames++;
        else
                gwj->handled_frames++;
@@ -317,8 +317,8 @@ static int gw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh, void *arg)
 
        gwj->flags = 0;
 
-       if (r->can_txflags & CAN_GW_TXFLAGS_LOOPBACK)
-               gwj->flags |= CAN_TX_LOOPBACK;
+       if (r->can_txflags & CAN_GW_TXFLAGS_ECHO)
+               gwj->flags |= CAN_TX_ECHO;
 
        if (r->can_txflags & CAN_GW_TXFLAGS_SRC_TSTAMP)
                gwj->flags |= CAN_TX_SRC_TSTAMP;

diff --git a/test/gwtest.c b/test/gwtest.c
index 4aeb871935d32e585a8cc34dcc03df5a4535da16..b6f22bb78af90e0e1576bf4ba8dd382c0e47b6be 100644 (file)
--- a/test/gwtest.c
+++ b/test/gwtest.c
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
        req.r.can_family  = AF_CAN;
        req.r.src_ifindex = if_nametoindex("vcan2");
        req.r.dst_ifindex = if_nametoindex("vcan3");
-       req.r.can_txflags = CAN_GW_TXFLAGS_LOOPBACK;
+       req.r.can_txflags = CAN_GW_TXFLAGS_ECHO;
 
        /* add new attributes here */