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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
  [NET]: Fix and allocate less memory for ->priv'less netdevices
  [IPV6]: Fix dangling references on error in fib6_add().
  [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
  [PKT_SCHED]: Fix datalen check in tcf_simp_init().
  [INET]: Uninline the __inet_inherit_port call.
  [INET]: Drop the inet_inherit_port() call.
  SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
  [netdrvr] forcedeth: internal simplifications; changelog removal
  phylib: factor out get_phy_id from within get_phy_device
  PHY: add BCM5464 support to broadcom PHY driver
  cxgb3: Fix __must_check warning with dev_dbg.
  tc35815: Statistics cleanup
  natsemi: fix MMIO for PPC 44x platforms
  [TIPC]: Cleanup of TIPC reference table code
  [TIPC]: Optimized initialization of TIPC reference table
  [TIPC]: Remove inlining of reference table locking routines
  e1000: convert uint16_t style integers to u16
  ixgb: convert uint16_t style integers to u16
  sb1000.c: make const arrays static
  sb1000.c: stop inlining largish static functions
  ...

1 files changed, 39 insertions, 83 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 496503c03846..0a2f0372df31 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -55,9 +55,12 @@ struct prefix_info {
 extern int                      addrconf_init(void);
 extern void                     addrconf_cleanup(void);
 
-extern int                      addrconf_add_ifaddr(void __user *arg);
-extern int                      addrconf_del_ifaddr(void __user *arg);
-extern int                      addrconf_set_dstaddr(void __user *arg);
+extern int                      addrconf_add_ifaddr(struct net *net,
+                                                    void __user *arg);
+extern int                      addrconf_del_ifaddr(struct net *net,
+                                                    void __user *arg);
+extern int                      addrconf_set_dstaddr(struct net *net,
+                                                     void __user *arg);
 
 extern int                      ipv6_chk_addr(struct net *net,
                                               struct in6_addr *addr,
@@ -68,16 +71,18 @@ extern int			ipv6_chk_addr(struct net *net,
 extern int                      ipv6_chk_home_addr(struct net *net,
                                                    struct in6_addr *addr);
 #endif
+
+extern int                      ipv6_chk_prefix(struct in6_addr *addr,
+                                                struct net_device *dev);
+
 extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
-                                                 struct in6_addr *addr,
+                                                 const struct in6_addr *addr,
                                                  struct net_device *dev,
                                                  int strict);
 
-extern int                      ipv6_get_saddr(struct dst_entry *dst, 
-                                               struct in6_addr *daddr,
-                                               struct in6_addr *saddr);
 extern int                      ipv6_dev_get_saddr(struct net_device *dev, 
-                                               struct in6_addr *daddr,
+                                               const struct in6_addr *daddr,
+                                               unsigned int srcprefs,
                                                struct in6_addr *saddr);
 extern int                      ipv6_get_lladdr(struct net_device *dev,
                                                 struct in6_addr *addr,
@@ -100,31 +105,31 @@ extern u32			ipv6_addr_label(const struct in6_addr *addr,
 /*
  *      multicast prototypes (mcast.c)
  */
-extern int ipv6_sock_mc_join(struct sock *sk, int ifindex, 
-                  struct in6_addr *addr);
-extern int ipv6_sock_mc_drop(struct sock *sk, int ifindex, 
-                  struct in6_addr *addr);
+extern int ipv6_sock_mc_join(struct sock *sk, int ifindex,
+                             const struct in6_addr *addr);
+extern int ipv6_sock_mc_drop(struct sock *sk, int ifindex,
+                             const struct in6_addr *addr);
 extern void ipv6_sock_mc_close(struct sock *sk);
-extern int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
-                struct in6_addr *src_addr);
+extern int inet6_mc_check(struct sock *sk,
+                          const struct in6_addr *mc_addr,
+                          const struct in6_addr *src_addr);
 
-extern int ipv6_dev_mc_inc(struct net_device *dev, struct in6_addr *addr);
-extern int __ipv6_dev_mc_dec(struct inet6_dev *idev, struct in6_addr *addr);
-extern int ipv6_dev_mc_dec(struct net_device *dev, struct in6_addr *addr);
+extern int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr);
+extern int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr);
+extern int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr);
 extern void ipv6_mc_up(struct inet6_dev *idev);
 extern void ipv6_mc_down(struct inet6_dev *idev);
 extern void ipv6_mc_init_dev(struct inet6_dev *idev);
 extern void ipv6_mc_destroy_dev(struct inet6_dev *idev);
 extern void addrconf_dad_failure(struct inet6_ifaddr *ifp);
 
-extern int ipv6_chk_mcast_addr(struct net_device *dev, struct in6_addr *group,
-                struct in6_addr *src_addr);
+extern int ipv6_chk_mcast_addr(struct net_device *dev,
+                               const struct in6_addr *group,
+                               const struct in6_addr *src_addr);
 extern int ipv6_is_mld(struct sk_buff *skb, int nexthdr);
 
 extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len);
 
