Commit 9afa0949 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller

[NET] 802: Fix whitespace errors.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 66efc5a7
/* /*
* NET3: Fibre Channel device handling subroutines * NET3: Fibre Channel device handling subroutines
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
...@@ -31,18 +31,18 @@ ...@@ -31,18 +31,18 @@
#include <net/arp.h> #include <net/arp.h>
/* /*
* Put the headers on a Fibre Channel packet. * Put the headers on a Fibre Channel packet.
*/ */
static int fc_header(struct sk_buff *skb, struct net_device *dev, static int fc_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, unsigned short type,
void *daddr, void *saddr, unsigned len) void *daddr, void *saddr, unsigned len)
{ {
struct fch_hdr *fch; struct fch_hdr *fch;
int hdr_len; int hdr_len;
/* /*
* Add the 802.2 SNAP header if IP as the IPv4 code calls * Add the 802.2 SNAP header if IP as the IPv4 code calls
* dev->hard_header directly. * dev->hard_header directly.
*/ */
if (type == ETH_P_IP || type == ETH_P_ARP) if (type == ETH_P_IP || type == ETH_P_ARP)
...@@ -60,7 +60,7 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev, ...@@ -60,7 +60,7 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev,
else else
{ {
hdr_len = sizeof(struct fch_hdr); hdr_len = sizeof(struct fch_hdr);
fch = (struct fch_hdr *)skb_push(skb, hdr_len); fch = (struct fch_hdr *)skb_push(skb, hdr_len);
} }
if(saddr) if(saddr)
...@@ -68,20 +68,20 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev, ...@@ -68,20 +68,20 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev,
else else
memcpy(fch->saddr,dev->dev_addr,dev->addr_len); memcpy(fch->saddr,dev->dev_addr,dev->addr_len);
if(daddr) if(daddr)
{ {
memcpy(fch->daddr,daddr,dev->addr_len); memcpy(fch->daddr,daddr,dev->addr_len);
return(hdr_len); return(hdr_len);
} }
return -hdr_len; return -hdr_len;
} }
/* /*
* A neighbour discovery of some species (eg arp) has completed. We * A neighbour discovery of some species (eg arp) has completed. We
* can now send the packet. * can now send the packet.
*/ */
static int fc_rebuild_header(struct sk_buff *skb) static int fc_rebuild_header(struct sk_buff *skb)
{ {
struct fch_hdr *fch=(struct fch_hdr *)skb->data; struct fch_hdr *fch=(struct fch_hdr *)skb->data;
struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr)); struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr));
...@@ -100,7 +100,7 @@ static void fc_setup(struct net_device *dev) ...@@ -100,7 +100,7 @@ static void fc_setup(struct net_device *dev)
{ {
dev->hard_header = fc_header; dev->hard_header = fc_header;
dev->rebuild_header = fc_rebuild_header; dev->rebuild_header = fc_rebuild_header;
dev->type = ARPHRD_IEEE802; dev->type = ARPHRD_IEEE802;
dev->hard_header_len = FC_HLEN; dev->hard_header_len = FC_HLEN;
dev->mtu = 2024; dev->mtu = 2024;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* Mark Evans, <evansmp@uhura.aston.ac.uk> * Mark Evans, <evansmp@uhura.aston.ac.uk>
* Florian La Roche, <rzsfl@rz.uni-sb.de> * Florian La Roche, <rzsfl@rz.uni-sb.de>
* Alan Cox, <gw4pts@gw4pts.ampr.org> * Alan Cox, <gw4pts@gw4pts.ampr.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* Alan Cox : New arp/rebuild header * Alan Cox : New arp/rebuild header
* Maciej W. Rozycki : IPv6 support * Maciej W. Rozycki : IPv6 support
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <asm/system.h> #include <asm/system.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -57,7 +57,7 @@ static int fddi_header(struct sk_buff *skb, struct net_device *dev, ...@@ -57,7 +57,7 @@ static int fddi_header(struct sk_buff *skb, struct net_device *dev,
{ {
int hl = FDDI_K_SNAP_HLEN; int hl = FDDI_K_SNAP_HLEN;
struct fddihdr *fddi; struct fddihdr *fddi;
if(type != ETH_P_IP && type != ETH_P_IPV6 && type != ETH_P_ARP) if(type != ETH_P_IP && type != ETH_P_IPV6 && type != ETH_P_ARP)
hl=FDDI_K_8022_HLEN-3; hl=FDDI_K_8022_HLEN-3;
fddi = (struct fddihdr *)skb_push(skb, hl); fddi = (struct fddihdr *)skb_push(skb, hl);
...@@ -74,7 +74,7 @@ static int fddi_header(struct sk_buff *skb, struct net_device *dev, ...@@ -74,7 +74,7 @@ static int fddi_header(struct sk_buff *skb, struct net_device *dev,
} }
/* Set the source and destination hardware addresses */ /* Set the source and destination hardware addresses */
if (saddr != NULL) if (saddr != NULL)
memcpy(fddi->saddr, saddr, dev->addr_len); memcpy(fddi->saddr, saddr, dev->addr_len);
else else
...@@ -95,7 +95,7 @@ static int fddi_header(struct sk_buff *skb, struct net_device *dev, ...@@ -95,7 +95,7 @@ static int fddi_header(struct sk_buff *skb, struct net_device *dev,
* (or in future other address resolution) has completed on * (or in future other address resolution) has completed on
* this sk_buff. We now let ARP fill in the other fields. * this sk_buff. We now let ARP fill in the other fields.
*/ */
static int fddi_rebuild_header(struct sk_buff *skb) static int fddi_rebuild_header(struct sk_buff *skb)
{ {
struct fddihdr *fddi = (struct fddihdr *)skb->data; struct fddihdr *fddi = (struct fddihdr *)skb->data;
...@@ -105,7 +105,7 @@ static int fddi_rebuild_header(struct sk_buff *skb) ...@@ -105,7 +105,7 @@ static int fddi_rebuild_header(struct sk_buff *skb)
/* Try to get ARP to resolve the header and fill destination address */ /* Try to get ARP to resolve the header and fill destination address */
return arp_find(fddi->daddr, skb); return arp_find(fddi->daddr, skb);
else else
#endif #endif
{ {
printk("%s: Don't know how to resolve type %04X addresses.\n", printk("%s: Don't know how to resolve type %04X addresses.\n",
skb->dev->name, ntohs(fddi->hdr.llc_snap.ethertype)); skb->dev->name, ntohs(fddi->hdr.llc_snap.ethertype));
...@@ -120,19 +120,19 @@ static int fddi_rebuild_header(struct sk_buff *skb) ...@@ -120,19 +120,19 @@ static int fddi_rebuild_header(struct sk_buff *skb)
* up. It's used to fill in specific skb fields and to set * up. It's used to fill in specific skb fields and to set
* the proper pointer to the start of packet data (skb->data). * the proper pointer to the start of packet data (skb->data).
*/ */
__be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev) __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
{ {
struct fddihdr *fddi = (struct fddihdr *)skb->data; struct fddihdr *fddi = (struct fddihdr *)skb->data;
__be16 type; __be16 type;
/* /*
* Set mac.raw field to point to FC byte, set data field to point * Set mac.raw field to point to FC byte, set data field to point
* to start of packet data. Assume 802.2 SNAP frames for now. * to start of packet data. Assume 802.2 SNAP frames for now.
*/ */
skb->mac.raw = skb->data; /* point to frame control (FC) */ skb->mac.raw = skb->data; /* point to frame control (FC) */
if(fddi->hdr.llc_8022_1.dsap==0xe0) if(fddi->hdr.llc_8022_1.dsap==0xe0)
{ {
skb_pull(skb, FDDI_K_8022_HLEN-3); skb_pull(skb, FDDI_K_8022_HLEN-3);
...@@ -143,9 +143,9 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev) ...@@ -143,9 +143,9 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
skb_pull(skb, FDDI_K_SNAP_HLEN); /* adjust for 21 byte header */ skb_pull(skb, FDDI_K_SNAP_HLEN); /* adjust for 21 byte header */
type=fddi->hdr.llc_snap.ethertype; type=fddi->hdr.llc_snap.ethertype;
} }
/* Set packet type based on destination address and flag settings */ /* Set packet type based on destination address and flag settings */
if (*fddi->daddr & 0x01) if (*fddi->daddr & 0x01)
{ {
if (memcmp(fddi->daddr, dev->broadcast, FDDI_K_ALEN) == 0) if (memcmp(fddi->daddr, dev->broadcast, FDDI_K_ALEN) == 0)
...@@ -153,7 +153,7 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev) ...@@ -153,7 +153,7 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
else else
skb->pkt_type = PACKET_MULTICAST; skb->pkt_type = PACKET_MULTICAST;
} }
else if (dev->flags & IFF_PROMISC) else if (dev->flags & IFF_PROMISC)
{ {
if (memcmp(fddi->daddr, dev->dev_addr, FDDI_K_ALEN)) if (memcmp(fddi->daddr, dev->dev_addr, FDDI_K_ALEN))
...@@ -187,7 +187,7 @@ static void fddi_setup(struct net_device *dev) ...@@ -187,7 +187,7 @@ static void fddi_setup(struct net_device *dev)
dev->addr_len = FDDI_K_ALEN; dev->addr_len = FDDI_K_ALEN;
dev->tx_queue_len = 100; /* Long queues on FDDI */ dev->tx_queue_len = 100; /* Long queues on FDDI */
dev->flags = IFF_BROADCAST | IFF_MULTICAST; dev->flags = IFF_BROADCAST | IFF_MULTICAST;
memset(dev->broadcast, 0xFF, FDDI_K_ALEN); memset(dev->broadcast, 0xFF, FDDI_K_ALEN);
} }
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <asm/system.h> #include <asm/system.h>
/* /*
* Create the HIPPI MAC header for an arbitrary protocol layer * Create the HIPPI MAC header for an arbitrary protocol layer
* *
* saddr=NULL means use device source address * saddr=NULL means use device source address
* daddr=NULL means leave destination address (eg unresolved arp) * daddr=NULL means leave destination address (eg unresolved arp)
...@@ -104,8 +104,8 @@ static int hippi_rebuild_header(struct sk_buff *skb) ...@@ -104,8 +104,8 @@ static int hippi_rebuild_header(struct sk_buff *skb)
/* /*
* Only IP is currently supported * Only IP is currently supported
*/ */
if(hip->snap.ethertype != __constant_htons(ETH_P_IP)) if(hip->snap.ethertype != __constant_htons(ETH_P_IP))
{ {
printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype)); printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype));
return 0; return 0;
...@@ -122,11 +122,11 @@ static int hippi_rebuild_header(struct sk_buff *skb) ...@@ -122,11 +122,11 @@ static int hippi_rebuild_header(struct sk_buff *skb)
/* /*
* Determine the packet's protocol ID. * Determine the packet's protocol ID.
*/ */
__be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev) __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
{ {
struct hippi_hdr *hip; struct hippi_hdr *hip;
hip = (struct hippi_hdr *) skb->data; hip = (struct hippi_hdr *) skb->data;
/* /*
...@@ -173,10 +173,10 @@ static int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p) ...@@ -173,10 +173,10 @@ static int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
{ {
/* Never send broadcast/multicast ARP messages */ /* Never send broadcast/multicast ARP messages */
p->mcast_probes = 0; p->mcast_probes = 0;
/* In IPv6 unicast probes are valid even on NBMA, /* In IPv6 unicast probes are valid even on NBMA,
* because they are encapsulated in normal IPv6 protocol. * because they are encapsulated in normal IPv6 protocol.
* Should be a generic flag. * Should be a generic flag.
*/ */
if (p->tbl->family != AF_INET6) if (p->tbl->family != AF_INET6)
p->ucast_probes = 0; p->ucast_probes = 0;
...@@ -193,7 +193,7 @@ static void hippi_setup(struct net_device *dev) ...@@ -193,7 +193,7 @@ static void hippi_setup(struct net_device *dev)
dev->hard_header_parse = NULL; dev->hard_header_parse = NULL;
dev->hard_header_cache = NULL; dev->hard_header_cache = NULL;
dev->header_cache_update = NULL; dev->header_cache_update = NULL;
dev->neigh_setup = hippi_neigh_setup_dev; dev->neigh_setup = hippi_neigh_setup_dev;
/* /*
* We don't support HIPPI `ARP' for the time being, and probably * We don't support HIPPI `ARP' for the time being, and probably
...@@ -210,9 +210,9 @@ static void hippi_setup(struct net_device *dev) ...@@ -210,9 +210,9 @@ static void hippi_setup(struct net_device *dev)
/* /*
* HIPPI doesn't support broadcast+multicast and we only use * HIPPI doesn't support broadcast+multicast and we only use
* static ARP tables. ARP is disabled by hippi_neigh_setup_dev. * static ARP tables. ARP is disabled by hippi_neigh_setup_dev.
*/ */
dev->flags = 0; dev->flags = 0;
} }
/** /**
......
...@@ -117,7 +117,7 @@ module_exit(snap_exit); ...@@ -117,7 +117,7 @@ module_exit(snap_exit);
*/ */
struct datalink_proto *register_snap_client(unsigned char *desc, struct datalink_proto *register_snap_client(unsigned char *desc,
int (*rcvfunc)(struct sk_buff *, int (*rcvfunc)(struct sk_buff *,
struct net_device *, struct net_device *,
struct packet_type *, struct packet_type *,
struct net_device *)) struct net_device *))
{ {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment