patch-src_othptab_c 1.4 KB

123456789101112131415161718192021222324252627282930313233
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- iptraf-3.0.0.orig/src/othptab.c 2005-09-13 08:42:54.000000000 +0200
  3. +++ iptraf-3.0.0/src/othptab.c 2008-10-09 17:34:11.000000000 +0200
  4. @@ -19,7 +19,6 @@ details.
  5. #include <asm/types.h>
  6. #include <linux/if_ether.h>
  7. #include <linux/if_tr.h>
  8. -#include <linux/if_fddi.h>
  9. #include <winops.h>
  10. #include "arphdr.h"
  11. #include "options.h"
  12. @@ -139,11 +138,6 @@ struct othptabent *add_othp_entry(struct
  13. new_entry->smacaddr);
  14. convmacaddr(((struct ethhdr *) packet)->h_dest,
  15. new_entry->dmacaddr);
  16. - } else if (linkproto == LINK_FDDI) {
  17. - convmacaddr(((struct fddihdr *) packet)->saddr,
  18. - new_entry->smacaddr);
  19. - convmacaddr(((struct fddihdr *) packet)->daddr,
  20. - new_entry->dmacaddr);
  21. } else if (linkproto == LINK_TR) {
  22. convmacaddr(((struct trh_hdr *) packet)->saddr,
  23. new_entry->smacaddr);
  24. @@ -373,8 +367,7 @@ void printothpentry(struct othptable *ta
  25. strcat(msgstring, scratchpad);
  26. if ((entry->linkproto == LINK_ETHERNET) ||
  27. - (entry->linkproto == LINK_PLIP) ||
  28. - (entry->linkproto == LINK_FDDI)) {
  29. + (entry->linkproto == LINK_PLIP)) {
  30. sprintf(scratchpad, " from %s to %s on %s",
  31. entry->smacaddr, entry->dmacaddr, entry->iface);