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

5 files changed, 63 insertions, 53 deletions

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index f4578c759ffc..e5d82d711cae 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -56,6 +56,7 @@ int sysctl_netrom_transport_requested_window_size = NR_DEFAULT_WINDOW;
 int sysctl_netrom_transport_no_activity_timeout   = NR_DEFAULT_IDLE;
 int sysctl_netrom_routing_control                 = NR_DEFAULT_ROUTING;
 int sysctl_netrom_link_fails_count                = NR_DEFAULT_FAILS;
+int sysctl_netrom_reset_circuit                   = NR_DEFAULT_RESET;
 
 static unsigned short circuit = 0x101;
 
@@ -908,17 +909,17 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
         if (frametype != NR_CONNREQ) {
                 /*
                  * Here it would be nice to be able to send a reset but
-                 * NET/ROM doesn't have one. The following hack would
-                 * have been a way to extend the protocol but apparently
-                 * it kills BPQ boxes... :-(
+                 * NET/ROM doesn't have one.  We've tried to extend the protocol
+                 * by sending NR_CONNACK | NR_CHOKE_FLAGS replies but that
+                 * apparently kills BPQ boxes... :-(
+                 * So now we try to follow the established behaviour of
+                 * G8PZT's Xrouter which is sending packets with command type 7
+                 * as an extension of the protocol.
                  */
-#if 0
-                /*
-                 * Never reply to a CONNACK/CHOKE.
-                 */
-                if (frametype != NR_CONNACK || flags != NR_CHOKE_FLAG)
-                        nr_transmit_refusal(skb, 1);
-#endif
+                if (sysctl_netrom_reset_circuit &&
+                    (frametype != NR_RESET || flags != 0))
+                        nr_transmit_reset(skb, 1);
+
                 return 0;
         }
 
@@ -1187,9 +1188,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         }
 
         case SIOCGSTAMP:
-                ret = -EINVAL;
-                if (sk != NULL)
-                        ret = sock_get_timestamp(sk, argp);
+                ret = sock_get_timestamp(sk, argp);
                 release_sock(sk);
                 return ret;
 
@@ -1393,8 +1392,7 @@ static int __init nr_proto_init(void)
                 struct net_device *dev;
 
                 sprintf(name, "nr%d", i);
-                dev = alloc_netdev(sizeof(struct net_device_stats), name,
-                                          nr_setup);
+                dev = alloc_netdev(sizeof(struct nr_private), name, nr_setup);
                 if (!dev) {
                         printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n");
                         goto fail;
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 263da4c26494..4e66eef9a034 100644
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -47,7 +47,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
         struct net_device_stats *stats = netdev_priv(dev);
 
         if (!netif_running(dev)) {
-                stats->rx_errors++;
+                stats->rx_dropped++;
                 return 0;
         }
 
@@ -71,15 +71,10 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
 
 static int nr_rebuild_header(struct sk_buff *skb)
 {
-        struct net_device *dev = skb->dev;
-        struct net_device_stats *stats = netdev_priv(dev);
-        struct sk_buff *skbn;
         unsigned char *bp = skb->data;
-        int len;
 
-        if (arp_find(bp + 7, skb)) {
+        if (arp_find(bp + 7, skb))
                 return 1;
-        }
 
         bp[6] &= ~AX25_CBIT;
         bp[6] &= ~AX25_EBIT;
@@ -90,27 +85,7 @@ static int nr_rebuild_header(struct sk_buff *skb)
         bp[6] |= AX25_EBIT;
         bp[6] |= AX25_SSSID_SPARE;
 
-        if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {
-                kfree_skb(skb);
-                return 1;
-        }
-
-        if (skb->sk != NULL)
-                skb_set_owner_w(skbn, skb->sk);
-
-        kfree_skb(skb);
-
-        len = skbn->len;
-
-        if (!nr_route_frame(skbn, NULL)) {
-                kfree_skb(skbn);
-                stats->tx_errors++;
-        }
-
-        stats->tx_packets++;
-        stats->tx_bytes += len;
-
-        return 1;
+        return 0;
 }
 
 #else
@@ -185,15 +160,27 @@ static int nr_close(struct net_device *dev)
 
 static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct net_device_stats *stats = netdev_priv(dev);
-        dev_kfree_skb(skb);
-        stats->tx_errors++;
+        struct nr_private *nr = netdev_priv(dev);
+        struct net_device_stats *stats = &nr->stats;
+        unsigned int len = skb->len;
+
+        if (!nr_route_frame(skb, NULL)) {
+                kfree_skb(skb);
+                stats->tx_errors++;
+                return 0;
+        }
+
+        stats->tx_packets++;
+        stats->tx_bytes += len;
+
         return 0;
 }
 
 static struct net_device_stats *nr_get_stats(struct net_device *dev)
 {
-        return netdev_priv(dev);
+        struct nr_private *nr = netdev_priv(dev);
+
+        return &nr->stats;
 }
 
 void nr_setup(struct net_device *dev)
