git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
appletalk
/
aarp.c
diff --git
a/net/appletalk/aarp.c
b/net/appletalk/aarp.c
index
54640c0
..
f3777ec
100644
(file)
--- a/
net/appletalk/aarp.c
+++ b/
net/appletalk/aarp.c
@@
-29,12
+29,12
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/if_arp.h>
#include <net/sock.h>
#include <net/datalink.h>
#include <net/psnap.h>
#include <linux/atalk.h>
#include <linux/if_arp.h>
#include <net/sock.h>
#include <net/datalink.h>
#include <net/psnap.h>
#include <linux/atalk.h>
+#include <linux/delay.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
@@
-462,8
+462,7
@@
void aarp_probe_network(struct atalk_iface *atif)
aarp_send_probe(atif->dev, &atif->address);
/* Defer 1/10th */
aarp_send_probe(atif->dev, &atif->address);
/* Defer 1/10th */
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(HZ / 10);
+ msleep(100);
if (atif->status & ATIF_PROBE_FAIL)
break;
if (atif->status & ATIF_PROBE_FAIL)
break;
@@
-510,9
+509,8
@@
int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa)
aarp_send_probe(atif->dev, sa);
/* Defer 1/10th */
aarp_send_probe(atif->dev, sa);
/* Defer 1/10th */
- current->state = TASK_INTERRUPTIBLE;
write_unlock_bh(&aarp_lock);
write_unlock_bh(&aarp_lock);
-
schedule_timeout(HZ / 1
0);
+
msleep(10
0);
write_lock_bh(&aarp_lock);
if (entry->status & ATIF_PROBE_FAIL)
write_lock_bh(&aarp_lock);
if (entry->status & ATIF_PROBE_FAIL)
@@
-565,7
+563,7
@@
int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,
* numbers we just happen to need. Now put the
* length in the lower two.
*/
* numbers we just happen to need. Now put the
* length in the lower two.
*/
- *((__
u
16 *)skb->data) = htons(skb->len);
+ *((__
be
16 *)skb->data) = htons(skb->len);
ft = 1;
}
/*
ft = 1;
}
/*
@@
-699,7
+697,7
@@
static void __aarp_resolved(struct aarp_entry **list, struct aarp_entry *a,
* frame. We currently only support Ethernet.
*/
static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
* frame. We currently only support Ethernet.
*/
static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
- struct packet_type *pt)
+ struct packet_type *pt
, struct net_device *orig_dev
)
{
struct elapaarp *ea = aarp_hdr(skb);
int hash, ret = 0;
{
struct elapaarp *ea = aarp_hdr(skb);
int hash, ret = 0;