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

9 files changed, 203 insertions, 103 deletions

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 10d040461021..c34614ea5fce 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -35,6 +35,7 @@
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <linux/atalk.h>
+#include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -462,8 +463,7 @@ void aarp_probe_network(struct atalk_iface *atif)
                         aarp_send_probe(atif->dev, &atif->address);
 
                         /* Defer 1/10th */
-                        current->state = TASK_INTERRUPTIBLE;
-                        schedule_timeout(HZ / 10);
+                        msleep(100);
 
                         if (atif->status & ATIF_PROBE_FAIL)
                                 break;
@@ -510,9 +510,8 @@ int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa)
                 aarp_send_probe(atif->dev, sa);
 
                 /* Defer 1/10th */
-                current->state = TASK_INTERRUPTIBLE;
                 write_unlock_bh(&aarp_lock);
-                schedule_timeout(HZ / 10);
+                msleep(100);
                 write_lock_bh(&aarp_lock);
 
                 if (entry->status & ATIF_PROBE_FAIL)
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 18ebc664769b..c4540144f0f4 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -859,8 +859,7 @@ static int translate_table(struct ebt_replace *repl,
                 if (repl->valid_hooks & (1 << i))
                         if (check_chainloops(newinfo->hook_entry[i],
                            cl_s, udc_cnt, i, newinfo->entries)) {
-                                if (cl_s)
-                                        vfree(cl_s);
+                                vfree(cl_s);
                                 return -EINVAL;
                         }
 
@@ -883,8 +882,7 @@ static int translate_table(struct ebt_replace *repl,
                 EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,
                    ebt_cleanup_entry, &i);
         }
-        if (cl_s)
-                vfree(cl_s);
+        vfree(cl_s);
         return ret;
 }
 
@@ -1030,8 +1028,7 @@ static int do_replace(void __user *user, unsigned int len)
         }
         vfree(table);
 
-        if (counterstmp)
-                vfree(counterstmp);
+        vfree(counterstmp);
         return ret;
 
 free_unlock:
@@ -1040,8 +1037,7 @@ free_iterate:
         EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,
            ebt_cleanup_entry, NULL);
 free_counterstmp:
-        if (counterstmp)
-                vfree(counterstmp);
+        vfree(counterstmp);
         /* can be initialized in translate_table() */
         if (newinfo->chainstack) {
                 for (i = 0; i < num_possible_cpus(); i++)
@@ -1049,11 +1045,9 @@ free_counterstmp:
                 vfree(newinfo->chainstack);
         }
 free_entries:
-        if (newinfo->entries)
-                vfree(newinfo->entries);
+        vfree(newinfo->entries);
 free_newinfo:
-        if (newinfo)
-                vfree(newinfo);
+        vfree(newinfo);
         return ret;
 }
 
@@ -1213,8 +1207,7 @@ void ebt_unregister_table(struct ebt_table *table)
         down(&ebt_mutex);
         LIST_DELETE(&ebt_tables, table);
         up(&ebt_mutex);
-        if (table->private->entries)
-                vfree(table->private->entries);
+        vfree(table->private->entries);
         if (table->private->chainstack) {
                 for (i = 0; i < num_possible_cpus(); i++)
                         vfree(table->private->chainstack[i]);
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index a119696d5521..c327c9edadc5 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -130,19 +130,20 @@ static int checksum_udp(struct sk_buff *skb, struct udphdr *uh,
  */
 static void poll_napi(struct netpoll *np)
 {
+        struct netpoll_info *npinfo = np->dev->npinfo;
         int budget = 16;
 
         if (test_bit(__LINK_STATE_RX_SCHED, &np->dev->state) &&
-            np->poll_owner != smp_processor_id() &&
-            spin_trylock(&np->poll_lock)) {
-                np->rx_flags |= NETPOLL_RX_DROP;
+            npinfo->poll_owner != smp_processor_id() &&
+            spin_trylock(&npinfo->poll_lock)) {
+                npinfo->rx_flags |= NETPOLL_RX_DROP;
                 atomic_inc(&trapped);
 
                 np->dev->poll(np->dev, &budget);
 
                 atomic_dec(&trapped);
-                np->rx_flags &= ~NETPOLL_RX_DROP;
-                spin_unlock(&np->poll_lock);
+                npinfo->rx_flags &= ~NETPOLL_RX_DROP;
+                spin_unlock(&npinfo->poll_lock);
         }
 }
 
@@ -245,6 +246,7 @@ repeat:
 static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
 {
         int status;
+        struct netpoll_info *npinfo;
 
 repeat:
         if(!np || !np->dev || !netif_running(np->dev)) {
@@ -253,8 +255,9 @@ repeat:
         }
 
         /* avoid recursion */
-        if(np->poll_owner == smp_processor_id() ||
-           np->dev->xmit_lock_owner == smp_processor_id()) {
+        npinfo = np->dev->npinfo;
+        if (npinfo->poll_owner == smp_processor_id() ||
+            np->dev->xmit_lock_owner == smp_processor_id()) {
                 if (np->drop)
                         np->drop(skb);
                 else
@@ -341,14 +344,22 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
 
 static void arp_reply(struct sk_buff *skb)
 {
+        struct netpoll_info *npinfo = skb->dev->npinfo;
         struct arphdr *arp;
         unsigned char *arp_ptr;
         int size, type = ARPOP_REPLY, ptype = ETH_P_ARP;
         u32 sip, tip;
+        unsigned long flags;
         struct sk_buff *send_skb;
-        struct netpoll *np = skb->dev->np;
+        struct netpoll *np = NULL;
+
+        spin_lock_irqsave(&npinfo->rx_lock, flags);
+        if (npinfo->rx_np && npinfo->rx_np->dev == skb->dev)
+                np = npinfo->rx_np;
+        spin_unlock_irqrestore(&npinfo->rx_lock, flags);
 
-        if (!np) return;
+        if (!np)
+                return;
 
         /* No arp on this interface */
         if (skb->dev->flags & IFF_NOARP)
@@ -429,9 +440,9 @@ int __netpoll_rx(struct sk_buff *skb)
         int proto, len, ulen;
         struct iphdr *iph;
         struct udphdr *uh;
-        struct netpoll *np = skb->dev->np;
+        struct netpoll *np = skb->dev->npinfo->rx_np;
 
-        if (!np->rx_hook)
+        if (!np)
                 goto out;
         if (skb->dev->type != ARPHRD_ETHER)
                 goto out;
@@ -611,9 +622,8 @@ int netpoll_setup(struct netpoll *np)
 {
         struct net_device *ndev = NULL;
         struct in_device *in_dev;
-
-        np->poll_lock = SPIN_LOCK_UNLOCKED;
-        np->poll_owner = -1;
+        struct netpoll_info *npinfo;
+        unsigned long flags;
 
         if (np->dev_name)
                 ndev = dev_get_by_name(np->dev_name);
@@ -624,7 +634,17 @@ int netpoll_setup(struct netpoll *np)
         }
 
         np->dev = ndev;
-        ndev->np = np;
+        if (!ndev->npinfo) {
+                npinfo = kmalloc(sizeof(*npinfo), GFP_KERNEL);
+                if (!npinfo)
+                        goto release;
+
+                npinfo->rx_np = NULL;
+                npinfo->poll_lock = SPIN_LOCK_UNLOCKED;
+                npinfo->poll_owner = -1;
+                npinfo->rx_lock = SPIN_LOCK_UNLOCKED;
+        } else
+                npinfo = ndev->npinfo;
 
         if (!ndev->poll_controller) {
                 printk(KERN_ERR "%s: %s doesn't support polling, aborting.\n",
@@ -692,13 +712,20 @@ int netpoll_setup(struct netpoll *np)
                        np->name, HIPQUAD(np->local_ip));
         }
 
-        if(np->rx_hook)
-                np->rx_flags = NETPOLL_RX_ENABLED;
+        if (np->rx_hook) {
+                spin_lock_irqsave(&npinfo->rx_lock, flags);
+                npinfo->rx_flags |= NETPOLL_RX_ENABLED;
+                npinfo->rx_np = np;
+                spin_unlock_irqrestore(&npinfo->rx_lock, flags);
+        }
+        /* last thing to do is link it to the net device structure */
+        ndev->npinfo = npinfo;
 
         return 0;
 
  release:
-        ndev->np = NULL;
+        if (!ndev->npinfo)
+                kfree(npinfo);
         np->dev = NULL;
         dev_put(ndev);
         return -1;
@@ -706,9 +733,20 @@ int netpoll_setup(struct netpoll *np)
 
 void netpoll_cleanup(struct netpoll *np)
 {
-        if (np->dev)
-                np->dev->np = NULL;
-        dev_put(np->dev);
+        struct netpoll_info *npinfo;
+        unsigned long flags;
+
+        if (np->dev) {
+                npinfo = np->dev->npinfo;
+                if (npinfo && npinfo->rx_np == np) {
+                        spin_lock_irqsave(&npinfo->rx_lock, flags);
+                        npinfo->rx_np = NULL;
+                        npinfo->rx_flags &= ~NETPOLL_RX_ENABLED;
+                        spin_unlock_irqrestore(&npinfo->rx_lock, flags);
+                }
+                dev_put(np->dev);
+        }
+
         np->dev = NULL;
 }
 
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index dc4362b57cfa..9cde8c61f525 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -339,7 +339,7 @@ target(struct sk_buff **pskb,
          * error messages (RELATED) and information requests (see below) */
         if ((*pskb)->nh.iph->protocol == IPPROTO_ICMP
             && (ctinfo == IP_CT_RELATED 
-                || ctinfo == IP_CT_IS_REPLY+IP_CT_IS_REPLY))
+                || ctinfo == IP_CT_RELATED+IP_CT_IS_REPLY))
                 return IPT_CONTINUE;
 
         /* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO, 
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index f4d53c919869..80cf633d9f4a 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1767,7 +1767,7 @@ static inline int ip_mkroute_input_def(struct sk_buff *skb,
                                        struct in_device *in_dev,
                                        u32 daddr, u32 saddr, u32 tos)
 {
-        struct rtable* rth;
+        struct rtable* rth = NULL;
         int err;
         unsigned hash;
 
@@ -1794,7 +1794,7 @@ static inline int ip_mkroute_input(struct sk_buff *skb,
                                    u32 daddr, u32 saddr, u32 tos)
 {
 #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
-        struct rtable* rth;
+        struct rtable* rth = NULL;
         unsigned char hop, hopcount, lasthop;
         int err = -EINVAL;
         unsigned int hash;
@@ -2239,7 +2239,7 @@ static inline int ip_mkroute_output_def(struct rtable **rp,
                                         struct net_device *dev_out,
                                         unsigned flags)
 {
-        struct rtable *rth;
+        struct rtable *rth = NULL;
         int err = __mkroute_output(&rth, res, fl, oldflp, dev_out, flags);
         unsigned hash;
         if (err == 0) {
@@ -2267,7 +2267,7 @@ static inline int ip_mkroute_output(struct rtable** rp,
         unsigned char hop;
         unsigned hash;
         int err = -EINVAL;
-        struct rtable *rth;
+        struct rtable *rth = NULL;
 
         if (res->fi && res->fi->fib_nhs > 1) {
                 unsigned char hopcount = res->fi->fib_nhs;
diff --git a/net/socket.c b/net/socket.c
index 38729af09461..6f2a17881972 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -383,9 +383,8 @@ int sock_map_fd(struct socket *sock)
                         goto out;
                 }
 
-                sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
+                this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
                 this.name = name;
-                this.len = strlen(name);
                 this.hash = SOCK_INODE(sock)->i_ino;
 
                 file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this);
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 2a24b243b841..04bec047fa9a 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -29,6 +29,10 @@
  *      2000-11-14      Henner Eisen    Closing datalink from NETDEV_GOING_DOWN
  *      2002-10-06      Arnaldo C. Melo Get rid of cli/sti, move proc stuff to
  *                                      x25_proc.c, using seq_file
+ *      2005-04-02      Shaun Pereira   Selective sub address matching
+ *                                      with call user data
+ *      2005-04-15      Shaun Pereira   Fast select with no restriction on
+ *                                      response
  */
 
 #include <linux/config.h>
@@ -219,7 +223,8 @@ static void x25_insert_socket(struct sock *sk)
  *      Note: if a listening socket has cud set it must only get calls
  *      with matching cud.
  */
-static struct sock *x25_find_listener(struct x25_address *addr, struct x25_calluserdata *calluserdata)
+static struct sock *x25_find_listener(struct x25_address *addr,
+                                        struct sk_buff *skb)
 {
         struct sock *s;
         struct sock *next_best;
@@ -230,22 +235,23 @@ static struct sock *x25_find_listener(struct x25_address *addr, struct x25_callu
 
         sk_for_each(s, node, &x25_list)
                 if ((!strcmp(addr->x25_addr,
-                             x25_sk(s)->source_addr.x25_addr) ||
-                     !strcmp(addr->x25_addr,
-                             null_x25_address.x25_addr)) &&
-                     s->sk_state == TCP_LISTEN) {
-
+                        x25_sk(s)->source_addr.x25_addr) ||
+                                !strcmp(addr->x25_addr,
+                                        null_x25_address.x25_addr)) &&
+                                        s->sk_state == TCP_LISTEN) {
                         /*
                          * Found a listening socket, now check the incoming
                          * call user data vs this sockets call user data
                          */
-                        if (x25_check_calluserdata(&x25_sk(s)->calluserdata, calluserdata)) {
-                                sock_hold(s);
-                                goto found;
-                        }
-                        if (x25_sk(s)->calluserdata.cudlength == 0) {
+                        if(skb->len > 0 && x25_sk(s)->cudmatchlength > 0) {
+                                if((memcmp(x25_sk(s)->calluserdata.cuddata,
+                                        skb->data,
+                                        x25_sk(s)->cudmatchlength)) == 0) {
+                                        sock_hold(s);
+                                        goto found;
+                                 }
+                        } else
                                 next_best = s;
-                        }
                 }
         if (next_best) {
                 s = next_best;
@@ -497,6 +503,9 @@ static int x25_create(struct socket *sock, int protocol)
         x25->t23   = sysctl_x25_clear_request_timeout;
         x25->t2    = sysctl_x25_ack_holdback_timeout;
         x25->state = X25_STATE_0;
+        x25->cudmatchlength = 0;
+        x25->accptapprv = X25_DENY_ACCPT_APPRV;         /* normally no cud  */
+                                                        /* on call accept   */
 
         x25->facilities.winsize_in  = X25_DEFAULT_WINDOW_SIZE;
         x25->facilities.winsize_out = X25_DEFAULT_WINDOW_SIZE;
@@ -545,6 +554,8 @@ static struct sock *x25_make_new(struct sock *osk)
         x25->t2         = ox25->t2;
         x25->facilities = ox25->facilities;
         x25->qbitincl   = ox25->qbitincl;
+        x25->cudmatchlength = ox25->cudmatchlength;
+        x25->accptapprv = ox25->accptapprv;
 
         x25_init_timers(sk);
 out:
@@ -822,7 +833,6 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
         struct x25_sock *makex25;
         struct x25_address source_addr, dest_addr;
         struct x25_facilities facilities;
-        struct x25_calluserdata calluserdata;
         int len, rc;
 
         /*
@@ -845,19 +855,10 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
         skb_pull(skb,len);
 
         /*
-         *      Incoming Call User Data.
-         */
-        if (skb->len >= 0) {
-                memcpy(calluserdata.cuddata, skb->data, skb->len);
-                calluserdata.cudlength = skb->len;
-        }
-
-        skb_push(skb,len);
-
-        /*
          *      Find a listener for the particular address/cud pair.
          */
-        sk = x25_find_listener(&source_addr,&calluserdata);
+        sk = x25_find_listener(&source_addr,skb);
+        skb_push(skb,len);
 
         /*
          *      We can't accept the Call Request.
@@ -900,11 +901,23 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
         makex25->neighbour     = nb;
         makex25->facilities    = facilities;
         makex25->vc_facil_mask = x25_sk(sk)->vc_facil_mask;
-        makex25->calluserdata  = calluserdata;
-
-        x25_write_internal(make, X25_CALL_ACCEPTED);
+        /* ensure no reverse facil on accept */
+        makex25->vc_facil_mask &= ~X25_MASK_REVERSE;
+        makex25->cudmatchlength = x25_sk(sk)->cudmatchlength;
+
+        /* Normally all calls are accepted immediatly */
+        if(makex25->accptapprv & X25_DENY_ACCPT_APPRV) {
+                x25_write_internal(make, X25_CALL_ACCEPTED);
+                makex25->state = X25_STATE_3;
+        }
 
-        makex25->state = X25_STATE_3;
+        /*
+         *      Incoming Call User Data.
+         */
+        if (skb->len >= 0) {
+                memcpy(makex25->calluserdata.cuddata, skb->data, skb->len);
+                makex25->calluserdata.cudlength = skb->len;
+        }
 
         sk->sk_ack_backlog++;
 
@@ -1288,7 +1301,8 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                         if (facilities.throughput < 0x03 ||
                             facilities.throughput > 0xDD)
                                 break;
-                        if (facilities.reverse && facilities.reverse != 1)
+                        if (facilities.reverse &&
+                                (facilities.reverse | 0x81)!= 0x81)
                                 break;
                         x25->facilities = facilities;
                         rc = 0;
@@ -1325,6 +1339,44 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                         break;
                 }
 
+                case SIOCX25SCUDMATCHLEN: {
+                        struct x25_subaddr sub_addr;
+                        rc = -EINVAL;
+                        if(sk->sk_state != TCP_CLOSE)
+                                break;
+                        rc = -EFAULT;
+                        if (copy_from_user(&sub_addr, argp,
+                                        sizeof(sub_addr)))
+                                break;
+                        rc = -EINVAL;
+                        if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN)
+                                break;
+                        x25->cudmatchlength = sub_addr.cudmatchlength;
+                        rc = 0;
+                        break;
+                }
+
+                case SIOCX25CALLACCPTAPPRV: {
+                        rc = -EINVAL;
+                        if (sk->sk_state != TCP_CLOSE)
+                                break;
+                        x25->accptapprv = X25_ALLOW_ACCPT_APPRV;
+                        rc = 0;
+                        break;
+                }
+
+                case SIOCX25SENDCALLACCPT:  {
+                        rc = -EINVAL;
+                        if (sk->sk_state != TCP_ESTABLISHED)
+                                break;
+                        if (x25->accptapprv)    /* must call accptapprv above */
+                                break;
+                        x25_write_internal(sk, X25_CALL_ACCEPTED);
+                        x25->state = X25_STATE_3;
+                        rc = 0;
+                        break;
+                }
+
                 default:
                         rc = dev_ioctl(cmd, argp);
                         break;
diff --git a/net/x25/x25_facilities.c b/net/x25/x25_facilities.c
index a21bdb95f9a8..54278b962f4c 100644
--- a/net/x25/x25_facilities.c
+++ b/net/x25/x25_facilities.c
@@ -17,6 +17,8 @@
  *      X.25 001        Split from x25_subr.c
  *      mar/20/00       Daniela Squassoni Disabling/enabling of facilities 
  *                                        negotiation.
+ *      apr/14/05       Shaun Pereira - Allow fast select with no restriction
+ *                                      on response.
  */
 
 #include <linux/kernel.h>
@@ -43,9 +45,31 @@ int x25_parse_facilities(struct sk_buff *skb,
                 case X25_FAC_CLASS_A:
                         switch (*p) {
                         case X25_FAC_REVERSE:
-                                facilities->reverse = p[1] & 0x01;
-                                *vc_fac_mask |= X25_MASK_REVERSE;
-                                break;
+                                if((p[1] & 0x81) == 0x81) {
+                                        facilities->reverse = p[1] & 0x81;
+                                        *vc_fac_mask |= X25_MASK_REVERSE;
+                                        break;
+                                }
+
+                                if((p[1] & 0x01) == 0x01) {
+                                        facilities->reverse = p[1] & 0x01;
+                                        *vc_fac_mask |= X25_MASK_REVERSE;
+                                        break;
+                                }
+
+                                if((p[1] & 0x80) == 0x80) {
+                                        facilities->reverse = p[1] & 0x80;
+                                        *vc_fac_mask |= X25_MASK_REVERSE;
+                                        break;
+                                }
+
+                                if(p[1] == 0x00) {
+                                        facilities->reverse
+                                                = X25_DEFAULT_REVERSE;
+                                        *vc_fac_mask |= X25_MASK_REVERSE;
+                                        break;
+                                }
+
                         case X25_FAC_THROUGHPUT:
                                 facilities->throughput = p[1];
                                 *vc_fac_mask |= X25_MASK_THROUGHPUT;
@@ -122,7 +146,7 @@ int x25_create_facilities(unsigned char *buffer,
 
         if (facilities->reverse && (facil_mask & X25_MASK_REVERSE)) {
                 *p++ = X25_FAC_REVERSE;
-                *p++ = !!facilities->reverse;
+                *p++ = facilities->reverse;
         }
 
         if (facilities->throughput && (facil_mask & X25_MASK_THROUGHPUT)) {
@@ -171,7 +195,7 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk,
         /*
          *      They want reverse charging, we won't accept it.
          */
-        if (theirs.reverse && ours->reverse) {
+        if ((theirs.reverse & 0x01 ) && (ours->reverse & 0x01)) {
                 SOCK_DEBUG(sk, "X.25: rejecting reverse charging request");
                 return -1;
         }
diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c
index 183fea3bba67..7fd872ad0c20 100644
--- a/net/x25/x25_subr.c
+++ b/net/x25/x25_subr.c
@@ -19,6 +19,8 @@
  *      mar/20/00       Daniela Squassoni Disabling/enabling of facilities
  *                                        negotiation.
  *      jun/24/01       Arnaldo C. Melo   use skb_queue_purge, cleanups
+ *      apr/04/15       Shaun Pereira           Fast select with no
+ *                                              restriction on response.
  */
 
 #include <linux/kernel.h>
@@ -127,8 +129,12 @@ void x25_write_internal(struct sock *sk, int frametype)
                         len += 1 + X25_ADDR_LEN + X25_MAX_FAC_LEN +
                                X25_MAX_CUD_LEN;
                         break;
-                case X25_CALL_ACCEPTED:
-                        len += 1 + X25_MAX_FAC_LEN + X25_MAX_CUD_LEN;
+                case X25_CALL_ACCEPTED: /* fast sel with no restr on resp */
+                        if(x25->facilities.reverse & 0x80) {
+                                len += 1 + X25_MAX_FAC_LEN + X25_MAX_CUD_LEN;
+                        } else {
+                                len += 1 + X25_MAX_FAC_LEN;
+                        }
                         break;
                 case X25_CLEAR_REQUEST:
                 case X25_RESET_REQUEST:
@@ -203,9 +209,16 @@ void x25_write_internal(struct sock *sk, int frametype)
                                                         x25->vc_facil_mask);
                         dptr    = skb_put(skb, len);
                         memcpy(dptr, facilities, len);
-                        dptr = skb_put(skb, x25->calluserdata.cudlength);
-                        memcpy(dptr, x25->calluserdata.cuddata,
-                               x25->calluserdata.cudlength);
+
+                        /* fast select with no restriction on response
+                                allows call user data. Userland must
+                                ensure it is ours and not theirs */
+                        if(x25->facilities.reverse & 0x80) {
+                                dptr = skb_put(skb,
+                                        x25->calluserdata.cudlength);
+                                memcpy(dptr, x25->calluserdata.cuddata,
+                                       x25->calluserdata.cudlength);
+                        }
                         x25->calluserdata.cudlength = 0;
                         break;
 
@@ -354,21 +367,3 @@ void x25_check_rbuf(struct sock *sk)
         }
 }
 
-/*
- * Compare 2 calluserdata structures, used to find correct listening sockets
- * when call user data is used.
- */
-int x25_check_calluserdata(struct x25_calluserdata *ours, struct x25_calluserdata *theirs)
-{
-        int i;
-        if (ours->cudlength != theirs->cudlength)
-                return 0;
-
-        for (i=0;i<ours->cudlength;i++) {
-                if (ours->cuddata[i] != theirs->cuddata[i]) {
-                        return 0;
-                }
-        }
-        return 1;
-}
-