d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile errors after r297225:

Browse Source 
- properly V_irtualise variable access unbreaking VIMAGE kernels.
- remove the volatile from the function return type to make architecture
  using gcc happy [-Wreturn-type]
  "type qualifiers ignored on function return type"
  I am not entirely happy with this solution putting the u_int there
  but it will do for now.
This commit is contained in:
Bjoern A. Zeeb 2016-03-24 11:40:10 +00:00
parent 52c9b0b539
commit 4f321dbd1c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=297234
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/net/route.c
View File

@ -201,7 +201,7 @@ rt_tables_get_rnh(int table, int fam)
return (*rt_tables_get_rnh_ptr(table, fam));
}
rt_gen_t
u_int
rt_tables_get_gen(int table, int fam)
{
struct rib_head *rnh;

2
sys/net/route.h
View File

@ -437,7 +437,7 @@ int rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *);
void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *);
struct rib_head *rt_table_init(int);
void rt_table_destroy(struct rib_head *);
rt_gen_t rt_tables_get_gen(int table, int fam);
u_int rt_tables_get_gen(int table, int fam);
int rtsock_addrmsg(int, struct ifaddr *, int);
int rtsock_routemsg(int, struct ifnet *ifp, int, struct rtentry *, int);

2
sys/netinet/tcp_subr.c
View File

@ -1932,7 +1932,7 @@ tcp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
notify = tcp_drop_syn_sent;
else if (PRC_IS_REDIRECT(cmd)) {
/* signal EHOSTDOWN, as it flushes the cached route */
in_pcbnotifyall(&tcbinfo, faddr, EHOSTDOWN, notify);
in_pcbnotifyall(&V_tcbinfo, faddr, EHOSTDOWN, notify);
return;
}
/*

2
sys/netinet/udp_usrreq.c
View File

@ -768,7 +768,7 @@ udp_common_ctlinput(int cmd, struct sockaddr *sa, void *vip,
if (PRC_IS_REDIRECT(cmd)) {
/* signal EHOSTDOWN, as it flushes the cached route */
in_pcbnotifyall(&udbinfo, faddr, EHOSTDOWN, udp_notify);
in_pcbnotifyall(&V_udbinfo, faddr, EHOSTDOWN, udp_notify);
return;
}