Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 27 Sep 2010 08:03:03 +0000 (01:03 -0700)]
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c

29 files changed:
1  2 
MAINTAINERS
drivers/net/3c59x.c
drivers/net/atlx/atl1.c
drivers/net/bonding/bond_3ad.c
drivers/net/cxgb3/cxgb3_main.c
drivers/net/e1000e/netdev.c
drivers/net/ibm_newemac/core.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/qlcnic/qlcnic_init.c
drivers/net/r8169.c
drivers/net/smsc911x.c
drivers/net/usb/hso.c
drivers/net/wireless/iwlwifi/iwl-core.c
include/net/addrconf.h
include/net/tcp.h
net/core/dev.c
net/core/sock.c
net/ipv4/ip_gre.c
net/ipv4/ip_output.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv6/addrconf.c
net/ipv6/addrlabel.c
net/ipv6/ip6_output.c
net/rds/tcp_connect.c
net/rds/tcp_listen.c
net/rds/tcp_recv.c
net/rds/tcp_send.c
net/sctp/output.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
diff --cc net/core/sock.c
Simple merge
@@@ -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>
@@@ -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
Simple merge
Simple merge
Simple merge
@@@ -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) ||
@@@ -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;
        }
@@@ -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;
        }
@@@ -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;
        }
@@@ -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;
        }
Simple merge