Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
osv
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Verlässliche Systemsoftware
projects
osv
Commits
2c9b5cc2
Commit
2c9b5cc2
authored
12 years ago
by
Guy Zana
Browse files
Options
Downloads
Patches
Plain Diff
Enable the netisr in if_ether.c
parent
a37aba21
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bsd/sys/netinet/if_ether.c
+4
-12
4 additions, 12 deletions
bsd/sys/netinet/if_ether.c
with
4 additions
and
12 deletions
bsd/sys/netinet/if_ether.c
+
4
−
12
View file @
2c9b5cc2
...
@@ -47,9 +47,7 @@
...
@@ -47,9 +47,7 @@
#include
<bsd/sys/net/if_dl.h>
#include
<bsd/sys/net/if_dl.h>
#include
<bsd/sys/net/if_types.h>
#include
<bsd/sys/net/if_types.h>
#if 0
#include
<bsd/sys/net/netisr.h>
#include <net/netisr.h>
#endif
#include
<bsd/sys/net/if_llc.h>
#include
<bsd/sys/net/if_llc.h>
#include
<bsd/sys/net/ethernet.h>
#include
<bsd/sys/net/ethernet.h>
...
@@ -119,21 +117,18 @@ SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, maxhold, CTLFLAG_RW,
...
@@ -119,21 +117,18 @@ SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, maxhold, CTLFLAG_RW,
void
arprequest
(
struct
ifnet
*
,
void
arprequest
(
struct
ifnet
*
,
struct
in_addr
*
,
struct
in_addr
*
,
u_char
*
);
struct
in_addr
*
,
struct
in_addr
*
,
u_char
*
);
void
arpintr
(
struct
mbuf
*
);
static
void
arpintr
(
struct
mbuf
*
);
static
void
arptimer
(
void
*
);
static
void
arptimer
(
void
*
);
#ifdef INET
#ifdef INET
static
void
in_arpinput
(
struct
mbuf
*
);
static
void
in_arpinput
(
struct
mbuf
*
);
#endif
#endif
/* FIXME: OSv: netisr are needed, comment out for now */
#if 0
static
const
struct
netisr_handler
arp_nh
=
{
static
const
struct
netisr_handler
arp_nh
=
{
.
nh_name
=
"arp"
,
.
nh_name
=
"arp"
,
.
nh_handler
=
arpintr
,
.
nh_handler
=
arpintr
,
.
nh_proto
=
NETISR_ARP
,
.
nh_proto
=
NETISR_ARP
,
.
nh_policy
=
NETISR_POLICY_SOURCE
,
.
nh_policy
=
NETISR_POLICY_SOURCE
,
};
};
#endif
#ifdef AF_INET
#ifdef AF_INET
void
arp_ifscrub
(
struct
ifnet
*
ifp
,
uint32_t
addr
);
void
arp_ifscrub
(
struct
ifnet
*
ifp
,
uint32_t
addr
);
...
@@ -408,13 +403,11 @@ done:
...
@@ -408,13 +403,11 @@ done:
return
(
error
);
return
(
error
);
}
}
/* FIXME: OSv: this is the netisr */
/*
/*
* Common length and type checks are done here,
* Common length and type checks are done here,
* then the protocol-specific routine is called.
* then the protocol-specific routine is called.
*/
*/
void
static
void
arpintr
(
struct
mbuf
*
m
)
arpintr
(
struct
mbuf
*
m
)
{
{
struct
arphdr
*
ar
;
struct
arphdr
*
ar
;
...
@@ -909,7 +902,6 @@ arp_ifinit2(struct ifnet *ifp, struct ifaddr *ifa, u_char *enaddr)
...
@@ -909,7 +902,6 @@ arp_ifinit2(struct ifnet *ifp, struct ifaddr *ifa, u_char *enaddr)
void
void
arp_init
(
void
)
arp_init
(
void
)
{
{
/* FIXME: Uncomment when implemented */
netisr_register
(
&
arp_nh
);
// netisr_register(&arp_nh);
}
}
SYSINIT
(
arp
,
SI_SUB_PROTO_DOMAIN
,
SI_ORDER_ANY
,
arp_init
,
0
);
SYSINIT
(
arp
,
SI_SUB_PROTO_DOMAIN
,
SI_ORDER_ANY
,
arp_init
,
0
);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment