git.openpandora.org / pandora-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[TCP]: Convert highest_sack to sk_buff to allow direct access
[pandora-kernel.git] / include / net / ipv6.h
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 9059e0e..e90f962 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -112,45 +112,37 @@ struct frag_hdr {
 extern int sysctl_ipv6_bindv6only;
 extern int sysctl_mld_max_msf;
 
-/* MIBs */
-DECLARE_SNMP_STAT(struct ipstats_mib, ipv6_statistics);
-#define IP6_INC_STATS(idev,field)              ({                      \
-       struct inet6_dev *_idev = (idev);                               \
-       if (likely(_idev != NULL))                                      \
-               SNMP_INC_STATS(_idev->stats.ipv6, field);               \
-       SNMP_INC_STATS(ipv6_statistics, field);                         \
-})
-#define IP6_INC_STATS_BH(idev,field)           ({                      \
+#define _DEVINC(statname, modifier, idev, field)                       \
+({                                                                     \
        struct inet6_dev *_idev = (idev);                               \
        if (likely(_idev != NULL))                                      \
-               SNMP_INC_STATS_BH(_idev->stats.ipv6, field);            \
-       SNMP_INC_STATS_BH(ipv6_statistics, field);                      \
+               SNMP_INC_STATS##modifier((_idev)->stats.statname, (field)); \
+       SNMP_INC_STATS##modifier(statname##_statistics, (field));       \
 })
-#define IP6_INC_STATS_USER(idev,field)         ({                      \
+
+#define _DEVADD(statname, modifier, idev, field, val)                  \
+({                                                                     \
        struct inet6_dev *_idev = (idev);                               \
        if (likely(_idev != NULL))                                      \
-               SNMP_INC_STATS_USER(_idev->stats.ipv6, field);          \
-       SNMP_INC_STATS_USER(ipv6_statistics, field);                    \
+               SNMP_ADD_STATS##modifier((_idev)->stats.statname, (field), (val)); \
+       SNMP_ADD_STATS##modifier(statname##_statistics, (field), (val));\
 })
+
+/* MIBs */
+DECLARE_SNMP_STAT(struct ipstats_mib, ipv6_statistics);
+
+#define IP6_INC_STATS(idev,field)      _DEVINC(ipv6, , idev, field)
+#define IP6_INC_STATS_BH(idev,field)   _DEVINC(ipv6, _BH, idev, field)
+#define IP6_INC_STATS_USER(idev,field) _DEVINC(ipv6, _USER, idev, field)
+#define IP6_ADD_STATS_BH(idev,field,val) _DEVADD(ipv6, _BH, idev, field, val)
+
 DECLARE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);
-#define ICMP6_INC_STATS(idev, field)           ({                      \
-       struct inet6_dev *_idev = (idev);                               \
-       if (likely(_idev != NULL))                                      \
-               SNMP_INC_STATS(idev->stats.icmpv6, field);              \
-       SNMP_INC_STATS(icmpv6_statistics, field);                       \
-})
-#define ICMP6_INC_STATS_BH(idev, field)                ({                      \
-       struct inet6_dev *_idev = (idev);                               \
-       if (likely(_idev != NULL))                                      \
-               SNMP_INC_STATS_BH((_idev)->stats.icmpv6, field);        \
-       SNMP_INC_STATS_BH(icmpv6_statistics, field);                    \
-})
-#define ICMP6_INC_STATS_USER(idev, field)      ({                      \
-       struct inet6_dev *_idev = (idev);                               \
-       if (likely(_idev != NULL))                                      \
-               SNMP_INC_STATS_USER(_idev->stats.icmpv6, field);        \
-       SNMP_INC_STATS_USER(icmpv6_statistics, field);                  \
-})
+DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
+
+#define ICMP6_INC_STATS(idev, field)   _DEVINC(icmpv6, , idev, field)
+#define ICMP6_INC_STATS_BH(idev, field)        _DEVINC(icmpv6, _BH, idev, field)
+#define ICMP6_INC_STATS_USER(idev, field) _DEVINC(icmpv6, _USER, idev, field)
+
 #define ICMP6_INC_STATS_OFFSET_BH(idev, field, offset) ({                      \
        struct inet6_dev *_idev = idev;                                         \
        __typeof__(offset) _offset = (offset);                                  \
