github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

[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

16
net/ethernet/eth.c
View File

@ -95,8 +95,7 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
saddr = dev->dev_addr; saddr = dev->dev_addr;
memcpy(eth->h_source, saddr, dev->addr_len); memcpy(eth->h_source, saddr, dev->addr_len);
if(daddr) if (daddr) {
{
memcpy(eth->h_dest, daddr, dev->addr_len); memcpy(eth->h_dest, daddr, dev->addr_len);
return ETH_HLEN; return ETH_HLEN;
} }
@ -105,8 +104,7 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
* 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;
} }
@ -129,8 +127,7 @@ 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);
@ -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
@ -205,6 +201,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
*/ */
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
@ -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