cd354f1ae7
After Al Viro (finally) succeeded in removing the sched.h #include in module.h recently, it makes sense again to remove other superfluous sched.h includes. There are quite a lot of files which include it but don't actually need anything defined in there. Presumably these includes were once needed for macros that used to live in sched.h, but moved to other header files in the course of cleaning it up. To ease the pain, this time I did not fiddle with any header files and only removed #includes from .c-files, which tend to cause less trouble. Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha, arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig, allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all configs in arch/arm/configs on arm. I also checked that no new warnings were introduced by the patch (actually, some warnings are removed that were emitted by unnecessarily included header files). Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
169 lines
3.5 KiB
C
169 lines
3.5 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/types.h>
|
|
#include <linux/sysctl.h>
|
|
#include <linux/string.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/in.h>
|
|
#include <linux/if_ether.h>
|
|
|
|
#include <asm/system.h>
|
|
#include <asm/io.h>
|
|
|
|
#include <linux/inet.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/if_arp.h>
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <net/ip.h>
|
|
#include <net/arp.h>
|
|
|
|
#include <net/ax25.h>
|
|
#include <net/rose.h>
|
|
|
|
static int rose_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
|
|
void *daddr, void *saddr, unsigned len)
|
|
{
|
|
unsigned char *buff = skb_push(skb, ROSE_MIN_LEN + 2);
|
|
|
|
*buff++ = ROSE_GFI | ROSE_Q_BIT;
|
|
*buff++ = 0x00;
|
|
*buff++ = ROSE_DATA;
|
|
*buff++ = 0x7F;
|
|
*buff++ = AX25_P_IP;
|
|
|
|
if (daddr != NULL)
|
|
return 37;
|
|
|
|
return -37;
|
|
}
|
|
|
|
static int rose_rebuild_header(struct sk_buff *skb)
|
|
{
|
|
struct net_device *dev = skb->dev;
|
|
struct net_device_stats *stats = netdev_priv(dev);
|
|
unsigned char *bp = (unsigned char *)skb->data;
|
|
struct sk_buff *skbn;
|
|
unsigned int len;
|
|
|
|
#ifdef CONFIG_INET
|
|
if (arp_find(bp + 7, skb)) {
|
|
return 1;
|
|
}
|
|
|
|
if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {
|
|
kfree_skb(skb);
|
|
return 1;
|
|
}
|
|
|
|
if (skb->sk != NULL)
|
|
skb_set_owner_w(skbn, skb->sk);
|
|
|
|
kfree_skb(skb);
|
|
|
|
len = skbn->len;
|
|
|
|
if (!rose_route_frame(skbn, NULL)) {
|
|
kfree_skb(skbn);
|
|
stats->tx_errors++;
|
|
return 1;
|
|
}
|
|
|
|
stats->tx_packets++;
|
|
stats->tx_bytes += len;
|
|
#endif
|
|
return 1;
|
|
}
|
|
|
|
static int rose_set_mac_address(struct net_device *dev, void *addr)
|
|
{
|
|
struct sockaddr *sa = addr;
|
|
int err;
|
|
|
|
if (!memcpy(dev->dev_addr, sa->sa_data, dev->addr_len))
|
|
return 0;
|
|
|
|
if (dev->flags & IFF_UP) {
|
|
err = rose_add_loopback_node((rose_address *)dev->dev_addr);
|
|
if (err)
|
|
return err;
|
|
|
|
rose_del_loopback_node((rose_address *)dev->dev_addr);
|
|
}
|
|
|
|
memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int rose_open(struct net_device *dev)
|
|
{
|
|
int err;
|
|
|
|
err = rose_add_loopback_node((rose_address *)dev->dev_addr);
|
|
if (err)
|
|
return err;
|
|
|
|
netif_start_queue(dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int rose_close(struct net_device *dev)
|
|
{
|
|
netif_stop_queue(dev);
|
|
rose_del_loopback_node((rose_address *)dev->dev_addr);
|
|
return 0;
|
|
}
|
|
|
|
static int rose_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
struct net_device_stats *stats = netdev_priv(dev);
|
|
|
|
if (!netif_running(dev)) {
|
|
printk(KERN_ERR "ROSE: rose_xmit - called when iface is down\n");
|
|
return 1;
|
|
}
|
|
dev_kfree_skb(skb);
|
|
stats->tx_errors++;
|
|
return 0;
|
|
}
|
|
|
|
static struct net_device_stats *rose_get_stats(struct net_device *dev)
|
|
{
|
|
return netdev_priv(dev);
|
|
}
|
|
|
|
void rose_setup(struct net_device *dev)
|
|
{
|
|
dev->mtu = ROSE_MAX_PACKET_SIZE - 2;
|
|
dev->hard_start_xmit = rose_xmit;
|
|
dev->open = rose_open;
|
|
dev->stop = rose_close;
|
|
|
|
dev->hard_header = rose_header;
|
|
dev->hard_header_len = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN;
|
|
dev->addr_len = ROSE_ADDR_LEN;
|
|
dev->type = ARPHRD_ROSE;
|
|
dev->rebuild_header = rose_rebuild_header;
|
|
dev->set_mac_address = rose_set_mac_address;
|
|
|
|
/* New-style flags. */
|
|
dev->flags = IFF_NOARP;
|
|
dev->get_stats = rose_get_stats;
|
|
}
|