Patched in Tegra support.

2 files changed, 3 insertions, 90 deletions

diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index cc7c1973238..f82a1e87737 100644
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -14,7 +14,6 @@
 #include <linux/list.h>
 #include <linux/poll.h>
 #include <linux/socket.h>
-#include <net/iucv/iucv.h>
 
 #ifndef AF_IUCV
 #define AF_IUCV         32
@@ -27,13 +26,13 @@ enum {
         IUCV_OPEN,
         IUCV_BOUND,
         IUCV_LISTEN,
+        IUCV_SEVERED,
         IUCV_DISCONN,
         IUCV_CLOSING,
         IUCV_CLOSED
 };
 
 #define IUCV_QUEUELEN_DEFAULT   65535
-#define IUCV_HIPER_MSGLIM_DEFAULT       128
 #define IUCV_CONN_TIMEOUT       (HZ * 40)
 #define IUCV_DISCONN_TIMEOUT    (HZ * 2)
 #define IUCV_CONN_IDLE_TIMEOUT  (HZ * 60)
@@ -58,52 +57,8 @@ struct sock_msg_q {
         spinlock_t              lock;
 };
 
-#define AF_IUCV_FLAG_ACK 0x1
-#define AF_IUCV_FLAG_SYN 0x2
-#define AF_IUCV_FLAG_FIN 0x4
-#define AF_IUCV_FLAG_WIN 0x8
-#define AF_IUCV_FLAG_SHT 0x10
-
-struct af_iucv_trans_hdr {
-        u16 magic;
-        u8 version;
-        u8 flags;
-        u16 window;
-        char destNodeID[8];
-        char destUserID[8];
-        char destAppName[16];
-        char srcNodeID[8];
-        char srcUserID[8];
-        char srcAppName[16];             /* => 70 bytes */
-        struct iucv_message iucv_hdr;    /* => 33 bytes */
-        u8 pad;                          /* total 104 bytes */
-} __packed;
-
-enum iucv_tx_notify {
-        /* transmission of skb is completed and was successful */
-        TX_NOTIFY_OK = 0,
-        /* target is unreachable */
-        TX_NOTIFY_UNREACHABLE = 1,
-        /* transfer pending queue full */
-        TX_NOTIFY_TPQFULL = 2,
-        /* general error */
-        TX_NOTIFY_GENERALERROR = 3,
-        /* transmission of skb is pending - may interleave
-         * with TX_NOTIFY_DELAYED_* */
-        TX_NOTIFY_PENDING = 4,
-        /* transmission of skb was done successfully (delayed) */
-        TX_NOTIFY_DELAYED_OK = 5,
-        /* target unreachable (detected delayed) */
-        TX_NOTIFY_DELAYED_UNREACHABLE = 6,
-        /* general error (detected delayed) */
-        TX_NOTIFY_DELAYED_GENERALERROR = 7,
-};
-
 #define iucv_sk(__sk) ((struct iucv_sock *) __sk)
 
-#define AF_IUCV_TRANS_IUCV 0
-#define AF_IUCV_TRANS_HIPER 1
-
 struct iucv_sock {
         struct sock             sk;
         char                    src_user_id[8];
@@ -114,26 +69,17 @@ struct iucv_sock {
         spinlock_t              accept_q_lock;
         struct sock             *parent;
         struct iucv_path        *path;
-        struct net_device       *hs_dev;
         struct sk_buff_head     send_skb_q;
         struct sk_buff_head     backlog_skb_q;
         struct sock_msg_q       message_q;
         unsigned int            send_tag;
         u8                      flags;
         u16                     msglimit;
-        u16                     msglimit_peer;
-        atomic_t                msg_sent;
-        atomic_t                msg_recv;
-        atomic_t                pendings;
-        int                     transport;
-        void                    (*sk_txnotify)(struct sk_buff *skb,
-                                               enum iucv_tx_notify n);
 };
 
 /* iucv socket options (SOL_IUCV) */
 #define SO_IPRMDATA_MSG 0x0080          /* send/recv IPRM_DATA msgs */
 #define SO_MSGLIMIT     0x1000          /* get/set IUCV MSGLIMIT */
-#define SO_MSGSIZE      0x0800          /* get maximum msgsize */
 
 /* iucv related control messages (scm) */
 #define SCM_IUCV_TRGCLS 0x0001          /* target class control message */
@@ -148,6 +94,7 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
                             poll_table *wait);
 void iucv_sock_link(struct iucv_sock_list *l, struct sock *s);
 void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s);
+int  iucv_sock_wait_cnt(struct sock *sk, unsigned long timeo);
 void iucv_accept_enqueue(struct sock *parent, struct sock *sk);
 void iucv_accept_unlink(struct sock *sk);
 struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock);
diff --git a/include/net/iucv/iucv.h b/include/net/iucv/iucv.h
index 0894ced3195..1121baa9f69 100644
--- a/include/net/iucv/iucv.h
+++ b/include/net/iucv/iucv.h
@@ -120,7 +120,7 @@ struct iucv_message {
         u32 reply_size;
         u8  rmmsg[8];
         u8  flags;
-} __packed;
+};
 
 /*
  * struct iucv_handler
@@ -459,37 +459,3 @@ int __iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
 int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg,
                           u8 flags, u32 srccls, void *buffer, size_t size,
                           void *answer, size_t asize, size_t *residual);
-
-struct iucv_interface {
-        int (*message_receive)(struct iucv_path *path, struct iucv_message *msg,
-                u8 flags, void *buffer, size_t size, size_t *residual);
-        int (*__message_receive)(struct iucv_path *path,
-                struct iucv_message *msg, u8 flags, void *buffer, size_t size,
-                size_t *residual);
-        int (*message_reply)(struct iucv_path *path, struct iucv_message *msg,
-                u8 flags, void *reply, size_t size);
-        int (*message_reject)(struct iucv_path *path, struct iucv_message *msg);
-        int (*message_send)(struct iucv_path *path, struct iucv_message *msg,
-                u8 flags, u32 srccls, void *buffer, size_t size);
-        int (*__message_send)(struct iucv_path *path, struct iucv_message *msg,
-                u8 flags, u32 srccls, void *buffer, size_t size);
-        int (*message_send2way)(struct iucv_path *path,
-                struct iucv_message *msg, u8 flags, u32 srccls, void *buffer,
-                size_t size, void *answer, size_t asize, size_t *residual);
-        int (*message_purge)(struct iucv_path *path, struct iucv_message *msg,
-                u32 srccls);
-        int (*path_accept)(struct iucv_path *path, struct iucv_handler *handler,
-                u8 userdata[16], void *private);
-        int (*path_connect)(struct iucv_path *path,
-                struct iucv_handler *handler,
-                u8 userid[8], u8 system[8], u8 userdata[16], void *private);
-        int (*path_quiesce)(struct iucv_path *path, u8 userdata[16]);
-        int (*path_resume)(struct iucv_path *path, u8 userdata[16]);
-        int (*path_sever)(struct iucv_path *path, u8 userdata[16]);
-        int (*iucv_register)(struct iucv_handler *handler, int smp);
-        void (*iucv_unregister)(struct iucv_handler *handler, int smp);
-        struct bus_type *bus;
-        struct device *root;
-};
-
-extern struct iucv_interface iucv_if;