Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
	drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index d1e3c673e9b2..4d4dc38c7290 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -24,6 +24,7 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/in.h>
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/net.h>
@@ -138,7 +139,7 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
                 return NET_RX_DROP;
 
         ptr  = skb->data;
-        *ptr = 0x00;
+        *ptr = X25_IFACE_DATA;
 
         skb->protocol = x25_type_trans(skb, dev);
         return netif_rx(skb);
@@ -160,14 +161,14 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
                 goto drop;
 
         switch (skb->data[0]) {
-        case 0x00:
+        case X25_IFACE_DATA:
                 break;
-        case 0x01:
+        case X25_IFACE_CONNECT:
                 if ((err = lapb_connect_request(dev)) != LAPB_OK)
                         printk(KERN_ERR "lapbeth: lapb_connect_request "
                                "error: %d\n", err);
                 goto drop;
-        case 0x02:
+        case X25_IFACE_DISCONNECT:
                 if ((err = lapb_disconnect_request(dev)) != LAPB_OK)
                         printk(KERN_ERR "lapbeth: lapb_disconnect_request "
                                "err: %d\n", err);
@@ -224,7 +225,7 @@ static void lapbeth_connected(struct net_device *dev, int reason)
         }
 
         ptr  = skb_put(skb, 1);
-        *ptr = 0x01;
+        *ptr = X25_IFACE_CONNECT;
 
         skb->protocol = x25_type_trans(skb, dev);
         netif_rx(skb);
@@ -241,7 +242,7 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
         }
 
         ptr  = skb_put(skb, 1);
-        *ptr = 0x02;
+        *ptr = X25_IFACE_DISCONNECT;
 
         skb->protocol = x25_type_trans(skb, dev);
         netif_rx(skb);