From 4854583f6ee806588f407170a4268f9080a14f4a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 27 Mar 2012 08:53:56 -0500 Subject: Address prototype mismatch in FreeBSD code. Need to report upstream. --- freebsd/dev/e1000/if_igb.c | 5 ++--- freebsd/machine/elf.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 freebsd/machine/elf.h diff --git a/freebsd/dev/e1000/if_igb.c b/freebsd/dev/e1000/if_igb.c index f5a4e8bc..2653ccbb 100644 --- a/freebsd/dev/e1000/if_igb.c +++ b/freebsd/dev/e1000/if_igb.c @@ -221,17 +221,16 @@ static __inline void igb_rx_input(struct rx_ring *, struct ifnet *, struct mbuf *, u32); #ifdef __rtems__ -/* XXX the inconsistent prototype and body need to be reported to FreeBSD */ +/* XXX report inconsistent proto/body to FreeBSD */ static bool igb_rxeof(struct igb_queue *, int, int *); #else static boolean_t igb_rxeof(struct igb_queue *, int, int *); #endif static void igb_rx_checksum(u32, struct mbuf *, u32); #ifdef __rtems__ -/* XXX the inconsistent prototype and body need to be reported to FreeBSD */ +/* XXX report inconsistent proto/body to FreeBSD */ static bool igb_tx_ctx_setup(struct tx_ring *, struct mbuf *); #else -static int igb_tx_ctx_setup(struct tx_ring *, struct mbuf *); #endif static boolean_t igb_tso_setup(struct tx_ring *, struct mbuf *, u32 *); static void igb_set_promisc(struct adapter *); diff --git a/freebsd/machine/elf.h b/freebsd/machine/elf.h deleted file mode 100644 index 936ffd88..00000000 --- a/freebsd/machine/elf.h +++ /dev/null @@ -1 +0,0 @@ -/* EMPTY */ -- cgit v1.2.3