-extern int ipv6_get_hoplimit(struct net_device *dev);
-
 /*
  *      anycast prototypes (anycast.c)
  */
@@ -135,7 +140,8 @@ extern int inet6_ac_check(struct sock *sk, struct in6_addr *addr, int ifindex);
 
 extern int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr);
 extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr);
-extern int ipv6_chk_acast_addr(struct net_device *dev, struct in6_addr *addr);
+extern int ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
+                               struct in6_addr *addr);
 
 
 /* Device notifier */
@@ -185,26 +191,6 @@ static inline void in6_ifa_put(struct inet6_ifaddr *ifp)
 #define in6_ifa_hold(ifp)       atomic_inc(&(ifp)->refcnt)
 
 
-extern void                     addrconf_forwarding_on(void);
-/*
- *      Hash function taken from net_alias.c
- */
-
-static __inline__ u8 ipv6_addr_hash(const struct in6_addr *addr)
-{       
-        __u32 word;
-
-        /* 
-         * We perform the hash function over the last 64 bits of the address
-         * This will include the IEEE address token on links that support it.
-         */
-
-        word = (__force u32)(addr->s6_addr32[2] ^ addr->s6_addr32[3]);
-        word ^= (word >> 16);
-        word ^= (word >> 8);
-
-        return ((word ^ (word >> 4)) & 0x0f);
-}
 
 /*
  *      compute link-local solicited-node multicast address
@@ -214,61 +200,31 @@ static inline void addrconf_addr_solict_mult(const struct in6_addr *addr,
                                              struct in6_addr *solicited)
 {
         ipv6_addr_set(solicited,
-                      __constant_htonl(0xFF020000), 0,
-                      __constant_htonl(0x1),
-                      __constant_htonl(0xFF000000) | addr->s6_addr32[3]);
-}
-
-
-static inline void ipv6_addr_all_nodes(struct in6_addr *addr)
-{
-        ipv6_addr_set(addr,
-                      __constant_htonl(0xFF020000), 0, 0,
-                      __constant_htonl(0x1));
-}
-
-static inline void ipv6_addr_all_routers(struct in6_addr *addr)
-{
-        ipv6_addr_set(addr,
-                      __constant_htonl(0xFF020000), 0, 0,
-                      __constant_htonl(0x2));
+                      htonl(0xFF020000), 0,
+                      htonl(0x1),
+                      htonl(0xFF000000) | addr->s6_addr32[3]);
 }
 
 static inline int ipv6_addr_is_multicast(const struct in6_addr *addr)
 {
-        return (addr->s6_addr32[0] & __constant_htonl(0xFF000000)) == __constant_htonl(0xFF000000);
+        return (addr->s6_addr32[0] & htonl(0xFF000000)) == htonl(0xFF000000);
 }
 
 static inline int ipv6_addr_is_ll_all_nodes(const struct in6_addr *addr)
 {
-        return (addr->s6_addr32[0] == htonl(0xff020000) &&
-                addr->s6_addr32[1] == 0 &&
-                addr->s6_addr32[2] == 0 &&
-                addr->s6_addr32[3] == htonl(0x00000001));
+        return (((addr->s6_addr32[0] ^ htonl(0xff020000)) |
+                addr->s6_addr32[1] | addr->s6_addr32[2] |
+                (addr->s6_addr32[3] ^ htonl(0x00000001))) == 0);
 }
 
 static inline int ipv6_addr_is_ll_all_routers(const struct in6_addr *addr)
 {
-        return (addr->s6_addr32[0] == htonl(0xff020000) &&
-                addr->s6_addr32[1] == 0 &&
-                addr->s6_addr32[2] == 0 &&
-                addr->s6_addr32[3] == htonl(0x00000002));
+        return (((addr->s6_addr32[0] ^ htonl(0xff020000)) |
+                addr->s6_addr32[1] | addr->s6_addr32[2] |
+                (addr->s6_addr32[3] ^ htonl(0x00000002))) == 0);
 }
 
-static inline int ipv6_isatap_eui64(u8 *eui, __be32 addr)
-{
-        eui[0] = (ipv4_is_zeronet(addr) || ipv4_is_private_10(addr) ||
-                  ipv4_is_loopback(addr) || ipv4_is_linklocal_169(addr) ||
-                  ipv4_is_private_172(addr) || ipv4_is_test_192(addr) ||
-                  ipv4_is_anycast_6to4(addr) || ipv4_is_private_192(addr) ||
-                  ipv4_is_test_198(addr) || ipv4_is_multicast(addr) ||
-                  ipv4_is_lbcast(addr)) ? 0x00 : 0x02;
-        eui[1] = 0;
-        eui[2] = 0x5E;
-        eui[3] = 0xFE;
-        memcpy (eui+4, &addr, 4);
-        return 0;
-}
+extern int __ipv6_isatap_ifid(u8 *eui, __be32 addr);
 
 static inline int ipv6_addr_is_isatap(const struct in6_addr *addr)
 {