Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Minor cleanup, removed TODO that doesn't make much sense.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28824 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-12-27 20:41:06 +00:00
parent 3ede860e30
commit 2e71ef292f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/add-ons/kernel/network/stack/link.cpp
View File

@ -6,6 +6,7 @@
* Axel Dörfler, axeld@pinc-software.de * Axel Dörfler, axeld@pinc-software.de
*/ */
//! The net_protocol you talk to when using the AF_LINK protocol
#include "datalink.h" #include "datalink.h"
#include "domains.h" #include "domains.h"
@ -52,7 +53,8 @@ private:
net_device_monitor fMonitor; net_device_monitor fMonitor;
net_device_interface *fMonitoredDevice; net_device_interface *fMonitoredDevice;
static status_t _MonitorData(net_device_monitor *monitor, net_buffer *buffer); static status_t _MonitorData(net_device_monitor *monitor,
net_buffer *buffer);
static void _MonitorEvent(net_device_monitor *monitor, int32 event); static void _MonitorEvent(net_device_monitor *monitor, int32 event);
}; };
@ -224,8 +226,6 @@ link_control(net_protocol *_protocol, int level, int option, void *value,
{ {
LinkProtocol *protocol = (LinkProtocol *)_protocol; LinkProtocol *protocol = (LinkProtocol *)_protocol;
// TODO All of this common functionality should be elsewhere
switch (option) { switch (option) {
case SIOCGIFINDEX: case SIOCGIFINDEX:
{ {
@ -234,7 +234,8 @@ link_control(net_protocol *_protocol, int level, int option, void *value,
if (user_memcpy(&request, value, IF_NAMESIZE) < B_OK) if (user_memcpy(&request, value, IF_NAMESIZE) < B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
net_device_interface *interface = get_device_interface(request.ifr_name); net_device_interface *interface
= get_device_interface(request.ifr_name);
if (interface != NULL) { if (interface != NULL) {
request.ifr_index = interface->device->index; request.ifr_index = interface->device->index;
put_device_interface(interface); put_device_interface(interface);
@ -250,7 +251,8 @@ link_control(net_protocol *_protocol, int level, int option, void *value,
if (user_memcpy(&request, value, sizeof(struct ifreq)) < B_OK) if (user_memcpy(&request, value, sizeof(struct ifreq)) < B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
net_device_interface *interface = get_device_interface(request.ifr_index); net_device_interface *interface
= get_device_interface(request.ifr_index);
if (interface != NULL) { if (interface != NULL) {
strlcpy(request.ifr_name, interface->device->name, IF_NAMESIZE); strlcpy(request.ifr_name, interface->device->name, IF_NAMESIZE);
put_device_interface(interface); put_device_interface(interface);
@ -291,7 +293,8 @@ link_control(net_protocol *_protocol, int level, int option, void *value,
if (user_memcpy(&request, value, IF_NAMESIZE) < B_OK) if (user_memcpy(&request, value, IF_NAMESIZE) < B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
net_device_interface *interface = get_device_interface(request.ifr_name); net_device_interface *interface
= get_device_interface(request.ifr_name);
if (interface != NULL) { if (interface != NULL) {
get_device_interface_address(interface, &request.ifr_addr); get_device_interface_address(interface, &request.ifr_addr);
put_device_interface(interface); put_device_interface(interface);
@ -473,7 +476,8 @@ link_std_ops(int32 op, ...)
void void
link_init() link_init()
{ {
register_domain_protocols(AF_LINK, SOCK_DGRAM, 0, "network/stack/link/v1", NULL); register_domain_protocols(AF_LINK, SOCK_DGRAM, 0, "network/stack/link/v1",
NULL);
register_domain_datalink_protocols(AF_LINK, IFT_ETHER, register_domain_datalink_protocols(AF_LINK, IFT_ETHER,
"network/datalink_protocols/ethernet_frame/v1", "network/datalink_protocols/ethernet_frame/v1",