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

2 files changed, 24 insertions, 28 deletions

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index ed705ddad56b..8e37e71e34ff 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1695,16 +1695,12 @@ static int ax25_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;
-                res = put_user(amount, (int __user *)argp);
+                res = put_user(amount, (int __user *) argp);
                 break;
         }
 
         case SIOCGSTAMP:
-                if (sk != NULL) {
-                        res = sock_get_timestamp(sk, argp);
-                        break;
-                }
-                res = -EINVAL;
+                res = sock_get_timestamp(sk, argp);
                 break;
 
         case SIOCAX25ADDUID:    /* Add a uid to the uid/call map table */
@@ -1951,24 +1947,24 @@ static struct net_proto_family ax25_family_ops = {
 };
 
 static struct proto_ops ax25_proto_ops = {
-        .family =       PF_AX25,
-        .owner =        THIS_MODULE,
-        .release =      ax25_release,
-        .bind =         ax25_bind,
-        .connect =      ax25_connect,
-        .socketpair =   sock_no_socketpair,
-        .accept =       ax25_accept,
-        .getname =      ax25_getname,
-        .poll =         datagram_poll,
-        .ioctl =        ax25_ioctl,
-        .listen =       ax25_listen,
-        .shutdown =     ax25_shutdown,
-        .setsockopt =   ax25_setsockopt,
-        .getsockopt =   ax25_getsockopt,
-        .sendmsg =      ax25_sendmsg,
-        .recvmsg =      ax25_recvmsg,
-        .mmap =         sock_no_mmap,
-        .sendpage =     sock_no_sendpage,
+        .family         = PF_AX25,
+        .owner          = THIS_MODULE,
+        .release        = ax25_release,
+        .bind           = ax25_bind,
+        .connect        = ax25_connect,
+        .socketpair     = sock_no_socketpair,
+        .accept         = ax25_accept,
+        .getname        = ax25_getname,
+        .poll           = datagram_poll,
+        .ioctl          = ax25_ioctl,
+        .listen         = ax25_listen,
+        .shutdown       = ax25_shutdown,
+        .setsockopt     = ax25_setsockopt,
+        .getsockopt     = ax25_getsockopt,
+        .sendmsg        = ax25_sendmsg,
+        .recvmsg        = ax25_recvmsg,
+        .mmap           = sock_no_mmap,
+        .sendpage       = sock_no_sendpage,
 };
 
 /*
@@ -1984,7 +1980,7 @@ static struct notifier_block ax25_dev_notifier = {
         .notifier_call =ax25_device_event,
 };
 
-EXPORT_SYMBOL(ax25_encapsulate);
+EXPORT_SYMBOL(ax25_hard_header);
 EXPORT_SYMBOL(ax25_rebuild_header);
 EXPORT_SYMBOL(ax25_findbyuid);
 EXPORT_SYMBOL(ax25_find_cb);
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index bba0173e2d65..d643dac3eccc 100644
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_INET
 
-int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
+int ax25_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
 {
         unsigned char *buff;
 
@@ -88,7 +88,7 @@ int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short
                 *buff++ = AX25_P_ARP;
                 break;
         default:
-                printk(KERN_ERR "AX.25: ax25_encapsulate - wrong protocol type 0x%2.2x\n", type);
+                printk(KERN_ERR "AX.25: ax25_hard_header - wrong protocol type 0x%2.2x\n", type);
                 *buff++ = 0;
                 break;
         }
@@ -209,7 +209,7 @@ put:
 
 #else   /* INET */
 
-int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
+int ax25_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
 {
         return -AX25_HEADER_LEN;
 }