@@ -158,6 +150,20 @@ DECLARE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);
                SNMP_INC_STATS_OFFSET_BH(_idev->stats.icmpv6, field, _offset);  \
        SNMP_INC_STATS_OFFSET_BH(icmpv6_statistics, field, _offset);            \
 })
+
+#define ICMP6MSGOUT_INC_STATS(idev, field) \
+       _DEVINC(icmpv6msg, , idev, field +256)
+#define ICMP6MSGOUT_INC_STATS_BH(idev, field) \
+       _DEVINC(icmpv6msg, _BH, idev, field +256)
+#define ICMP6MSGOUT_INC_STATS_USER(idev, field) \
+       _DEVINC(icmpv6msg, _USER, idev, field +256)
+#define ICMP6MSGIN_INC_STATS(idev, field) \
+        _DEVINC(icmpv6msg, , idev, field)
+#define ICMP6MSGIN_INC_STATS_BH(idev, field) \
+       _DEVINC(icmpv6msg, _BH, idev, field)
+#define ICMP6MSGIN_INC_STATS_USER(idev, field) \
+       _DEVINC(icmpv6msg, _USER, idev, field)
+
 DECLARE_SNMP_STAT(struct udp_mib, udp_stats_in6);
 DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
 #define UDP6_INC_STATS_BH(field, is_udplite)                         do  {  \
@@ -243,7 +249,7 @@ extern int                  ip6_ra_control(struct sock *sk, int sel,
                                               void (*destructor)(struct sock *));
 
 
-extern int                     ipv6_parse_hopopts(struct sk_buff **skbp);
+extern int                     ipv6_parse_hopopts(struct sk_buff *skb);
 
 extern struct ipv6_txoptions *  ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt);
 extern struct ipv6_txoptions * ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
@@ -255,8 +261,8 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
 
 extern int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb);
 
-extern int ip6_frag_nqueues;
-extern atomic_t ip6_frag_mem;
+int ip6_frag_nqueues(void);
+int ip6_frag_mem(void);
 
 #define IPV6_FRAG_TIMEOUT      (60*HZ)         /* 60 seconds */
 
@@ -371,12 +377,29 @@ static inline int ipv6_prefix_equal(const struct in6_addr *a1,
                                   prefixlen);
 }
 
+struct inet_frag_queue;
+
+struct ip6_create_arg {
+       __be32 id;
+       struct in6_addr *src;
+       struct in6_addr *dst;
+};
+
+void ip6_frag_init(struct inet_frag_queue *q, void *a);
+int ip6_frag_match(struct inet_frag_queue *q, void *a);
+
 static inline int ipv6_addr_any(const struct in6_addr *a)
 {
        return ((a->s6_addr32[0] | a->s6_addr32[1] | 
                 a->s6_addr32[2] | a->s6_addr32[3] ) == 0); 
 }
 
+static inline int ipv6_addr_v4mapped(const struct in6_addr *a)
+{
+       return ((a->s6_addr32[0] | a->s6_addr32[1]) == 0 &&
+                a->s6_addr32[2] == htonl(0x0000ffff));
+}
+
 /*
  * find the first different bit between two addresses
  * length of address must be a multiple of 32bits
@@ -486,6 +509,9 @@ extern int                  ip6_forward(struct sk_buff *skb);
 extern int                     ip6_input(struct sk_buff *skb);
 extern int                     ip6_mc_input(struct sk_buff *skb);
 
+extern int                     __ip6_local_out(struct sk_buff *skb);
+extern int                     ip6_local_out(struct sk_buff *skb);
+
 /*
  *     Extension header (options) processing
  */
@@ -562,10 +588,8 @@ extern int inet6_hash_connect(struct inet_timewait_death_row *death_row,
 /*
  * reassembly.c
  */
-extern int sysctl_ip6frag_high_thresh;
-extern int sysctl_ip6frag_low_thresh;
-extern int sysctl_ip6frag_time;
-extern int sysctl_ip6frag_secret_interval;
+struct inet_frags_ctl;
+extern struct inet_frags_ctl ip6_frags_ctl;
 
 extern const struct proto_ops inet6_stream_ops;
 extern const struct proto_ops inet6_dgram_ops;
Pandora Kernel Repository