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
/
arcdevice.h
diff --git
a/include/linux/arcdevice.h
b/include/linux/arcdevice.h
index
231ba09
..
a191607
100644
(file)
--- a/
include/linux/arcdevice.h
+++ b/
include/linux/arcdevice.h
@@
-214,7
+214,7
@@
extern struct ArcProto *arc_proto_map[256], *arc_proto_default,
*/
struct Incoming {
struct sk_buff *skb; /* packet data buffer */
*/
struct Incoming {
struct sk_buff *skb; /* packet data buffer */
-
uint16_t sequence;
/* sequence number of assembly */
+
__be16 sequence;
/* sequence number of assembly */
uint8_t lastpacket, /* number of last packet (from 1) */
numpackets; /* number of packets in split */
};
uint8_t lastpacket, /* number of last packet (from 1) */
numpackets; /* number of packets in split */
};
@@
-283,8
+283,8
@@
struct arcnet_local {
int next_buf, first_free_buf;
/* network "reconfiguration" handling */
int next_buf, first_free_buf;
/* network "reconfiguration" handling */
-
time_t first_recon,
/* time of "first" RECON message to count */
-
last_recon;
/* time of most recent RECON */
+
unsigned long first_recon;
/* time of "first" RECON message to count */
+
unsigned long last_recon;
/* time of most recent RECON */
int num_recons; /* number of RECONs between first and last. */
bool network_down; /* do we think the network is down? */
int num_recons; /* number of RECONs between first and last. */
bool network_down; /* do we think the network is down? */
@@
-292,7
+292,7
@@
struct arcnet_local {
struct {
uint16_t sequence; /* sequence number (incs with each packet) */
struct {
uint16_t sequence; /* sequence number (incs with each packet) */
-
uint16_t
aborted_seq;
+
__be16
aborted_seq;
struct Incoming incoming[256]; /* one from each address */
} rfc1201;
struct Incoming incoming[256]; /* one from each address */
} rfc1201;
@@
-334,7
+334,7
@@
void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc);
#endif
void arcnet_unregister_proto(struct ArcProto *proto);
#endif
void arcnet_unregister_proto(struct ArcProto *proto);
-irqreturn_t arcnet_interrupt(int irq, void *dev_id
, struct pt_regs *regs
);
+irqreturn_t arcnet_interrupt(int irq, void *dev_id);
struct net_device *alloc_arcdev(char *name);
#endif /* __KERNEL__ */
struct net_device *alloc_arcdev(char *name);
#endif /* __KERNEL__ */