Merge remote-tracking branch 'net-next/master'

[karo-tx-linux.git] / include / net / llc_sap.h

diff --git a/include/net/llc_sap.h b/include/net/llc_sap.h
index 2c56dbece7291ba1398dc5c5ce02ec3504e8f075..1e4df9fd9fb2cf6b06acdf2b923ed41fdfad142c 100644 (file)
--- a/include/net/llc_sap.h
+++ b/include/net/llc_sap.h
@@ -1,5 +1,8 @@
 #ifndef LLC_SAP_H
 #define LLC_SAP_H
+
+#include <asm/types.h>
+
 /*
  * Copyright (c) 1997 by Procom Technology,Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
@@ -16,18 +19,14 @@ struct net_device;
 struct sk_buff;
 struct sock;
 
-extern void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb);
-extern void llc_save_primitive(struct sock *sk, struct sk_buff* skb,
-                              unsigned char prim);
-extern struct sk_buff *llc_alloc_frame(struct sock *sk,
-                                      struct net_device *dev);
+void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb);
+void llc_save_primitive(struct sock *sk, struct sk_buff *skb,
+                       unsigned char prim);
+struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev,
+                               u8 type, u32 data_size);
 
-extern void llc_build_and_send_test_pkt(struct llc_sap *sap,
-                                       struct sk_buff *skb,
-                                       unsigned char *dmac,
-                                       unsigned char dsap);
-extern void llc_build_and_send_xid_pkt(struct llc_sap *sap,
-                                      struct sk_buff *skb,
-                                      unsigned char *dmac,
-                                      unsigned char dsap);
+void llc_build_and_send_test_pkt(struct llc_sap *sap, struct sk_buff *skb,
+                                unsigned char *dmac, unsigned char dsap);
+void llc_build_and_send_xid_pkt(struct llc_sap *sap, struct sk_buff *skb,
+                               unsigned char *dmac, unsigned char dsap);
 #endif /* LLC_SAP_H */