Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ETH]: indentation and cleanup

Browse source 
Run ethernet support through Lindent and fix up.
Applies after docbook comments patch

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2006-08-17 18:20:18 -07:00 committed by David S. Miller
parent d3e01f7186
commit 2e4ca75b31
1 changed files with 47 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
net/ethernet/eth.c
View file

@ -78,39 +78,37 @@ __setup("ether=", netdev_boot_setup);
* in here instead. It is up to the 802.2 layer to carry protocol information. * in here instead. It is up to the 802.2 layer to carry protocol information.
*/ */
int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
void *daddr, void *saddr, unsigned len) void *daddr, void *saddr, unsigned len)
{ {
struct ethhdr *eth = (struct ethhdr *)skb_push(skb,ETH_HLEN); struct ethhdr *eth = (struct ethhdr *)skb_push(skb, ETH_HLEN);
if(type!=ETH_P_802_3) if (type != ETH_P_802_3)
eth->h_proto = htons(type); eth->h_proto = htons(type);
else else
eth->h_proto = htons(len); eth->h_proto = htons(len);
/* /*
* Set the source hardware address. * Set the source hardware address.
*/ */
if(!saddr)
saddr = dev->dev_addr;
memcpy(eth->h_source,saddr,dev->addr_len);
if(daddr) if (!saddr)
{ saddr = dev->dev_addr;
memcpy(eth->h_dest,daddr,dev->addr_len); memcpy(eth->h_source, saddr, dev->addr_len);
if (daddr) {
memcpy(eth->h_dest, daddr, dev->addr_len);
return ETH_HLEN; return ETH_HLEN;
} }
/* /*
* Anyway, the loopback-device should never use this function... * Anyway, the loopback-device should never use this function...
*/ */
if (dev->flags & (IFF_LOOPBACK|IFF_NOARP)) if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) {
{
memset(eth->h_dest, 0, dev->addr_len); memset(eth->h_dest, 0, dev->addr_len);
return ETH_HLEN; return ETH_HLEN;
} }
return -ETH_HLEN; return -ETH_HLEN;
} }
@ -129,17 +127,16 @@ int eth_rebuild_header(struct sk_buff *skb)
struct ethhdr *eth = (struct ethhdr *)skb->data; struct ethhdr *eth = (struct ethhdr *)skb->data;
struct net_device *dev = skb->dev; struct net_device *dev = skb->dev;
switch (eth->h_proto) switch (eth->h_proto) {
{
#ifdef CONFIG_INET #ifdef CONFIG_INET
case __constant_htons(ETH_P_IP): case __constant_htons(ETH_P_IP):
return arp_find(eth->h_dest, skb); return arp_find(eth->h_dest, skb);
#endif #endif
default: default:
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: unable to resolve type %X addresses.\n", "%s: unable to resolve type %X addresses.\n",
dev->name, (int)eth->h_proto); dev->name, (int)eth->h_proto);
memcpy(eth->h_source, dev->dev_addr, dev->addr_len); memcpy(eth->h_source, dev->dev_addr, dev->addr_len);
break; break;
} }
@ -147,7 +144,6 @@ int eth_rebuild_header(struct sk_buff *skb)
return 0; return 0;
} }
/** /**
* eth_type_trans - determine the packet's protocol ID. * eth_type_trans - determine the packet's protocol ID.
* @skb: received socket data * @skb: received socket data
@ -161,50 +157,51 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
{ {
struct ethhdr *eth; struct ethhdr *eth;
unsigned char *rawp; unsigned char *rawp;
skb->mac.raw = skb->data; skb->mac.raw = skb->data;
skb_pull(skb,ETH_HLEN); skb_pull(skb, ETH_HLEN);
eth = eth_hdr(skb); eth = eth_hdr(skb);
if (is_multicast_ether_addr(eth->h_dest)) { if (is_multicast_ether_addr(eth->h_dest)) {
if (!compare_ether_addr(eth->h_dest, dev->broadcast)) if (!compare_ether_addr(eth->h_dest, dev->broadcast))
skb->pkt_type = PACKET_BROADCAST; skb->pkt_type = PACKET_BROADCAST;
else else
skb->pkt_type = PACKET_MULTICAST; skb->pkt_type = PACKET_MULTICAST;
} }
/* /*
* This ALLMULTI check should be redundant by 1.4 * This ALLMULTI check should be redundant by 1.4
* so don't forget to remove it. * so don't forget to remove it.
* *
* Seems, you forgot to remove it. All silly devices * Seems, you forgot to remove it. All silly devices
* seems to set IFF_PROMISC. * seems to set IFF_PROMISC.
*/ */
else if(1 /*dev->flags&IFF_PROMISC*/) { else if (1 /*dev->flags&IFF_PROMISC */ ) {
if (unlikely(compare_ether_addr(eth->h_dest, dev->dev_addr))) if (unlikely(compare_ether_addr(eth->h_dest, dev->dev_addr)))
skb->pkt_type = PACKET_OTHERHOST; skb->pkt_type = PACKET_OTHERHOST;
} }
if (ntohs(eth->h_proto) >= 1536) if (ntohs(eth->h_proto) >= 1536)
return eth->h_proto; return eth->h_proto;
rawp = skb->data; rawp = skb->data;
/* /*
* This is a magic hack to spot IPX packets. Older Novell breaks * This is a magic hack to spot IPX packets. Older Novell breaks
* the protocol design and runs IPX over 802.3 without an 802.2 LLC * the protocol design and runs IPX over 802.3 without an 802.2 LLC
* layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This * layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This
* won't work for fault tolerant netware but does for the rest. * won't work for fault tolerant netware but does for the rest.
*/ */
if (*(unsigned short *)rawp == 0xFFFF) if (*(unsigned short *)rawp == 0xFFFF)
return htons(ETH_P_802_3); return htons(ETH_P_802_3);
/* /*
* Real 802.2 LLC * Real 802.2 LLC
*/ */
return htons(ETH_P_802_2); return htons(ETH_P_802_2);
} }
EXPORT_SYMBOL(eth_type_trans);
/** /**
* eth_header_parse - extract hardware address from packet * eth_header_parse - extract hardware address from packet
@ -230,8 +227,8 @@ int eth_header_cache(struct neighbour *neigh, struct hh_cache *hh)
struct ethhdr *eth; struct ethhdr *eth;
struct net_device *dev = neigh->dev; struct net_device *dev = neigh->dev;
eth = (struct ethhdr*) eth = (struct ethhdr *)
(((u8*)hh->hh_data) + (HH_DATA_OFF(sizeof(*eth)))); (((u8 *) hh->hh_data) + (HH_DATA_OFF(sizeof(*eth))));
if (type == __constant_htons(ETH_P_802_3)) if (type == __constant_htons(ETH_P_802_3))
return -1; return -1;
@ -251,14 +248,13 @@ int eth_header_cache(struct neighbour *neigh, struct hh_cache *hh)
* *
* Called by Address Resolution module to notify changes in address. * Called by Address Resolution module to notify changes in address.
*/ */
void eth_header_cache_update(struct hh_cache *hh, struct net_device *dev, unsigned char * haddr) void eth_header_cache_update(struct hh_cache *hh, struct net_device *dev,
unsigned char *haddr)
{ {
memcpy(((u8*)hh->hh_data) + HH_DATA_OFF(sizeof(struct ethhdr)), memcpy(((u8 *) hh->hh_data) + HH_DATA_OFF(sizeof(struct ethhdr)),
haddr, dev->addr_len); haddr, dev->addr_len);
} }
EXPORT_SYMBOL(eth_type_trans);
/** /**
* eth_mac_addr - set new Ethernet hardware address * eth_mac_addr - set new Ethernet hardware address
* @dev: network device * @dev: network device
@ -270,10 +266,10 @@ EXPORT_SYMBOL(eth_type_trans);
*/ */
static int eth_mac_addr(struct net_device *dev, void *p) static int eth_mac_addr(struct net_device *dev, void *p)
{ {
struct sockaddr *addr=p; struct sockaddr *addr = p;
if (netif_running(dev)) if (netif_running(dev))
return -EBUSY; return -EBUSY;
memcpy(dev->dev_addr, addr->sa_data,dev->addr_len); memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
return 0; return 0;
} }
@ -315,7 +311,7 @@ void ether_setup(struct net_device *dev)
dev->tx_queue_len = 1000; /* Ethernet wants good queues */ dev->tx_queue_len = 1000; /* Ethernet wants good queues */
dev->flags = IFF_BROADCAST|IFF_MULTICAST; dev->flags = IFF_BROADCAST|IFF_MULTICAST;
memset(dev->broadcast,0xFF, ETH_ALEN); memset(dev->broadcast, 0xFF, ETH_ALEN);
} }
EXPORT_SYMBOL(ether_setup); EXPORT_SYMBOL(ether_setup);