Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (448 commits)
  [IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res)
  [IPV6]: Fix thinko in ipv6_rthdr_rcv() changes.
  [IPV4]: Add multipath cached to feature-removal-schedule.txt
  [WIRELESS] cfg80211: Clarify locking comment.
  [WIRELESS] cfg80211: Fix locking in wiphy_new.
  [WEXT] net_device: Don't include wext bits if not required.
  [WEXT]: Misc code cleanups.
  [WEXT]: Reduce inline abuse.
  [WEXT]: Move EXPORT_SYMBOL statements where they belong.
  [WEXT]: Cleanup early ioctl call path.
  [WEXT]: Remove options.
  [WEXT]: Remove dead debug code.
  [WEXT]: Clean up how wext is called.
  [WEXT]: Move to net/wireless
  [AFS]: Eliminate cmpxchg() usage in vlocation code.
  [RXRPC]: Fix pointers passed to bitops.
  [RXRPC]: Remove bogus atomic_* overrides.
  [AFS]: Fix u64 printing in debug logging.
  [AFS]: Add "directory write" support.
  [AFS]: Implement the CB.InitCallBackState3 operation.
  ...

1 files changed, 25 insertions, 35 deletions

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index e3a0bcfa5df1..f3a61ebd8d65 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -233,7 +233,7 @@ static inline unsigned long make_jiffies(long secs)
 static void xfrm_timer_handler(unsigned long data)
 {
         struct xfrm_state *x = (struct xfrm_state*)data;
-        unsigned long now = (unsigned long)xtime.tv_sec;
+        unsigned long now = get_seconds();
         long next = LONG_MAX;
         int warn = 0;
         int err = 0;
@@ -326,7 +326,7 @@ struct xfrm_state *xfrm_state_alloc(void)
                 init_timer(&x->rtimer);
                 x->rtimer.function = xfrm_replay_timer_handler;
                 x->rtimer.data     = (unsigned long)x;
-                x->curlft.add_time = (unsigned long)xtime.tv_sec;
+                x->curlft.add_time = get_seconds();
                 x->lft.soft_byte_limit = XFRM_INF;
                 x->lft.soft_packet_limit = XFRM_INF;
                 x->lft.hard_byte_limit = XFRM_INF;
@@ -421,6 +421,16 @@ restart:
 }
 EXPORT_SYMBOL(xfrm_state_flush);
 
+void xfrm_sad_getinfo(struct xfrm_sadinfo *si)
+{
+        spin_lock_bh(&xfrm_state_lock);
+        si->sadcnt = xfrm_state_num;
+        si->sadhcnt = xfrm_state_hmask;
+        si->sadhmcnt = xfrm_state_hashmax;
+        spin_unlock_bh(&xfrm_state_lock);
+}
+EXPORT_SYMBOL(xfrm_sad_getinfo);
+
 static int
 xfrm_init_tempsel(struct xfrm_state *x, struct flowi *fl,
                   struct xfrm_tmpl *tmpl,
@@ -458,7 +468,7 @@ static struct xfrm_state *__xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi,
                                              x->id.daddr.a6))
                                 continue;
                         break;
-                };
+                }
 
                 xfrm_state_hold(x);
                 return x;
@@ -493,7 +503,7 @@ static struct xfrm_state *__xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm
                                              x->props.saddr.a6))
                                 continue;
                         break;
-                };
+                }
 
                 xfrm_state_hold(x);
                 return x;
@@ -722,7 +732,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
                                              (struct in6_addr *)saddr))
                                 continue;
                         break;
-                };
+                }
 
                 xfrm_state_hold(x);
                 return x;
@@ -755,7 +765,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
                         ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6,
                                        (struct in6_addr *)daddr);
                         break;
-                };
+                }
 
                 x->km.state = XFRM_STATE_ACQ;
                 x->id.proto = proto;
@@ -1051,7 +1061,7 @@ EXPORT_SYMBOL(xfrm_state_update);
 int xfrm_state_check_expire(struct xfrm_state *x)
 {
         if (!x->curlft.use_time)
-                x->curlft.use_time = (unsigned long)xtime.tv_sec;
+                x->curlft.use_time = get_seconds();
 
         if (x->km.state != XFRM_STATE_VALID)
                 return -EINVAL;
@@ -1667,37 +1677,17 @@ void xfrm_state_delete_tunnel(struct xfrm_state *x)
 }
 EXPORT_SYMBOL(xfrm_state_delete_tunnel);
 
-/*
- * This function is NOT optimal.  For example, with ESP it will give an
- * MTU that's usually two bytes short of being optimal.  However, it will
- * usually give an answer that's a multiple of 4 provided the input is
- * also a multiple of 4.
- */
 int xfrm_state_mtu(struct xfrm_state *x, int mtu)
 {
-        int res = mtu;
-
-        res -= x->props.header_len;
-
-        for (;;) {
-                int m = res;
-
-                if (m < 68)
-                        return 68;
-
-                spin_lock_bh(&x->lock);
-                if (x->km.state == XFRM_STATE_VALID &&
-                    x->type && x->type->get_max_size)
-                        m = x->type->get_max_size(x, m);
-                else
-                        m += x->props.header_len;
-                spin_unlock_bh(&x->lock);
-
-                if (m <= mtu)
-                        break;
-                res -= (m - mtu);
-        }
+        int res;
 
+        spin_lock_bh(&x->lock);
+        if (x->km.state == XFRM_STATE_VALID &&
+            x->type && x->type->get_mtu)
+                res = x->type->get_mtu(x, mtu);
+        else
+                res = mtu;
+        spin_unlock_bh(&x->lock);
         return res;
 }