diff --git a/[refs] b/[refs] index c629d1ef9844..f75f2c39b950 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2929e7700fb64f58f9c501a293b98b6bf6c49403 +refs/heads/master: 16989ba6e9c501ffc004ec3c031b1c6065708ccf diff --git a/trunk/drivers/net/appletalk/ipddp.c b/trunk/drivers/net/appletalk/ipddp.c index 56cb96794026..1071144edd66 100644 --- a/trunk/drivers/net/appletalk/ipddp.c +++ b/trunk/drivers/net/appletalk/ipddp.c @@ -116,7 +116,7 @@ static struct net_device_stats *ipddp_get_stats(struct net_device *dev) */ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) { - u32 paddr = ((struct rtable*)skb->dst)->rt_gateway; + __be32 paddr = ((struct rtable*)skb->dst)->rt_gateway; struct ddpehdr *ddp; struct ipddp_route *rt; struct atalk_addr *our_addr; diff --git a/trunk/drivers/net/appletalk/ipddp.h b/trunk/drivers/net/appletalk/ipddp.h index 52072fb0c610..531519da99a3 100644 --- a/trunk/drivers/net/appletalk/ipddp.h +++ b/trunk/drivers/net/appletalk/ipddp.h @@ -14,7 +14,7 @@ struct ipddp_route { struct net_device *dev; /* Carrier device */ - __u32 ip; /* IP address */ + __be32 ip; /* IP address */ struct atalk_addr at; /* Gateway appletalk address */ int flags; struct ipddp_route *next;