Fix some "little" build problems, and a redundancy call to "lwip_stats.link.recv++;" in low_level_input() & ethernetif_input().

If LINK_STATS was defined, tcpip.c couldn't be build.
Even if IP_FRAG or IP_REASSEMBLY were set, ip_frag.c functions are not build.
This commit is contained in:
fbernon 2007-03-06 19:31:49 +00:00
parent 7fd37d4e87
commit 7cda728469
4 changed files with 9 additions and 15 deletions

View File

@ -41,6 +41,10 @@ HISTORY
* api_lib.c: Use memcpy in netbuf_copy_partial.
++ Bug fixes:
2007-03-06 Frédéric Bernon, Dmitry Potapov
* tcpip.c, ip_frag.c, ethernetif.c: Fix some build problems, and a redundancy
call to "lwip_stats.link.recv++;" in low_level_input() & ethernetif_input().
2007-03-06 Simon Goldschmidt
* ip_frag.c, ip_frag.h: Reduce code size: don't include code in those files

View File

@ -110,11 +110,7 @@ ethernet_input(struct pbuf *p, struct netif *netif)
/* points to packet payload, which starts with an Ethernet header */
ethhdr = p->payload;
#if LINK_STATS
lwip_stats.link.recv++;
#endif /* LINK_STATS */
switch (htons(ethhdr->type)) {
/* IP packet? */
case ETHTYPE_IP:

View File

@ -37,8 +37,6 @@
*
*/
#if (IP_FRAG || IP_REASSEMBLY)
#include <string.h>
#include "lwip/opt.h"
@ -48,6 +46,8 @@
#include "lwip/snmp.h"
#include "lwip/stats.h"
#if (IP_FRAG || IP_REASSEMBLY)
static u8_t ip_reassbuf[IP_HLEN + IP_REASS_BUFSIZE];
static u8_t ip_reassbitmap[IP_REASS_BUFSIZE / (8 * 8) + 1];
static const u8_t bitmap_bits[8] = { 0xff, 0x7f, 0x3f, 0x1f,

View File

@ -168,7 +168,7 @@ low_level_input(struct netif *netif)
acknowledge that packet has been read();
#if ETH_PAD_SIZE
pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */
pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */
#endif
#if LINK_STATS
@ -229,13 +229,7 @@ ethernetif_input(struct netif *netif)
if (p == NULL) return;
/* points to packet payload, which starts with an Ethernet header */
ethhdr = p->payload;
#if LINK_STATS
lwip_stats.link.recv++;
#endif /* LINK_STATS */
ethhdr = p->payload;
switch (htons(ethhdr->type)) {
#if ETHARP_TCPIP_ETHINPUT