aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/myri_sbus.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
commit6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch)
treedf0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/myri_sbus.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/myri_sbus.c')
-rw-r--r--drivers/net/myri_sbus.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 1b965a2b56e4..a925bc9db4ac 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -360,7 +360,7 @@ static void myri_tx(struct myri_eth *mp, struct net_device *dev)
360 mp->tx_old = entry; 360 mp->tx_old = entry;
361} 361}
362 362
363/* Determine the packet's protocol ID. The rule here is that we 363/* Determine the packet's protocol ID. The rule here is that we
364 * assume 802.3 if the type field is short enough to be a length. 364 * assume 802.3 if the type field is short enough to be a length.
365 * This is normal practice and works for any 'now in use' protocol. 365 * This is normal practice and works for any 'now in use' protocol.
366 */ 366 */
@@ -368,11 +368,11 @@ static __be16 myri_type_trans(struct sk_buff *skb, struct net_device *dev)
368{ 368{
369 struct ethhdr *eth; 369 struct ethhdr *eth;
370 unsigned char *rawp; 370 unsigned char *rawp;
371 371
372 skb->mac.raw = (((unsigned char *)skb->data) + MYRI_PAD_LEN); 372 skb->mac.raw = (((unsigned char *)skb->data) + MYRI_PAD_LEN);
373 skb_pull(skb, dev->hard_header_len); 373 skb_pull(skb, dev->hard_header_len);
374 eth = eth_hdr(skb); 374 eth = eth_hdr(skb);
375 375
376#ifdef DEBUG_HEADER 376#ifdef DEBUG_HEADER
377 DHDR(("myri_type_trans: ")); 377 DHDR(("myri_type_trans: "));
378 dump_ehdr(eth); 378 dump_ehdr(eth);
@@ -386,12 +386,12 @@ static __be16 myri_type_trans(struct sk_buff *skb, struct net_device *dev)
386 if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN)) 386 if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN))
387 skb->pkt_type = PACKET_OTHERHOST; 387 skb->pkt_type = PACKET_OTHERHOST;
388 } 388 }
389 389
390 if (ntohs(eth->h_proto) >= 1536) 390 if (ntohs(eth->h_proto) >= 1536)
391 return eth->h_proto; 391 return eth->h_proto;
392 392
393 rawp = skb->data; 393 rawp = skb->data;
394 394
395 /* This is a magic hack to spot IPX packets. Older Novell breaks 395 /* This is a magic hack to spot IPX packets. Older Novell breaks
396 * the protocol design and runs IPX over 802.3 without an 802.2 LLC 396 * the protocol design and runs IPX over 802.3 without an 802.2 LLC
397 * layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This 397 * layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This
@@ -399,7 +399,7 @@ static __be16 myri_type_trans(struct sk_buff *skb, struct net_device *dev)
399 */ 399 */
400 if (*(unsigned short *)rawp == 0xFFFF) 400 if (*(unsigned short *)rawp == 0xFFFF)
401 return htons(ETH_P_802_3); 401 return htons(ETH_P_802_3);
402 402
403 /* Real 802.2 LLC */ 403 /* Real 802.2 LLC */
404 return htons(ETH_P_802_2); 404 return htons(ETH_P_802_2);
405} 405}
@@ -678,7 +678,7 @@ static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)
678 return 0; 678 return 0;
679} 679}
680 680
681/* Create the MyriNet MAC header for an arbitrary protocol layer 681/* Create the MyriNet MAC header for an arbitrary protocol layer
682 * 682 *
683 * saddr=NULL means use device source address 683 * saddr=NULL means use device source address
684 * daddr=NULL means leave destination address (eg unresolved arp) 684 * daddr=NULL means leave destination address (eg unresolved arp)
@@ -701,7 +701,7 @@ static int myri_header(struct sk_buff *skb, struct net_device *dev, unsigned sho
701 /* Set the protocol type. For a packet of type ETH_P_802_3 we put the length 701 /* Set the protocol type. For a packet of type ETH_P_802_3 we put the length
702 * in here instead. It is up to the 802.2 layer to carry protocol information. 702 * in here instead. It is up to the 802.2 layer to carry protocol information.
703 */ 703 */
704 if (type != ETH_P_802_3) 704 if (type != ETH_P_802_3)
705 eth->h_proto = htons(type); 705 eth->h_proto = htons(type);
706 else 706 else
707 eth->h_proto = htons(len); 707 eth->h_proto = htons(len);
@@ -719,7 +719,7 @@ static int myri_header(struct sk_buff *skb, struct net_device *dev, unsigned sho
719 eth->h_dest[i] = 0; 719 eth->h_dest[i] = 0;
720 return(dev->hard_header_len); 720 return(dev->hard_header_len);
721 } 721 }
722 722
723 if (daddr) { 723 if (daddr) {
724 memcpy(eth->h_dest, daddr, dev->addr_len); 724 memcpy(eth->h_dest, daddr, dev->addr_len);
725 return dev->hard_header_len; 725 return dev->hard_header_len;
@@ -754,16 +754,16 @@ static int myri_rebuild_header(struct sk_buff *skb)
754#endif 754#endif
755 755
756 default: 756 default:
757 printk(KERN_DEBUG 757 printk(KERN_DEBUG
758 "%s: unable to resolve type %X addresses.\n", 758 "%s: unable to resolve type %X addresses.\n",
759 dev->name, (int)eth->h_proto); 759 dev->name, (int)eth->h_proto);
760 760
761 memcpy(eth->h_source, dev->dev_addr, dev->addr_len); 761 memcpy(eth->h_source, dev->dev_addr, dev->addr_len);
762 return 0; 762 return 0;
763 break; 763 break;
764 } 764 }
765 765
766 return 0; 766 return 0;
767} 767}
768 768
769int myri_header_cache(struct neighbour *neigh, struct hh_cache *hh) 769int myri_header_cache(struct neighbour *neigh, struct hh_cache *hh)