summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/net/network.c4
-rw-r--r--src/drivers/net/network.h4
-rw-r--r--src/drivers/net/rtl8139.c4
-rw-r--r--src/drivers/net/rtl8139.h2
-rw-r--r--src/kernel/kernel.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/drivers/net/network.c b/src/drivers/net/network.c
index 8c2edc1..156a5c3 100644
--- a/src/drivers/net/network.c
+++ b/src/drivers/net/network.c
@@ -13,7 +13,7 @@ static network_vtable_t const network_vtable = {
driver_print_info
},
network_register_handler,
- network_write
+ network_send
};
void network_init( network_t *network, interrupt_t *interrupt, void *context )
@@ -34,7 +34,7 @@ void network_register_handler( void *obj, network_event_handler_t handler )
network->handler = handler;
}
-void network_write( void *obj, network_buffer_t buf )
+void network_send( void *obj, network_buffer_t buf )
{
kernel_panic( "Calling abstract method in file %s at line %d.", __FILE__, __LINE__ );
}
diff --git a/src/drivers/net/network.h b/src/drivers/net/network.h
index 39ae627..3106a2b 100644
--- a/src/drivers/net/network.h
+++ b/src/drivers/net/network.h
@@ -28,12 +28,12 @@ typedef struct {
typedef struct {
driver_vtable_t base;
void (*register_handler)( void *obj, network_event_handler_t handler );
- void (*write)( void *obj, network_buffer_t buf );
+ void (*send)( void *obj, network_buffer_t buf );
} network_vtable_t;
void network_init( network_t *network, interrupt_t *interrupt, void *context );
void network_register_handler( void *obj, network_event_handler_t handler );
-void network_write( void *obj, network_buffer_t buf );
+void network_send( void *obj, network_buffer_t buf );
#endif // NETWORK_H
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index 8fc7ff4..607361a 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -16,7 +16,7 @@ static rtl8139_vtable_t const rtl8139_vtable = {
rtl8139_print_info
},
network_register_handler,
- rtl8139_write
+ rtl8139_send
}
};
@@ -366,7 +366,7 @@ void rtl8139_print_info( void *obj )
rtl8139->pci_descriptor.port_base, rtl8139->pci_descriptor.interrupt, buf );
}
-void rtl8139_write( void *obj, network_buffer_t buf )
+void rtl8139_send( void *obj, network_buffer_t buf )
{
rtl8139_t *rtl8139 = (rtl8139_t *)obj;
diff --git a/src/drivers/net/rtl8139.h b/src/drivers/net/rtl8139.h
index 4222b6d..2930136 100644
--- a/src/drivers/net/rtl8139.h
+++ b/src/drivers/net/rtl8139.h
@@ -43,7 +43,7 @@ void rtl8139_deactivate( void *obj );
void rtl8139_deinit( void *obj );
void rtl8139_print_name( void *obj );
void rtl8139_print_info( void *obj );
-void rtl8139_write( void *obj, network_buffer_t buf );
+void rtl8139_send( void *obj, network_buffer_t buf );
uint32_t rtl8139_handle_interrupt( interrupt_handler_t *handler, uint32_t esp );
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index d91c5d6..4d138a6 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -493,7 +493,7 @@ void handle_network_event( network_event_t *event, void *context )
arp->destination_protocol_address = arp->source_protocol_address;
arp->source_protocol_address = tmp;
- ((network_vtable_t *)( global_context.network->base.vtable ))->write( global_context.network, event->buf );
+ ((network_vtable_t *)( global_context.network->base.vtable ))->send( global_context.network, event->buf );
}
// we must free the data if we no longer need it