1 files changed, 12 insertions, 16 deletions

diff --git a/include/net/ip.h b/include/net/ip.h
index 2f47e5482b55..85108cfbb1ae 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -33,8 +33,7 @@
 
 struct sock;
 
-struct inet_skb_parm
-{
+struct inet_skb_parm {
         struct ip_options       opt;            /* Compiled IP options          */
         unsigned char           flags;
 
@@ -50,8 +49,7 @@ static inline unsigned int ip_hdrlen(const struct sk_buff *skb)
         return ip_hdr(skb)->ihl * 4;
 }
 
-struct ipcm_cookie
-{
+struct ipcm_cookie {
         __be32                  addr;
         int                     oif;
         struct ip_options       *opt;
@@ -60,8 +58,7 @@ struct ipcm_cookie
 
 #define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))
 
-struct ip_ra_chain
-{
+struct ip_ra_chain {
         struct ip_ra_chain      *next;
         struct sock             *sk;
         void                    (*destructor)(struct sock *);
@@ -159,8 +156,7 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg)
 void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
                    unsigned int len); 
 
-struct ipv4_config
-{
+struct ipv4_config {
         int     log_martians;
         int     no_pmtu_disc;
 };
@@ -240,8 +236,8 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str
                  * does not change, they drop every other packet in
                  * a TCP stream using header compression.
                  */
-                iph->id = (sk && inet_sk(sk)->daddr) ?
-                                        htons(inet_sk(sk)->id++) : 0;
+                iph->id = (sk && inet_sk(sk)->inet_daddr) ?
+                                        htons(inet_sk(sk)->inet_id++) : 0;
         } else
                 __ip_select_ident(iph, dst, 0);
 }
@@ -249,9 +245,9 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str
 static inline void ip_select_ident_more(struct iphdr *iph, struct dst_entry *dst, struct sock *sk, int more)
 {
         if (iph->frag_off & htons(IP_DF)) {
-                if (sk && inet_sk(sk)->daddr) {
-                        iph->id = htons(inet_sk(sk)->id);
-                        inet_sk(sk)->id += 1 + more;
+                if (sk && inet_sk(sk)->inet_daddr) {
+                        iph->id = htons(inet_sk(sk)->inet_id);
+                        inet_sk(sk)->inet_id += 1 + more;
                 } else
                         iph->id = 0;
         } else
@@ -317,7 +313,7 @@ static inline void ip_ib_mc_map(__be32 naddr, const unsigned char *broadcast, ch
 
 static __inline__ void inet_reset_saddr(struct sock *sk)
 {
-        inet_sk(sk)->rcv_saddr = inet_sk(sk)->saddr = 0;
+        inet_sk(sk)->inet_rcv_saddr = inet_sk(sk)->inet_saddr = 0;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         if (sk->sk_family == PF_INET6) {
                 struct ipv6_pinfo *np = inet6_sk(sk);
@@ -336,12 +332,12 @@ extern int	ip_call_ra_chain(struct sk_buff *skb);
  *      Functions provided by ip_fragment.c
  */
 
-enum ip_defrag_users
-{
+enum ip_defrag_users {
         IP_DEFRAG_LOCAL_DELIVER,
         IP_DEFRAG_CALL_RA_CHAIN,
         IP_DEFRAG_CONNTRACK_IN,
         IP_DEFRAG_CONNTRACK_OUT,
+        IP_DEFRAG_CONNTRACK_BRIDGE_IN,
         IP_DEFRAG_VS_IN,
         IP_DEFRAG_VS_OUT,
         IP_DEFRAG_VS_FWD