@@ -208,12 +195,11 @@ void nr_setup(struct net_device *dev)
         dev->hard_header_len    = NR_NETWORK_LEN + NR_TRANSPORT_LEN;
         dev->addr_len           = AX25_ADDR_LEN;
         dev->type               = ARPHRD_NETROM;
-        dev->tx_queue_len       = 40;
         dev->rebuild_header     = nr_rebuild_header;
         dev->set_mac_address    = nr_set_mac_address;
 
         /* New-style flags. */
-        dev->flags              = 0;
+        dev->flags              = IFF_NOARP;
 
         dev->get_stats          = nr_get_stats;
 }
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c
index 64b81a796907..004e8599b8fe 100644
--- a/net/netrom/nr_in.c
+++ b/net/netrom/nr_in.c
@@ -98,6 +98,11 @@ static int nr_state1_machine(struct sock *sk, struct sk_buff *skb,
                 nr_disconnect(sk, ECONNREFUSED);
                 break;
 
+        case NR_RESET:
+                if (sysctl_netrom_reset_circuit);
+                        nr_disconnect(sk, ECONNRESET);
+                break;
+
         default:
                 break;
         }
@@ -124,6 +129,11 @@ static int nr_state2_machine(struct sock *sk, struct sk_buff *skb,
                 nr_disconnect(sk, 0);
                 break;
 
+        case NR_RESET:
+                if (sysctl_netrom_reset_circuit);
+                        nr_disconnect(sk, ECONNRESET);
+                break;
+
         default:
                 break;
         }
@@ -254,6 +264,11 @@ static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype
                 }
                 break;
 
+        case NR_RESET:
+                if (sysctl_netrom_reset_circuit);
+                        nr_disconnect(sk, ECONNRESET);
+                break;
+
         default:
                 break;
         }
diff --git a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c
index 587bed2674bf..bcb9946b4f56 100644
--- a/net/netrom/nr_subr.c
+++ b/net/netrom/nr_subr.c
@@ -210,10 +210,9 @@ void nr_write_internal(struct sock *sk, int frametype)
 }
 
 /*
- * This routine is called when a Connect Acknowledge with the Choke Flag
- * set is needed to refuse a connection.
+ * This routine is called to send an error reply.
  */
-void nr_transmit_refusal(struct sk_buff *skb, int mine)
+void __nr_transmit_reply(struct sk_buff *skb, int mine, unsigned char cmdflags)
 {
         struct sk_buff *skbn;
         unsigned char *dptr;
@@ -254,7 +253,7 @@ void nr_transmit_refusal(struct sk_buff *skb, int mine)
                 *dptr++ = 0;
         }
 
-        *dptr++ = NR_CONNACK | NR_CHOKE_FLAG;
+        *dptr++ = cmdflags;
         *dptr++ = 0;
 
         if (!nr_route_frame(skbn, NULL))
diff --git a/net/netrom/sysctl_net_netrom.c b/net/netrom/sysctl_net_netrom.c
index c9ed50382ea7..6bb8dda849dc 100644
--- a/net/netrom/sysctl_net_netrom.c
+++ b/net/netrom/sysctl_net_netrom.c
@@ -30,6 +30,7 @@ static int min_idle[]    = {0 * HZ};
 static int max_idle[]    = {65535 * HZ};
 static int min_route[]   = {0}, max_route[]   = {1};
 static int min_fails[]   = {1}, max_fails[]   = {10};
+static int min_reset[]   = {0}, max_reset[]   = {1};
 
 static struct ctl_table_header *nr_table_header;
 
@@ -155,6 +156,17 @@ static ctl_table nr_table[] = {
                 .extra1         = &min_fails,
                 .extra2         = &max_fails
         },
+        {
+                .ctl_name       = NET_NETROM_RESET,
+                .procname       = "reset",
+                .data           = &sysctl_netrom_reset_circuit,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &min_reset,
+                .extra2         = &max_reset
+        },
         { .ctl_name = 0 }
 };