diff options
Diffstat (limited to 'drivers/net/lp486e.c')
-rw-r--r-- | drivers/net/lp486e.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index b783a6984abc..69ff83101107 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
@@ -277,7 +277,7 @@ struct i596_rbd { | |||
277 | phys_addr pa_next; /* va_to_pa(struct i596_tbd *next) */ | 277 | phys_addr pa_next; /* va_to_pa(struct i596_tbd *next) */ |
278 | phys_addr pa_data; /* va_to_pa(char *data) */ | 278 | phys_addr pa_data; /* va_to_pa(char *data) */ |
279 | phys_addr pa_prev; /* va_to_pa(struct i596_tbd *prev) */ | 279 | phys_addr pa_prev; /* va_to_pa(struct i596_tbd *prev) */ |
280 | 280 | ||
281 | /* Driver private part */ | 281 | /* Driver private part */ |
282 | struct sk_buff *skb; | 282 | struct sk_buff *skb; |
283 | }; | 283 | }; |
@@ -647,7 +647,7 @@ init_i596(struct net_device *dev) { | |||
647 | CA(); | 647 | CA(); |
648 | 648 | ||
649 | barrier(); | 649 | barrier(); |
650 | 650 | ||
651 | if (lp->scb.command && i596_timeout(dev, "Receive Unit start", 100)) | 651 | if (lp->scb.command && i596_timeout(dev, "Receive Unit start", 100)) |
652 | return 1; | 652 | return 1; |
653 | 653 | ||
@@ -676,7 +676,7 @@ i596_rx_one(struct net_device *dev, struct i596_private *lp, | |||
676 | return 1; | 676 | return 1; |
677 | } | 677 | } |
678 | 678 | ||
679 | skb->dev = dev; | 679 | skb->dev = dev; |
680 | memcpy(skb_put(skb,pkt_len), rfd->data, pkt_len); | 680 | memcpy(skb_put(skb,pkt_len), rfd->data, pkt_len); |
681 | 681 | ||
682 | skb->protocol = eth_type_trans(skb,dev); | 682 | skb->protocol = eth_type_trans(skb,dev); |
@@ -797,7 +797,7 @@ static void i596_reset(struct net_device *dev, struct i596_private *lp, int ioad | |||
797 | lp->scb.command = CUC_ABORT | RX_ABORT; | 797 | lp->scb.command = CUC_ABORT | RX_ABORT; |
798 | CA(); | 798 | CA(); |
799 | barrier(); | 799 | barrier(); |
800 | 800 | ||
801 | /* wait for shutdown */ | 801 | /* wait for shutdown */ |
802 | if (lp->scb.command && i596_timeout(dev, "i596_reset(2)", 400)) | 802 | if (lp->scb.command && i596_timeout(dev, "i596_reset(2)", 400)) |
803 | ; | 803 | ; |
@@ -820,7 +820,7 @@ static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd) { | |||
820 | cmd->pa_next = I596_NULL; | 820 | cmd->pa_next = I596_NULL; |
821 | 821 | ||
822 | spin_lock_irqsave(&lp->cmd_lock, flags); | 822 | spin_lock_irqsave(&lp->cmd_lock, flags); |
823 | 823 | ||
824 | if (lp->cmd_head) { | 824 | if (lp->cmd_head) { |
825 | lp->cmd_tail->pa_next = va_to_pa(cmd); | 825 | lp->cmd_tail->pa_next = va_to_pa(cmd); |
826 | } else { | 826 | } else { |
@@ -847,7 +847,7 @@ static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd) { | |||
847 | } | 847 | } |
848 | } | 848 | } |
849 | 849 | ||
850 | static int i596_open(struct net_device *dev) | 850 | static int i596_open(struct net_device *dev) |
851 | { | 851 | { |
852 | int i; | 852 | int i; |
853 | 853 | ||
@@ -875,13 +875,13 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) { | |||
875 | short length; | 875 | short length; |
876 | 876 | ||
877 | length = skb->len; | 877 | length = skb->len; |
878 | 878 | ||
879 | if (length < ETH_ZLEN) { | 879 | if (length < ETH_ZLEN) { |
880 | if (skb_padto(skb, ETH_ZLEN)) | 880 | if (skb_padto(skb, ETH_ZLEN)) |
881 | return 0; | 881 | return 0; |
882 | length = ETH_ZLEN; | 882 | length = ETH_ZLEN; |
883 | } | 883 | } |
884 | 884 | ||
885 | dev->trans_start = jiffies; | 885 | dev->trans_start = jiffies; |
886 | 886 | ||
887 | tx_cmd = (struct tx_cmd *) kmalloc ((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC); | 887 | tx_cmd = (struct tx_cmd *) kmalloc ((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC); |
@@ -941,7 +941,7 @@ i596_tx_timeout (struct net_device *dev) { | |||
941 | netif_wake_queue(dev); | 941 | netif_wake_queue(dev); |
942 | } | 942 | } |
943 | 943 | ||
944 | static void print_eth(char *add) | 944 | static void print_eth(char *add) |
945 | { | 945 | { |
946 | int i; | 946 | int i; |
947 | 947 | ||
@@ -978,7 +978,7 @@ static int __init lp486e_probe(struct net_device *dev) { | |||
978 | 978 | ||
979 | lp = (struct i596_private *) dev->priv; | 979 | lp = (struct i596_private *) dev->priv; |
980 | spin_lock_init(&lp->cmd_lock); | 980 | spin_lock_init(&lp->cmd_lock); |
981 | 981 | ||
982 | /* | 982 | /* |
983 | * Do we really have this thing? | 983 | * Do we really have this thing? |
984 | */ | 984 | */ |
@@ -1132,7 +1132,7 @@ i596_handle_CU_completion(struct net_device *dev, | |||
1132 | default: | 1132 | default: |
1133 | cmd->pa_next = I596_NULL; | 1133 | cmd->pa_next = I596_NULL; |
1134 | lp->last_cmd = jiffies; | 1134 | lp->last_cmd = jiffies; |
1135 | 1135 | ||
1136 | } | 1136 | } |
1137 | barrier(); | 1137 | barrier(); |
1138 | } | 1138 | } |