diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /net/rose | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/rose_dev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c index 702a55931..bb155c575 100644 --- a/net/rose/rose_dev.c +++ b/net/rose/rose_dev.c @@ -56,6 +56,7 @@ int rose_rx_ip(struct sk_buff *skb, struct device *dev) { struct net_device_stats *stats = (struct net_device_stats *)dev->priv; +#ifdef CONFIG_INET if (!dev->start) { stats->rx_errors++; return 0; @@ -73,7 +74,9 @@ int rose_rx_ip(struct sk_buff *skb, struct device *dev) skb->pkt_type = PACKET_HOST; ip_rcv(skb, skb->dev, NULL); - +#else + kfree_skb(skb); +#endif return 1; } @@ -101,11 +104,8 @@ static int rose_rebuild_header(struct sk_buff *skb) unsigned char *bp = (unsigned char *)skb->data; struct sk_buff *skbn; +#ifdef CONFIG_INET if (arp_find(bp + 7, skb)) { -#if 0 - /* BUGGGG! If arp_find returned 1, skb does not exist. --ANK*/ - kfree_skb(skb); -#endif return 1; } @@ -126,7 +126,7 @@ static int rose_rebuild_header(struct sk_buff *skb) stats->tx_packets++; stats->tx_bytes += skbn->len; - +#endif return 1; } |