[NET]: Endian-annotate struct iphdr
And fix trivial warnings that emerged. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5f8ac64b15
commit
76ab608d86
|
@ -90,14 +90,14 @@ struct iphdr {
|
||||||
#error "Please fix <asm/byteorder.h>"
|
#error "Please fix <asm/byteorder.h>"
|
||||||
#endif
|
#endif
|
||||||
__u8 tos;
|
__u8 tos;
|
||||||
__u16 tot_len;
|
__be16 tot_len;
|
||||||
__u16 id;
|
__be16 id;
|
||||||
__u16 frag_off;
|
__be16 frag_off;
|
||||||
__u8 ttl;
|
__u8 ttl;
|
||||||
__u8 protocol;
|
__u8 protocol;
|
||||||
__u16 check;
|
__u16 check;
|
||||||
__u32 saddr;
|
__be32 saddr;
|
||||||
__u32 daddr;
|
__be32 daddr;
|
||||||
/*The options start here. */
|
/*The options start here. */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -383,7 +383,7 @@ out_nomem:
|
||||||
*/
|
*/
|
||||||
static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
|
static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
|
||||||
{
|
{
|
||||||
__u16 id = iph->id;
|
__be16 id = iph->id;
|
||||||
__u32 saddr = iph->saddr;
|
__u32 saddr = iph->saddr;
|
||||||
__u32 daddr = iph->daddr;
|
__u32 daddr = iph->daddr;
|
||||||
__u8 protocol = iph->protocol;
|
__u8 protocol = iph->protocol;
|
||||||
|
|
|
@ -418,7 +418,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
|
||||||
struct sk_buff *skb2;
|
struct sk_buff *skb2;
|
||||||
unsigned int mtu, hlen, left, len, ll_rs;
|
unsigned int mtu, hlen, left, len, ll_rs;
|
||||||
int offset;
|
int offset;
|
||||||
int not_last_frag;
|
__be16 not_last_frag;
|
||||||
struct rtable *rt = (struct rtable*)skb->dst;
|
struct rtable *rt = (struct rtable*)skb->dst;
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
|
@ -1180,7 +1180,7 @@ int ip_push_pending_frames(struct sock *sk)
|
||||||
struct ip_options *opt = NULL;
|
struct ip_options *opt = NULL;
|
||||||
struct rtable *rt = inet->cork.rt;
|
struct rtable *rt = inet->cork.rt;
|
||||||
struct iphdr *iph;
|
struct iphdr *iph;
|
||||||
int df = 0;
|
__be16 df = 0;
|
||||||
__u8 ttl;
|
__u8 ttl;
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
|
|
|
@ -322,7 +322,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
|
||||||
struct net_device *tdev; /* Device to other host */
|
struct net_device *tdev; /* Device to other host */
|
||||||
struct iphdr *old_iph = skb->nh.iph;
|
struct iphdr *old_iph = skb->nh.iph;
|
||||||
u8 tos = old_iph->tos;
|
u8 tos = old_iph->tos;
|
||||||
u16 df = old_iph->frag_off;
|
__be16 df = old_iph->frag_off;
|
||||||
struct iphdr *iph; /* Our new IP header */
|
struct iphdr *iph; /* Our new IP header */
|
||||||
int max_headroom; /* The extra header space needed */
|
int max_headroom; /* The extra header space needed */
|
||||||
int mtu;
|
int mtu;
|
||||||
|
|
Loading…
Reference in a new issue