summaryrefslogtreecommitdiffstats
path: root/net/802
diff options
context:
space:
mode:
Diffstat (limited to 'net/802')
-rw-r--r--net/802/cl2llc.c6
-rw-r--r--net/802/llc_macinit.c4
-rw-r--r--net/802/llc_sendpdu.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/net/802/cl2llc.c b/net/802/cl2llc.c
index 8d236b4c4..c8cce10e9 100644
--- a/net/802/cl2llc.c
+++ b/net/802/cl2llc.c
@@ -28,7 +28,7 @@
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <net/p8022.h>
@@ -96,7 +96,7 @@ int llc_data_request(llcptr lp, struct sk_buff *skb)
else
llc_interpret_pseudo_code(lp, REJECT1, skb, NO_FRAME);
break;
- default:
+ default:;
}
if(lp->llc_callbacks)
{
@@ -497,7 +497,7 @@ void llc_interpret_pseudo_code(llcptr lp, int pc_label, struct sk_buff *skb,
else
lp->f_flag = fr->i_hdr.i_pflag;
break;
- default:
+ default:;
}
pc++;
}
diff --git a/net/802/llc_macinit.c b/net/802/llc_macinit.c
index 987d8a5c4..3b6dc3478 100644
--- a/net/802/llc_macinit.c
+++ b/net/802/llc_macinit.c
@@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/version.h>
#include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/unistd.h>
#include <linux/string.h>
#include <linux/netdevice.h>
@@ -125,7 +125,7 @@ int llc_mac_data_indicate(llcptr lp, struct sk_buff *skb)
free=0;
break;
- default:
+ default:;
/*
* All other type 1 pdus ignored for now
*/
diff --git a/net/802/llc_sendpdu.c b/net/802/llc_sendpdu.c
index f0c6d116e..924a9cc60 100644
--- a/net/802/llc_sendpdu.c
+++ b/net/802/llc_sendpdu.c
@@ -19,7 +19,7 @@
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <net/p8022.h>