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

Conflicts:
	drivers/net/qlcnic/qlcnic_init.c
	net/ipv4/ip_output.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/3c59x.c
Simple merge

diff --cc drivers/net/atlx/atl1.c
Simple merge

diff --cc drivers/net/bonding/bond_3ad.c
Simple merge

diff --cc drivers/net/cxgb3/cxgb3_main.c
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ibm_newemac/core.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic_init.c
Simple merge

diff --cc drivers/net/qlcnic/qlcnic_init.c
Simple merge

diff --cc drivers/net/r8169.c
Simple merge

diff --cc drivers/net/smsc911x.c
Simple merge

diff --cc drivers/net/usb/hso.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc include/net/addrconf.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/ip_gre.c
index 0967d02fefd87adc4e7b4931f656ab1945ccecf0,35c93e8b6a4694561c838641e546b609e8cbfaa0..5d6ddcb7403b487ea1fa347595685f7f73061803
--- 1/net/ipv4/ip_gre.c
--- 2/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@@ -44,9 -44,8 +44,9 @@@
  #include <net/net_namespace.h>
  #include <net/netns/generic.h>
  #include <net/rtnetlink.h>
 +#include <net/gre.h>
  
- #ifdef CONFIG_IPV6
+ #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
  #include <net/ipv6.h>
  #include <net/ip6_fib.h>
  #include <net/ip6_route.h>

diff --cc net/ipv4/ip_output.c
index 3551b6dc741905f59528d1eee49e0e9437974225,7649d7750075d184896a9da6d37ed9a35ea5f403..439d2a34ee4411b932eefb3a6fc51383e8db7125
--- 1/net/ipv4/ip_output.c
--- 2/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@@ -487,10 -487,9 +487,9 @@@ int ip_fragment(struct sk_buff *skb, in
         * LATER: this step can be merged to real generation of fragments,
         * we can switch to copy when see the first bad fragment.
         */
 -      if (skb_has_frags(skb)) {
 +      if (skb_has_frag_list(skb)) {
-               struct sk_buff *frag;
+               struct sk_buff *frag, *frag2;
                int first_len = skb_pagelen(skb);
-               int truesizes = 0;
  
                if (first_len - hlen > mtu ||
                    ((first_len - hlen) & 7) ||

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/addrlabel.c
Simple merge

diff --cc net/ipv6/ip6_output.c
index efbbbce68f9e2914c51bb2b7d3e2e1d52dae44a4,980912ed7a388bd2404b8cb934b2b61e67e12a6c..99157b4cd56e2fa619939a17aa5b716680fc8799
--- 1/net/ipv6/ip6_output.c
--- 2/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@@ -637,9 -637,9 +637,9 @@@ static int ip6_fragment(struct sk_buff 
        }
        mtu -= hlen + sizeof(struct frag_hdr);
  
 -      if (skb_has_frags(skb)) {
 +      if (skb_has_frag_list(skb)) {
                int first_len = skb_pagelen(skb);
-               int truesizes = 0;
+               struct sk_buff *frag2;
  
                if (first_len - hlen > mtu ||
                    ((first_len - hlen) & 7) ||

diff --cc net/rds/tcp_connect.c
index a65ee78db0c54e1062186b9b132fe46fac380c91,c519939e8da98fd3ae8252355a0ebb9efac4acd5..af95c8e058fc0d45096234aa8aeb7c8da6fda175
--- 1/net/rds/tcp_connect.c
--- 2/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@@ -43,9 -43,9 +43,9 @@@ void rds_tcp_state_change(struct sock *
        struct rds_connection *conn;
        struct rds_tcp_connection *tc;
  
-       read_lock(&sk->sk_callback_lock);
+       read_lock_bh(&sk->sk_callback_lock);
        conn = sk->sk_user_data;
 -      if (conn == NULL) {
 +      if (!conn) {
                state_change = sk->sk_state_change;
                goto out;
        }

diff --cc net/rds/tcp_listen.c
index ae27869dfc2137a342918f558082c1e58e1d4e88,27844f231d103a4e49e542d670eaca66d01e761d..8b5cc4aa8868702cc743a87c96a100e58809865f
--- 1/net/rds/tcp_listen.c
--- 2/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@@ -114,9 -114,9 +114,9 @@@ void rds_tcp_listen_data_ready(struct s
  
        rdsdebug("listen data ready sk %p\n", sk);
  
-       read_lock(&sk->sk_callback_lock);
+       read_lock_bh(&sk->sk_callback_lock);
        ready = sk->sk_user_data;
 -      if (ready == NULL) { /* check for teardown race */
 +      if (!ready) { /* check for teardown race */
                ready = sk->sk_data_ready;
                goto out;
        }

diff --cc net/rds/tcp_recv.c
index 7017f3af80b671cca7b403d99e8006444eb1c8bb,e43797404102efcc2ed45117456e839b5425adb1..67263fbee623a467bb543d70c1f0fd2646137157
--- 1/net/rds/tcp_recv.c
--- 2/net/rds/tcp_recv.c
+++ b/net/rds/tcp_recv.c
@@@ -324,9 -324,9 +324,9 @@@ void rds_tcp_data_ready(struct sock *sk
  
        rdsdebug("data ready sk %p bytes %d\n", sk, bytes);
  
-       read_lock(&sk->sk_callback_lock);
+       read_lock_bh(&sk->sk_callback_lock);
        conn = sk->sk_user_data;
 -      if (conn == NULL) { /* check for teardown race */
 +      if (!conn) { /* check for teardown race */
                ready = sk->sk_data_ready;
                goto out;
        }

diff --cc net/rds/tcp_send.c
index 2979fb4a4b9aaf8df3b0216d69cac828885df398,2f012a07d94d16d3aa01d4c78d0894e939dfd751..aa16841afbdf9c3597d466f46ac3f49185861d88
--- 1/net/rds/tcp_send.c
--- 2/net/rds/tcp_send.c
+++ b/net/rds/tcp_send.c
@@@ -174,9 -224,9 +174,9 @@@ void rds_tcp_write_space(struct sock *s
        struct rds_connection *conn;
        struct rds_tcp_connection *tc;
  
-       read_lock(&sk->sk_callback_lock);
+       read_lock_bh(&sk->sk_callback_lock);
        conn = sk->sk_user_data;
 -      if (conn == NULL) {
 +      if (!conn) {
                write_space = sk->sk_write_space;
                goto out;
        }

diff --cc net/sctp/output.c
Simple merge