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: (448 commits)
  [IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res)
  [IPV6]: Fix thinko in ipv6_rthdr_rcv() changes.
  [IPV4]: Add multipath cached to feature-removal-schedule.txt
  [WIRELESS] cfg80211: Clarify locking comment.
  [WIRELESS] cfg80211: Fix locking in wiphy_new.
  [WEXT] net_device: Don't include wext bits if not required.
  [WEXT]: Misc code cleanups.
  [WEXT]: Reduce inline abuse.
  [WEXT]: Move EXPORT_SYMBOL statements where they belong.
  [WEXT]: Cleanup early ioctl call path.
  [WEXT]: Remove options.
  [WEXT]: Remove dead debug code.
  [WEXT]: Clean up how wext is called.
  [WEXT]: Move to net/wireless
  [AFS]: Eliminate cmpxchg() usage in vlocation code.
  [RXRPC]: Fix pointers passed to bitops.
  [RXRPC]: Remove bogus atomic_* overrides.
  [AFS]: Fix u64 printing in debug logging.
  [AFS]: Add "directory write" support.
  [AFS]: Implement the CB.InitCallBackState3 operation.
  ...

1 files changed, 0 insertions, 71 deletions

diff --git a/include/rxrpc/message.h b/include/rxrpc/message.h
deleted file mode 100644
index b318f273d4f2..000000000000
--- a/include/rxrpc/message.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* message.h: Rx message caching
- *
- * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_RXRPC_MESSAGE_H
-#define _LINUX_RXRPC_MESSAGE_H
-
-#include <rxrpc/packet.h>
-
-/*****************************************************************************/
-/*
- * Rx message record
- */
-struct rxrpc_message
-{
-        atomic_t                usage;
-        struct list_head        link;           /* list link */
-        struct timeval          stamp;          /* time received or last sent */
-        rxrpc_seq_t             seq;            /* message sequence number */
-
-        int                     state;          /* the state the message is currently in */
-#define RXRPC_MSG_PREPARED      0
-#define RXRPC_MSG_SENT          1
-#define RXRPC_MSG_ACKED         2               /* provisionally ACK'd */
-#define RXRPC_MSG_DONE          3               /* definitively ACK'd (msg->seq<ack.firstPacket) */
-#define RXRPC_MSG_RECEIVED      4
-#define RXRPC_MSG_ERROR         -1
-        char                    rttdone;        /* used for RTT */
-
-        struct rxrpc_transport  *trans;         /* transport received through */
-        struct rxrpc_connection *conn;          /* connection received over */
-        struct sk_buff          *pkt;           /* received packet */
-        off_t                   offset;         /* offset into pkt of next byte of data */
-
-        struct rxrpc_header     hdr;            /* message header */
-
-        int                     dcount;         /* data part count */
-        size_t                  dsize;          /* data size */
-#define RXRPC_MSG_MAX_IOCS 8
-        struct kvec             data[RXRPC_MSG_MAX_IOCS]; /* message data */
-        unsigned long           dfree;          /* bit mask indicating kfree(data[x]) if T */
-};
-
-#define rxrpc_get_message(M) do { atomic_inc(&(M)->usage); } while(0)
-
-extern void __rxrpc_put_message(struct rxrpc_message *msg);
-static inline void rxrpc_put_message(struct rxrpc_message *msg)
-{
-        BUG_ON(atomic_read(&msg->usage)<=0);
-        if (atomic_dec_and_test(&msg->usage))
-                __rxrpc_put_message(msg);
-}
-
-extern int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
-                             struct rxrpc_call *call,
-                             uint8_t type,
-                             int count,
-                             struct kvec *diov,
-                             gfp_t alloc_flags,
-                             struct rxrpc_message **_msg);
-
-extern int rxrpc_conn_sendmsg(struct rxrpc_connection *conn, struct rxrpc_message *msg);
-
-#endif /* _LINUX_RXRPC_MESSAGE_H */