diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /net/appletalk | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/appletalk')
| -rw-r--r-- | net/appletalk/aarp.c | 2 | ||||
| -rw-r--r-- | net/appletalk/ddp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 54640c01b50c..10d040461021 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c | |||
| @@ -565,7 +565,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb, | |||
| 565 | * numbers we just happen to need. Now put the | 565 | * numbers we just happen to need. Now put the |
| 566 | * length in the lower two. | 566 | * length in the lower two. |
| 567 | */ | 567 | */ |
| 568 | *((__u16 *)skb->data) = htons(skb->len); | 568 | *((__be16 *)skb->data) = htons(skb->len); |
| 569 | ft = 1; | 569 | ft = 1; |
| 570 | } | 570 | } |
| 571 | /* | 571 | /* |
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 876dbac71060..192b529f86a4 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
| @@ -401,7 +401,7 @@ out_err: | |||
| 401 | } | 401 | } |
| 402 | 402 | ||
| 403 | /* Find a match for a specific network:node pair */ | 403 | /* Find a match for a specific network:node pair */ |
| 404 | static struct atalk_iface *atalk_find_interface(int net, int node) | 404 | static struct atalk_iface *atalk_find_interface(__be16 net, int node) |
| 405 | { | 405 | { |
| 406 | struct atalk_iface *iface; | 406 | struct atalk_iface *iface; |
| 407 | 407 | ||