projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
include
/
net.h
diff --git
a/include/net.h
b/include/net.h
index
23fb947
..
0802fad
100644
(file)
--- a/
include/net.h
+++ b/
include/net.h
@@
-39,7
+39,7
@@
#define PKTALIGN ARCH_DMA_MINALIGN
/* IPv4 addresses are always 32 bits in size */
#define PKTALIGN ARCH_DMA_MINALIGN
/* IPv4 addresses are always 32 bits in size */
-typedef
u32
IPaddr_t;
+typedef
__be32
IPaddr_t;
/**
/**
@@
-89,7
+89,7
@@
struct eth_device {
int (*recv) (struct eth_device *);
void (*halt) (struct eth_device *);
#ifdef CONFIG_MCAST_TFTP
int (*recv) (struct eth_device *);
void (*halt) (struct eth_device *);
#ifdef CONFIG_MCAST_TFTP
- int (*mcast) (struct eth_device *,
u32 ip
, u8 set);
+ int (*mcast) (struct eth_device *,
const u8 *enetaddr
, u8 set);
#endif
int (*write_hwaddr) (struct eth_device *);
struct eth_device *next;
#endif
int (*write_hwaddr) (struct eth_device *);
struct eth_device *next;
@@
-357,7
+357,7
@@
struct icmp_hdr {
} echo;
ulong gateway;
struct {
} echo;
ulong gateway;
struct {
- ushort
__
unused;
+ ushort unused;
ushort mtu;
} frag;
uchar data[0];
ushort mtu;
} frag;
uchar data[0];