PERFORCE change 131292 for review
Kip Macy
kmacy at FreeBSD.org
Wed Dec 19 22:35:15 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=131292
Change 131292 by kmacy at kmacy:entropy:iwarp on 2007/12/20 06:34:28
fix LINT build errors
Affected files ...
.. //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#5 edit
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_adapter.h#7 edit
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_multiq.c#4 edit
.. //depot/projects/iwarp/sys/dev/cy/cy.c#2 edit
.. //depot/projects/iwarp/sys/dev/hwpmc/hwpmc_ppro.c#3 edit
.. //depot/projects/iwarp/sys/kern/kern_switch.c#3 edit
.. //depot/projects/iwarp/sys/net/if_ethersubr.c#5 edit
.. //depot/projects/iwarp/sys/net/if_var.h#4 edit
.. //depot/projects/iwarp/sys/sys/proc.h#6 edit
Differences ...
==== //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#5 (text+ko) ====
@@ -342,12 +342,11 @@
EXPORT_SYMBOL(rdma_addr_cancel);
static void
-route_event_callback(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1)
+route_event_arp_update(void *unused, struct rtentry *rt0, uint8_t *enaddr,
+ struct sockaddr *sa)
{
- if (event == RTEVENT_ARP_UPDATE) {
callout_stop(&addr_ch);
taskqueue_enqueue(addr_taskq, &addr_task);
- }
}
static int addr_init(void)
@@ -366,15 +365,15 @@
callout_init(&addr_ch, TRUE);
- route_event_tag = EVENTHANDLER_REGISTER(route_event,
- route_event_callback, NULL, EVENTHANDLER_PRI_ANY);
+ route_event_tag = EVENTHANDLER_REGISTER(route_arp_update_event,
+ route_event_arp_update, NULL, EVENTHANDLER_PRI_ANY);
return 0;
}
static void addr_cleanup(void)
{
- EVENTHANDLER_DEREGISTER(route_event_callback, route_event_tag);
+ EVENTHANDLER_DEREGISTER(route_event_arp_update, route_event_tag);
callout_stop(&addr_ch);
taskqueue_drain(addr_taskq, &addr_task);
taskqueue_free(addr_taskq);
==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_adapter.h#7 (text+ko) ====
@@ -608,8 +608,6 @@
#ifdef IFNET_MULTIQUEUE
int cxgb_pcpu_enqueue_packet(struct ifnet *ifp, struct mbuf *m);
int cxgb_pcpu_start(struct ifnet *ifp, struct mbuf *m);
-int32_t cxgb_pcpu_get_cookie(struct ifnet *ifp, struct in6_addr *lip, uint16_t lport,
- struct in6_addr *rip, uint16_t rport, int ipv6);
void cxgb_pcpu_shutdown_threads(struct adapter *sc);
void cxgb_pcpu_startup_threads(struct adapter *sc);
#endif
==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_multiq.c#4 (text+ko) ====
@@ -224,7 +224,7 @@
return (count);
}
-int32_t
+static int32_t
cxgb_pcpu_get_cookie(struct ifnet *ifp, struct in6_addr *lip, uint16_t lport, struct in6_addr *rip, uint16_t rport, int ipv6)
{
uint32_t base;
==== //depot/projects/iwarp/sys/dev/cy/cy.c#2 (text+ko) ====
@@ -77,6 +77,7 @@
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
+#include <sys/proc.h>
#include <sys/serial.h>
#include <sys/syslog.h>
#include <sys/tty.h>
==== //depot/projects/iwarp/sys/dev/hwpmc/hwpmc_ppro.c#3 (text+ko) ====
@@ -390,7 +390,7 @@
if (pp->pp_flags & PMC_PP_ENABLE_MSR_ACCESS)
load_cr4(rcr4() | CR4_PCE);
- PMCDBG(MDP,SWI,1, "cr4=0x%x", rcr4());
+ PMCDBG(MDP,SWI,1, "cr4=0x%lx", rcr4());
return 0;
}
@@ -401,7 +401,7 @@
(void) pc;
(void) pp; /* can be NULL */
- PMCDBG(MDP,SWO,1, "pc=%p pp=%p cr4=0x%x", pc, pp, rcr4());
+ PMCDBG(MDP,SWO,1, "pc=%p pp=%p cr4=0x%lx", pc, pp, rcr4());
/* always turn off the RDPMC instruction */
load_cr4(rcr4() & ~CR4_PCE);
==== //depot/projects/iwarp/sys/kern/kern_switch.c#3 (text+ko) ====
@@ -51,13 +51,6 @@
#include <machine/cpu.h>
-/* Uncomment this to enable logging of critical_enter/exit. */
-#if 0
-#define KTR_CRITICAL KTR_SCHED
-#else
-#define KTR_CRITICAL 0
-#endif
-
#ifdef FULL_PREEMPTION
#ifndef PREEMPTION
#error "The FULL_PREEMPTION option requires the PREEMPTION option"
==== //depot/projects/iwarp/sys/net/if_ethersubr.c#5 (text+ko) ====
@@ -536,7 +536,7 @@
if (m->m_pkthdr.len >
ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS) &&
(ifp->if_capenable & IFCAP_LRO) == 0)
- goto err_out_print
+ goto err_out_print;
#endif
if (m->m_pkthdr.rcvif == NULL)
==== //depot/projects/iwarp/sys/net/if_var.h#4 (text+ko) ====
@@ -87,9 +87,6 @@
#define IF_DUNIT_NONE -1
#include <altq/if_altq.h>
-#ifdef IFNET_MULTIQUEUE
-#include <netinet/in.h>
-#endif
TAILQ_HEAD(ifnethead, ifnet); /* we use TAILQs so that the order of */
TAILQ_HEAD(ifaddrhead, ifaddr); /* instantiation is preserved in the list */
@@ -385,11 +382,7 @@
if_handoff((struct ifqueue *)ifq, m, ifp, adj)
void if_start(struct ifnet *);
-#ifdef IFNET_MULTIQUEUE
int if_mq_start(struct ifnet *, struct mbuf *);
-int if_mq_enqueue_packet(struct ifnet *, struct mbuf *);
-int32_t if_mq_get_cookie(struct ifnet *ifp, struct in6_addr *lip, uint16_t lport, struct in6_addr *rip, uint16_t rport, int ipv6);
-#endif
extern int ifnet_multiqueue; /* allow driver module to confirm that multiqueue is supported */
==== //depot/projects/iwarp/sys/sys/proc.h#6 (text+ko) ====
@@ -921,6 +921,13 @@
#include <sys/systm.h>
#include "opt_sched.h"
+/* Uncomment this to enable logging of critical_enter/exit. */
+#if 0
+#define KTR_CRITICAL KTR_SCHED
+#else
+#define KTR_CRITICAL 0
+#endif
+
/*
* Kernel thread preemption implementation. Critical sections mark
* regions of code in which preemptions are not allowed.
More information about the p4-projects
mailing list