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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6:
  bnx2: Fix the behavior of ethtool when ONBOOT=no
  qla3xxx: Don't sleep while holding lock.
  qla3xxx: Give the PHY time to come out of reset.
  ipv4 routing: Ensure that route cache entries are usable and reclaimable with caching is off
  net: Move rx skb_orphan call to where needed
  ipv6: Use correct data types for ICMPv6 type and code
  net: let KS8842 driver depend on HAS_IOMEM
  can: let SJA1000 driver depend on HAS_IOMEM
  netxen: fix firmware init handshake
  netxen: fix build with without CONFIG_PM
  netfilter: xt_rateest: fix comparison with self
  netfilter: xt_quota: fix incomplete initialization
  netfilter: nf_log: fix direct userspace memory access in proc handler
  netfilter: fix some sparse endianess warnings
  netfilter: nf_conntrack: fix conntrack lookup race
  netfilter: nf_conntrack: fix confirmation race condition
  netfilter: nf_conntrack: death_by_timeout() fix

diff --combined drivers/net/Kconfig
index 1dc7215,dd145c1..c155bd3
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -1725,6 -1725,7 +1725,7 @@@ config TLA
  
  config KS8842
        tristate "Micrel KSZ8842"
+       depends on HAS_IOMEM
        help
          This platform driver is for Micrel KSZ8842 chip.
  
@@@ -2206,7 -2207,7 +2207,7 @@@ config SKGE_DEBU
         depends on SKGE && DEBUG_FS
         help
         This option adds the ability to dump driver state for debugging.
 -       The file debugfs/skge/ethX displays the state of the internal
 +       The file /sys/kernel/debug/skge/ethX displays the state of the internal
         transmit and receive rings.
  
         If unsure, say N.
@@@ -2232,7 -2233,7 +2233,7 @@@ config SKY2_DEBU
         depends on SKY2 && DEBUG_FS
         help
         This option adds the ability to dump driver state for debugging.
 -       The file debugfs/sky2/ethX displays the state of the internal
 +       The file /sys/kernel/debug/sky2/ethX displays the state of the internal
         transmit and receive rings.
  
         If unsure, say N.
@@@ -2272,9 -2273,8 +2273,9 @@@ config BNX
  
  config CNIC
        tristate "Broadcom CNIC support"
 -      depends on BNX2
 -      depends on UIO
 +      depends on PCI
 +      select BNX2
 +      select UIO
        help
          This driver supports offload features of Broadcom NetXtremeII
          gigabit Ethernet cards.
@@@ -2443,17 -2443,6 +2444,17 @@@ config JM
          To compile this driver as a module, choose M here. The module
          will be called jme.
  
 +config S6GMAC
 +      tristate "S6105 GMAC ethernet support"
 +      depends on XTENSA_VARIANT_S6000
 +      select PHYLIB
 +      help
 +        This driver supports the on chip ethernet device on the
 +        S6105 xtensa processor.
 +
 +        To compile this driver as a module, choose M here. The module
 +        will be called s6gmac.
 +
  endif # NETDEV_1000
  
  #

diff --combined include/net/sock.h
index 07133c5,7f5c41c..352f06b
--- 1/include/net/sock.h
--- 2/include/net/sock.h
+++ b/include/net/sock.h
@@@ -218,11 -218,9 +218,11 @@@ struct sock 
  #define sk_hash                       __sk_common.skc_hash
  #define sk_prot                       __sk_common.skc_prot
  #define sk_net                        __sk_common.skc_net
 +      kmemcheck_bitfield_begin(flags);
        unsigned char           sk_shutdown : 2,
                                sk_no_check : 2,
                                sk_userlocks : 4;
 +      kmemcheck_bitfield_end(flags);
        unsigned char           sk_protocol;
        unsigned short          sk_type;
        int                     sk_rcvbuf;
@@@ -1252,6 -1250,7 +1252,7 @@@ static inline int sk_has_allocations(co
  
  static inline void skb_set_owner_w(struct sk_buff *skb, struct sock *sk)
  {
+       skb_orphan(skb);
        skb->sk = sk;
        skb->destructor = sock_wfree;
        /*
@@@ -1264,6 -1263,7 +1265,7 @@@
  
  static inline void skb_set_owner_r(struct sk_buff *skb, struct sock *sk)
  {
+       skb_orphan(skb);
        skb->sk = sk;
        skb->destructor = sock_rfree;
        atomic_add(skb->truesize, &sk->sk_rmem_alloc);