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>
128 lines
3.2 KiB
C
128 lines
3.2 KiB
C
/*
|
|
* NET3: Fibre Channel device handling subroutines
|
|
*
|
|
* 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.
|
|
*
|
|
* Vineet Abraham <vma@iol.unh.edu>
|
|
* v 1.0 03/22/99
|
|
*/
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <asm/system.h>
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/in.h>
|
|
#include <linux/inet.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/fcdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/net.h>
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/init.h>
|
|
#include <net/arp.h>
|
|
|
|
/*
|
|
* Put the headers on a Fibre Channel packet.
|
|
*/
|
|
|
|
static int fc_header(struct sk_buff *skb, struct net_device *dev,
|
|
unsigned short type,
|
|
void *daddr, void *saddr, unsigned len)
|
|
{
|
|
struct fch_hdr *fch;
|
|
int hdr_len;
|
|
|
|
/*
|
|
* Add the 802.2 SNAP header if IP as the IPv4 code calls
|
|
* dev->hard_header directly.
|
|
*/
|
|
if (type == ETH_P_IP || type == ETH_P_ARP)
|
|
{
|
|
struct fcllc *fcllc;
|
|
|
|
hdr_len = sizeof(struct fch_hdr) + sizeof(struct fcllc);
|
|
fch = (struct fch_hdr *)skb_push(skb, hdr_len);
|
|
fcllc = (struct fcllc *)(fch+1);
|
|
fcllc->dsap = fcllc->ssap = EXTENDED_SAP;
|
|
fcllc->llc = UI_CMD;
|
|
fcllc->protid[0] = fcllc->protid[1] = fcllc->protid[2] = 0x00;
|
|
fcllc->ethertype = htons(type);
|
|
}
|
|
else
|
|
{
|
|
hdr_len = sizeof(struct fch_hdr);
|
|
fch = (struct fch_hdr *)skb_push(skb, hdr_len);
|
|
}
|
|
|
|
if(saddr)
|
|
memcpy(fch->saddr,saddr,dev->addr_len);
|
|
else
|
|
memcpy(fch->saddr,dev->dev_addr,dev->addr_len);
|
|
|
|
if(daddr)
|
|
{
|
|
memcpy(fch->daddr,daddr,dev->addr_len);
|
|
return(hdr_len);
|
|
}
|
|
return -hdr_len;
|
|
}
|
|
|
|
/*
|
|
* A neighbour discovery of some species (eg arp) has completed. We
|
|
* can now send the packet.
|
|
*/
|
|
|
|
static int fc_rebuild_header(struct sk_buff *skb)
|
|
{
|
|
struct fch_hdr *fch=(struct fch_hdr *)skb->data;
|
|
struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr));
|
|
if(fcllc->ethertype != htons(ETH_P_IP)) {
|
|
printk("fc_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(fcllc->ethertype));
|
|
return 0;
|
|
}
|
|
#ifdef CONFIG_INET
|
|
return arp_find(fch->daddr, skb);
|
|
#else
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
static void fc_setup(struct net_device *dev)
|
|
{
|
|
dev->hard_header = fc_header;
|
|
dev->rebuild_header = fc_rebuild_header;
|
|
|
|
dev->type = ARPHRD_IEEE802;
|
|
dev->hard_header_len = FC_HLEN;
|
|
dev->mtu = 2024;
|
|
dev->addr_len = FC_ALEN;
|
|
dev->tx_queue_len = 100; /* Long queues on fc */
|
|
dev->flags = IFF_BROADCAST;
|
|
|
|
memset(dev->broadcast, 0xFF, FC_ALEN);
|
|
}
|
|
|
|
/**
|
|
* alloc_fcdev - Register fibre channel device
|
|
* @sizeof_priv: Size of additional driver-private structure to be allocated
|
|
* for this fibre channel device
|
|
*
|
|
* Fill in the fields of the device structure with fibre channel-generic values.
|
|
*
|
|
* Constructs a new net device, complete with a private data area of
|
|
* size @sizeof_priv. A 32-byte (not bit) alignment is enforced for
|
|
* this private data area.
|
|
*/
|
|
struct net_device *alloc_fcdev(int sizeof_priv)
|
|
{
|
|
return alloc_netdev(sizeof_priv, "fc%d", fc_setup);
|
|
}
|
|
EXPORT_SYMBOL(alloc_fcdev);
|