diff --git a/[refs] b/[refs] index 03d1df1e2bde..140c92ddbea6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ca3c68e76686bee058937ade2b96f4de58ee434 +refs/heads/master: c1d18f9fa09489635a451ee13c1727e1683c2333 diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h index 6da1229c041a..b40bd2f9ed79 100644 --- a/trunk/include/net/ip.h +++ b/trunk/include/net/ip.h @@ -45,7 +45,7 @@ struct inet_skb_parm struct ipcm_cookie { - u32 addr; + __be32 addr; int oif; struct ip_options *opt; }; diff --git a/trunk/net/ipv4/raw.c b/trunk/net/ipv4/raw.c index 49e5b4b55b93..b430cf2a4f66 100644 --- a/trunk/net/ipv4/raw.c +++ b/trunk/net/ipv4/raw.c @@ -382,7 +382,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, struct rtable *rt = NULL; int free = 0; __be32 daddr; - u32 saddr; + __be32 saddr; u8 tos; int err;