Merge /spare/repo/linux-2.6/

3 files changed, 6 insertions, 8 deletions

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 3077878ed4f0..5acb1680524a 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1243,7 +1243,7 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
                 if (amount < 0)
                         amount = 0;
-                return put_user(amount, (unsigned int __user *)argp);
+                return put_user(amount, (unsigned int __user *) argp);
         }
 
         case TIOCINQ: {
@@ -1252,13 +1252,11 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 /* These two are safe on a single CPU system as only user tasks fiddle here */
                 if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)
                         amount = skb->len;
-                return put_user(amount, (unsigned int __user *)argp);
+                return put_user(amount, (unsigned int __user *) argp);
         }
 
         case SIOCGSTAMP:
-                if (sk != NULL) 
-                        return sock_get_timestamp(sk, (struct timeval __user *)argp);
-                return -EINVAL;
+                return sock_get_timestamp(sk, (struct timeval __user *) argp);
 
         case SIOCGIFADDR:
         case SIOCSIFADDR:
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index a8ed9a1d09f9..d297af737d10 100644
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -149,6 +149,6 @@ void rose_setup(struct net_device *dev)
         dev->set_mac_address    = rose_set_mac_address;
 
         /* New-style flags. */
-        dev->flags              = 0;
+        dev->flags              = IFF_NOARP;
         dev->get_stats = rose_get_stats;
 }
diff --git a/net/rose/rose_subr.c b/net/rose/rose_subr.c
index 02891ce2db37..36a77944622b 100644
--- a/net/rose/rose_subr.c
+++ b/net/rose/rose_subr.c
@@ -337,13 +337,13 @@ static int rose_parse_ccitt(unsigned char *p, struct rose_facilities_struct *fac
                                 memcpy(&facilities->source_addr, p + 7, ROSE_ADDR_LEN);
                                 memcpy(callsign, p + 12,   l - 10);
                                 callsign[l - 10] = '\0';
-                                facilities->source_call = *asc2ax(callsign);
+                                asc2ax(&facilities->source_call, callsign);
                         }
                         if (*p == FAC_CCITT_SRC_NSAP) {
                                 memcpy(&facilities->dest_addr, p + 7, ROSE_ADDR_LEN);
                                 memcpy(callsign, p + 12, l - 10);
                                 callsign[l - 10] = '\0';
-                                facilities->dest_call = *asc2ax(callsign);
+                                asc2ax(&facilities->dest_call, callsign);
                         }
                         p   += l + 2;
                         n   += l + 2;