Renamed trans_{rx,tx}() to tcpip_{rx,tx}(), since they are specific to

the TCP/IP protocol suite (rather than being general transport-layer
functions).

diff --git a/src/include/gpxe/tcpip.h b/src/include/gpxe/tcpip.h
index df63541..215bcd2 100644 (file)
--- a/src/include/gpxe/tcpip.h
+++ b/src/include/gpxe/tcpip.h
@@ -77,10 +77,10 @@ struct tcpip_net_protocol {
 #define TCPIP_NET_PROTOCOL( protocol ) \
         struct tcpip_net_protocol protocol __table ( tcpip_net_protocols, 01 )
 
-extern void trans_rx ( struct pk_buff *pkb, uint8_t trans_proto, 
+extern void tcpip_rx ( struct pk_buff *pkb, uint8_t trans_proto, 
                       struct in_addr *src, struct in_addr *dest );
 
-extern int trans_tx ( struct pk_buff *pkb, struct tcpip_protocol *tcpip, 
+extern int tcpip_tx ( struct pk_buff *pkb, struct tcpip_protocol *tcpip, 
                      struct sockaddr *dest );
 
 extern unsigned int tcpip_continue_chksum ( unsigned int partial,

diff --git a/src/net/ipv4.c b/src/net/ipv4.c
index 208e2d4..4190ef7 100644 (file)
--- a/src/net/ipv4.c
+++ b/src/net/ipv4.c
@@ -546,7 +546,7 @@ void ipv4_rx ( struct pk_buff *pkb, struct net_device *netdev __unused,
        pkb_pull ( pkb, sizeof ( *iphdr ) );
 
        /* Send it to the transport layer */
-       trans_rx ( pkb, iphdr->protocol, src, dest );
+       tcpip_rx ( pkb, iphdr->protocol, src, dest );
 }
 
 /** 

diff --git a/src/net/tcpip.c b/src/net/tcpip.c
index 47af9d1..949a169 100644 (file)
--- a/src/net/tcpip.c
+++ b/src/net/tcpip.c
@@ -70,7 +70,7 @@ struct tcpip_protocol* find_tcpip_protocol ( uint8_t trans_proto ) {
  *
  * This function expects a transport-layer segment from the network-layer
  */
-void trans_rx ( struct pk_buff *pkb, uint8_t trans_proto, struct in_addr *src,
+void tcpip_rx ( struct pk_buff *pkb, uint8_t trans_proto, struct in_addr *src,
                struct in_addr *dest ) {
        struct tcpip_protocol *tcpip;
 
@@ -90,7 +90,7 @@ void trans_rx ( struct pk_buff *pkb, uint8_t trans_proto, struct in_addr *src,
  * @v sock             Destination socket address
  * @ret                        Status
  */
-int trans_tx ( struct pk_buff *pkb, struct tcpip_protocol *tcpip,
+int tcpip_tx ( struct pk_buff *pkb, struct tcpip_protocol *tcpip,
               struct sockaddr *sock ) {
 
        /* Identify the network layer protocol and send it using xxx_tx() */

diff --git a/src/net/udp.c b/src/net/udp.c
index 537bd13..1f6a899 100644 (file)
--- a/src/net/udp.c
+++ b/src/net/udp.c
@@ -151,7 +151,7 @@ int udp_sendto ( struct udp_connection *conn, struct sockaddr *peer,
        udp_dump ( udphdr );
 
        /* Send it to the next layer for processing */
-       return trans_tx ( conn->tx_pkb, &udp_protocol, peer );
+       return tcpip_tx ( conn->tx_pkb, &udp_protocol, peer );
 }
 
 /**