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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [PKT_SCHED] netem: Orphan SKB when adding to queue.
  [NET]: kernel-doc fix for sock.h
  [NET]: Reduce sizeof(struct flowi) by 20 bytes.
  [IPv6] fib: initialize tb6_lock in common place to give lockdep a key
  [ATM] nicstar: Fix a bogus casting warning
  [ATM] firestream: handle thrown error
  [ATM]: No need to return void
  [ATM]: handle sysfs errors
  [DCCP] ipv6: Fix opt_skb leak.
  [DCCP]: Fix Oops in DCCPv6

3 files changed, 1 insertions, 10 deletions

diff --git a/include/net/dn.h b/include/net/dn.h
index 465b78302782..ac4ce9091747 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -199,11 +199,6 @@ static inline void dn_sk_ports_copy(struct flowi *fl, struct dn_scp *scp)
 {
         fl->uli_u.dnports.sport = scp->addrloc;
         fl->uli_u.dnports.dport = scp->addrrem;
-        fl->uli_u.dnports.objnum = scp->addr.sdn_objnum;
-        if (fl->uli_u.dnports.objnum == 0) {
-                fl->uli_u.dnports.objnamel = (__u8)dn_ntohs(scp->addr.sdn_objnamel);
-                memcpy(fl->uli_u.dnports.objname, scp->addr.sdn_objname, 16);
-        }
 }
 
 extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);
diff --git a/include/net/flow.h b/include/net/flow.h
index 3b44d72b27d3..5cda27cd9deb 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -68,9 +68,6 @@ struct flowi {
                 struct {
                         __le16  sport;
                         __le16  dport;
-                        __u8    objnum;
-                        __u8    objnamel; /* Not 16 bits since max val is 16 */
-                        __u8    objname[16]; /* Not zero terminated */
                 } dnports;
 
                 __be32          spi;
diff --git a/include/net/sock.h b/include/net/sock.h
index 40bb90ebb2d1..ac286a353032 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -884,8 +884,7 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb)
 
 /**
  *      sk_filter_release: Release a socket filter
- *      @sk: socket
- *      @fp: filter to remove
+ *      @rcu: rcu_head that contains the sk_filter info to remove
  *
  *      Remove a filter from a socket and release its resources.
  */