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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Make skb_seq_read unmap the last fragment
  [NET]: Re-enable irqs before pushing pending DMA requests
  [TCP] tcp_read_sock: Allow recv_actor() return return negative error value.
  [PPP]: Fix osize too small errors when decoding mppe.
  [PPP]: Revert 606f585e363527da9feaed79465132c0c661fd9e
  [TIPC]: Fix infinite loop in netlink handler
  [SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark
  [IPV4]: include sysctl.h from inetdevice.h
  [IPV6] NDISC: Fix thinko to control Router Preference support.
  [NETFILTER]: nfctnetlink: Don't allow to change helper
  [NETFILTER]: nf_conntrack_sip: add missing message types containing RTP info

7 files changed, 19 insertions, 8 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 26090621ea..ee051bb398 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2009,6 +2009,7 @@ static void net_rx_action(struct softirq_action *h)
                 }
         }
 out:
+        local_irq_enable();
 #ifdef CONFIG_NET_DMA
         /*
          * There may not be any more sk_buffs coming right now, so push
@@ -2022,7 +2023,6 @@ out:
                 rcu_read_unlock();
         }
 #endif
-        local_irq_enable();
         return;
 
 softnet_break:
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 7c6a34e21e..27cfe5fe4b 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -434,8 +434,8 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
         n->tc_verd = CLR_TC_MUNGED(n->tc_verd);
         C(iif);
 #endif
-        skb_copy_secmark(n, skb);
 #endif
+        skb_copy_secmark(n, skb);
         C(truesize);
         atomic_set(&n->users, 1);
         C(head);
@@ -1706,6 +1706,11 @@ next_skb:
                 st->stepped_offset += frag->size;
         }
 
+        if (st->frag_data) {
+                kunmap_skb_frag(st->frag_data);
+                st->frag_data = NULL;
+        }
+
         if (st->cur_skb->next) {
                 st->cur_skb = st->cur_skb->next;
                 st->frag_idx = 0;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index cd3c7e95de..450f44bb2c 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1064,7 +1064,11 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
                                         break;
                         }
                         used = recv_actor(desc, skb, offset, len);
-                        if (used <= len) {
+                        if (used < 0) {
+                                if (!copied)
+                                        copied = used;
+                                break;
+                        } else if (used <= len) {
                                 seq += used;
                                 copied += used;
                                 offset += used;
@@ -1086,7 +1090,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
         tcp_rcv_space_adjust(sk);
 
         /* Clean up data we have read: This will do ACK frames. */
-        if (copied)
+        if (copied > 0)
                 tcp_cleanup_rbuf(sk, copied);
         return copied;
 }
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index d8b36451ba..0358e6066a 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1062,7 +1062,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
         pref = ra_msg->icmph.icmp6_router_pref;
         /* 10b is handled as if it were 00b (medium) */
         if (pref == ICMPV6_ROUTER_PREF_INVALID ||
-            in6_dev->cnf.accept_ra_rtr_pref)
+            !in6_dev->cnf.accept_ra_rtr_pref)
                 pref = ICMPV6_ROUTER_PREF_MEDIUM;
 #endif
 
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 3f73327794..d0fe3d7698 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -869,8 +869,7 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nfattr *cda[])
                 return 0;
 
         if (help->helper)
-                /* we had a helper before ... */
-                nf_ct_remove_expectations(ct);
+                return -EBUSY;
 
         /* need to zero data of old helper */
         memset(&help->help, 0, sizeof(help->help));
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 7aaa8c91b2..1b5c6c1055 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -442,6 +442,9 @@ static int sip_help(struct sk_buff **pskb,
 
         /* RTP info only in some SDP pkts */
         if (memcmp(dptr, "INVITE", sizeof("INVITE") - 1) != 0 &&
+            memcmp(dptr, "UPDATE", sizeof("UPDATE") - 1) != 0 &&
+            memcmp(dptr, "SIP/2.0 180", sizeof("SIP/2.0 180") - 1) != 0 &&
+            memcmp(dptr, "SIP/2.0 183", sizeof("SIP/2.0 183") - 1) != 0 &&
             memcmp(dptr, "SIP/2.0 200", sizeof("SIP/2.0 200") - 1) != 0) {
                 goto out;
         }
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 4cdafa2d1d..6a7f7b4c25 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -60,7 +60,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
                 rep_nlh = nlmsg_hdr(rep_buf);
                 memcpy(rep_nlh, req_nlh, hdr_space);
                 rep_nlh->nlmsg_len = rep_buf->len;
-                genlmsg_unicast(rep_buf, req_nlh->nlmsg_pid);
+                genlmsg_unicast(rep_buf, NETLINK_CB(skb).pid);
         }
 
         return 0;