git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
include
/
linux
/
atalk.h
diff --git
a/include/linux/atalk.h
b/include/linux/atalk.h
index
75b8bac
..
e9ebac2
100644
(file)
--- a/
include/linux/atalk.h
+++ b/
include/linux/atalk.h
@@
-85,8
+85,6
@@
static inline struct atalk_sock *at_sk(struct sock *sk)
return (struct atalk_sock *)sk;
}
return (struct atalk_sock *)sk;
}
-#include <asm/byteorder.h>
-
struct ddpehdr {
__be16 deh_len_hops; /* lower 10 bits are length, next 4 - hops */
__be16 deh_sum;
struct ddpehdr {
__be16 deh_len_hops; /* lower 10 bits are length, next 4 - hops */
__be16 deh_sum;
@@
-101,7
+99,7
@@
struct ddpehdr {
static __inline__ struct ddpehdr *ddp_hdr(struct sk_buff *skb)
{
static __inline__ struct ddpehdr *ddp_hdr(struct sk_buff *skb)
{
- return (struct ddpehdr *)skb
->h.raw
;
+ return (struct ddpehdr *)skb
_transport_header(skb)
;
}
/* AppleTalk AARP headers */
}
/* AppleTalk AARP headers */
@@
-129,7
+127,7
@@
struct elapaarp {
static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb)
{
static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb)
{
- return (struct elapaarp *)skb
->h.raw
;
+ return (struct elapaarp *)skb
_transport_header(skb)
;
}
/* Not specified - how long till we drop a resolved entry */
}
/* Not specified - how long till we drop a resolved entry */
@@
-182,7
+180,7
@@
extern rwlock_t atalk_interfaces_lock;
extern struct atalk_route atrtr_default;
extern struct atalk_route atrtr_default;
-extern struct file_operations atalk_seq_arp_fops;
+extern
const
struct file_operations atalk_seq_arp_fops;
extern int sysctl_aarp_expiry_time;
extern int sysctl_aarp_tick_time;
extern int sysctl_aarp_expiry_time;
extern int sysctl_aarp_tick_time;