diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /net/802 | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'net/802')
| -rw-r--r-- | net/802/fddi.c | 13 | ||||
| -rw-r--r-- | net/802/hippi.c | 13 |
2 files changed, 11 insertions, 15 deletions
diff --git a/net/802/fddi.c b/net/802/fddi.c index 1c9f7e765..afe14c384 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c @@ -25,6 +25,7 @@ * Alan Cox : New arp/rebuild header */ +#include <linux/config.h> #include <asm/segment.h> #include <asm/system.h> #include <linux/types.h> @@ -98,18 +99,20 @@ int fddi_rebuild_header(struct sk_buff *skb) { struct fddihdr *fddi = (struct fddihdr *)skb->data; - if (fddi->hdr.llc_snap.ethertype != __constant_htons(ETH_P_IP)) +#ifdef CONFIG_INET + if (fddi->hdr.llc_snap.ethertype == __constant_htons(ETH_P_IP)) + /* Try to get ARP to resolve the header and fill destination address */ + return arp_find(fddi->daddr, skb); + else +#endif { printk("%s: Don't know how to resolve type %02X addresses.\n", skb->dev->name, htons(fddi->hdr.llc_snap.ethertype)); return(0); } - - /* Try to get ARP to resolve the header and fill destination address */ - - return arp_find(fddi->daddr, skb); } + /* * Determine the packet's protocol ID and fill in skb fields. * This routine is called before an incoming packet is passed diff --git a/net/802/hippi.c b/net/802/hippi.c index b8890647e..f1dd1dd17 100644 --- a/net/802/hippi.c +++ b/net/802/hippi.c @@ -34,6 +34,7 @@ #include <linux/errno.h> #include <net/arp.h> #include <net/sock.h> +#include <asm/uaccess.h> #include <asm/checksum.h> #include <asm/segment.h> #include <asm/system.h> @@ -80,16 +81,8 @@ int hippi_header(struct sk_buff *skb, struct device *dev, hip->le.dest_addr_type = 2; /* 12 bit SC address */ hip->le.src_addr_type = 2; /* 12 bit SC address */ -#if 1 - if (saddr) - { - printk("existing saddr - this should not happen, configure ARP please!\n"); - memcpy(hip->le.src_switch_addr, saddr + 3, 3); - }else - memcpy(hip->le.src_switch_addr, dev->dev_addr + 3, 3); - + memcpy(hip->le.src_switch_addr, dev->dev_addr + 3, 3); memset(&hip->le.reserved, 0, 16); -#endif hip->snap.dsap = HIPPI_EXTENDED_SAP; hip->snap.ssap = HIPPI_EXTENDED_SAP; @@ -103,7 +96,7 @@ int hippi_header(struct sk_buff *skb, struct device *dev, { memcpy(hip->le.dest_switch_addr, daddr + 3, 3); memcpy(&skb->private.ifield, daddr + 2, 4); - return(HIPPI_HLEN); + return HIPPI_HLEN; } return -HIPPI_HLEN; } |